From 474f117df2551ff5d3be83d6cc92c34644a6fbed Mon Sep 17 00:00:00 2001
From: Geireann Lindfield Roberts <60007097+geireann@users.noreply.github.com>
Date: Thu, 15 Oct 2020 10:24:17 +0800
Subject: fixed changing transition undo bug :unlock:

#864
---
 src/client/views/nodes/PresBox.scss | 49 +++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

(limited to 'src/client/views/nodes/PresBox.scss')

diff --git a/src/client/views/nodes/PresBox.scss b/src/client/views/nodes/PresBox.scss
index ad2e7122f..033e1e030 100644
--- a/src/client/views/nodes/PresBox.scss
+++ b/src/client/views/nodes/PresBox.scss
@@ -411,6 +411,53 @@ $light-background: #ececec;
             transform: scale(1.05);
             transition: all 0.4s;
         }
+
+        .ribbon-frameList {
+            width: calc(100% - 5px);
+            height: 50px;
+            background-color: #ececec;
+            border: 1px solid #9f9f9f;
+            grid-template-rows: max-content;
+    
+            .frameList-header {
+                display: grid;
+                width: 100%;
+                height: 20px;
+                background-color: #9f9f9f;
+    
+                .frameList-headerButtons {
+                    display: flex;
+                    grid-column: 7;
+                    width: 60px;
+                    justify-self: right;
+                    justify-content: flex-end;
+            
+                    .headerButton {
+                        cursor: pointer;
+                        position: relative;
+                        border-radius: 100%;
+                        z-index: 300;
+                        width: 15px;
+                        height: 15px;
+                        display: flex;
+                        font-size: 10px;
+                        justify-self: center;
+                        align-self: center;
+                        background-color: rgba(0, 0, 0, 0.5);
+                        color: white;
+                        justify-content: center;
+                        align-items: center;
+                        transition: 0.2s;
+                        margin-right: 3px;
+                    }
+            
+                    .headerButton:hover {
+                        background-color: rgba(0, 0, 0, 1);
+                        transform: scale(1.15);
+                    }
+                }
+            }
+        }
     }
 
     .selectedList {
@@ -1007,6 +1054,8 @@ $light-background: #ececec;
     .presPanel-button-text:hover {
         background-color: #5a5a5a;
     }
+
+    
 }
 
 // .miniPres {
-- 
cgit v1.2.3-70-g09d2


From f75b69dc91191636842c794d878572a143347b54 Mon Sep 17 00:00:00 2001
From: Geireann Lindfield Roberts <60007097+geireann@users.noreply.github.com>
Date: Thu, 15 Oct 2020 19:29:04 +0800
Subject: Fixes for 3D Carousel

---
 src/client/views/nodes/PresBox.scss | 2 +-
 src/client/views/nodes/PresBox.tsx  | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/client/views/nodes/PresBox.scss')

diff --git a/src/client/views/nodes/PresBox.scss b/src/client/views/nodes/PresBox.scss
index 033e1e030..9a8b861ba 100644
--- a/src/client/views/nodes/PresBox.scss
+++ b/src/client/views/nodes/PresBox.scss
@@ -666,7 +666,7 @@ $light-background: #ececec;
     position: relative;
     align-self: flex-start;
     justify-self: flex-start;
-    width: 80%;
+    width: 100%;
     height: 100%;
     display: flex;
     align-items: center;
diff --git a/src/client/views/nodes/PresBox.tsx b/src/client/views/nodes/PresBox.tsx
index 5c6f7095a..0792be1da 100644
--- a/src/client/views/nodes/PresBox.tsx
+++ b/src/client/views/nodes/PresBox.tsx
@@ -1661,7 +1661,8 @@ export class PresBox extends ViewBoxBaseComponent<FieldViewProps, PresBoxSchema>
     @computed get toolbar() {
         const propIcon = CurrentUserUtils.propertiesWidth > 0 ? "angle-double-right" : "angle-double-left";
         const propTitle = CurrentUserUtils.propertiesWidth > 0 ? "Close Presentation Panel" : "Open Presentation Panel";
-        return (
+        const mode = StrCast(this.rootDoc._viewType) as CollectionViewType;
+        return (mode === CollectionViewType.Carousel3D) ? (null) : (
             <div id="toolbarContainer" className={'presBox-toolbar'} style={{ display: this.layoutDoc.presStatus === "edit" ? "inline-flex" : "none" }}>
                 {/* <Tooltip title={<><div className="dash-tooltip">{"Add new slide"}</div></>}><div className={`toolbar-button ${this.newDocumentTools ? "active" : ""}`} onClick={action(() => this.newDocumentTools = !this.newDocumentTools)}>
                     <FontAwesomeIcon icon={"plus"} />
@@ -1712,13 +1713,13 @@ export class PresBox extends ViewBoxBaseComponent<FieldViewProps, PresBoxSchema>
                             <FontAwesomeIcon icon={"play-circle"} />
                             <div style={{ display: this.props.PanelWidth() > 200 ? "inline-flex" : "none" }}>&nbsp; Present</div>
                         </div>
-                        <div className={`presBox-button-right ${this.presentTools ? "active" : ""}`}
+                        {(mode === CollectionViewType.Carousel3D) ? (null) : <div className={`presBox-button-right ${this.presentTools ? "active" : ""}`}
                             onClick={(action(() => {
                                 if (this.childDocs.length > 0) this.presentTools = !this.presentTools;
                             }))}>
                             <FontAwesomeIcon className="dropdown" style={{ margin: 0, transform: this.presentTools ? 'rotate(180deg)' : 'rotate(0deg)' }} icon={"angle-down"} />
                             {this.presentDropdown}
-                        </div>
+                        </div>}
                     </span>
                     {this.playButtons}
                 </div>
-- 
cgit v1.2.3-70-g09d2