feat: moved view switcher

artemnih · Mar 27, 2022 · 4065c37 · 4065c37
1 parent 6659041
commit 4065c37
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 25 deletions.
diff --git a/projects/ngx-explorer/src/lib/components/icons/icons.component.scss b/projects/ngx-explorer/src/lib/components/icons/icons.component.scss
@@ -14,9 +14,6 @@
     .nxe-icons-container {
         display: flex;
         flex-wrap: wrap;
-        -webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
-        -moz-box-sizing: border-box; /* Firefox, other Gecko */
-        box-sizing: border-box; /* Opera/IE 8+ */
 
         .nxe-icons-wrapper {
             margin: 10px 10px 0px 10px;

diff --git a/projects/ngx-explorer/src/lib/components/list/list.component.scss b/projects/ngx-explorer/src/lib/components/list/list.component.scss
@@ -14,9 +14,6 @@
     .nxe-list-container {
         display: flex;
         flex-wrap: wrap;
-        -webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
-        -moz-box-sizing: border-box; /* Firefox, other Gecko */
-        box-sizing: border-box; /* Opera/IE 8+ */
 
         .nxe-list-wrapper {
             width: 100%;

diff --git a/projects/ngx-explorer/src/lib/components/menu-bar/menu-bar.component.html b/projects/ngx-explorer/src/lib/components/menu-bar/menu-bar.component.html
@@ -1,10 +1,15 @@
-<div class="ngx-menubar-container">
-    <button class="nxe-menubar-button" (click)="createFolder()"><i class="fa fa-folder-o" aria-hidden="true"></i>New Folder</button>
-    <button class="nxe-menubar-button" (click)="refresh()"><i class="fa fa-refresh" aria-hidden="true"></i> Refresh</button>
-    <button class="nxe-menubar-button" (click)="openUploader()"><i class="fa fa-upload" aria-hidden="true"></i> Upload</button>
-    <button class="nxe-menubar-button" [hidden]="!canDownload" (click)="download()"><i class="fa fa-download" aria-hidden="true"></i> Download</button>
-    <button class="nxe-menubar-button" [hidden]="!canRename" (click)="rename()"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> Rename</button>
-    <button class="nxe-menubar-button" [hidden]="!canDelete" (click)="remove()"><i class="fa fa-trash-o" aria-hidden="true"></i> Delete</button>
+<div class="nxe-menu-bar">
+    <div class="nxe-menu-bar-left">    
+        <button class="nxe-menu-bar-button" (click)="createFolder()"><i class="fa fa-folder-o" aria-hidden="true"></i>New Folder</button>
+        <button class="nxe-menu-bar-button" (click)="refresh()"><i class="fa fa-refresh" aria-hidden="true"></i> Refresh</button>
+        <button class="nxe-menu-bar-button" (click)="openUploader()"><i class="fa fa-upload" aria-hidden="true"></i> Upload</button>
+        <button class="nxe-menu-bar-button" [hidden]="!canDownload" (click)="download()"><i class="fa fa-download" aria-hidden="true"></i> Download</button>
+        <button class="nxe-menu-bar-button" [hidden]="!canRename" (click)="rename()"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> Rename</button>
+        <button class="nxe-menu-bar-button" [hidden]="!canDelete" (click)="remove()"><i class="fa fa-trash-o" aria-hidden="true"></i> Delete</button>
+    </div>
 
+    <div class="nxe-menu-bar-right">
+        <nxe-view-switcher></nxe-view-switcher>
+    </div>
     <input style="display: none" type="file" multiple (change)="handleFiles($event.target.files)" #uploader>
 </div>
diff --git a/projects/ngx-explorer/src/lib/components/menu-bar/menu-bar.component.scss b/projects/ngx-explorer/src/lib/components/menu-bar/menu-bar.component.scss
@@ -1,11 +1,12 @@
-.ngx-menubar-container {
-    width: 100%;
-    padding: 10px;
-    -webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
-    -moz-box-sizing: border-box; /* Firefox, other Gecko */
-    box-sizing: border-box; /* Opera/IE 8+ */
+.nxe-menu-bar {
+    display: flex;
 
-    .nxe-menubar-button {
+    .nxe-menu-bar-left {
+        flex-grow: 1;
+        padding: 10px;
+    }
+
+    .nxe-menu-bar-button {
         cursor: pointer;
         padding: 5px 5px;
         border-radius: 5px;
@@ -15,7 +16,7 @@
         font-size: inherit;
         font-weight: inherit;
         margin-right: 20px;
-        
+
         .fa {
             margin-right: 5px;
             color: #555;
@@ -25,5 +26,4 @@
             background-color: #d7edff;
         }
     }
-
-}
+}
diff --git a/projects/ngx-explorer/src/lib/components/second-menu-bar/second-menu-bar.component.html b/projects/ngx-explorer/src/lib/components/second-menu-bar/second-menu-bar.component.html
@@ -3,7 +3,6 @@
         <nxe-breadcrumbs></nxe-breadcrumbs>
     </div>
     <div class="nxe-second-menu-bar-right">
-        <nxe-view-switcher></nxe-view-switcher>
+
     </div>
-
 </div>