Browse Source

Fixed some more with the sidemenu open and smaller screens

Hugo Häggmark 7 years ago
parent
commit
9caaf25078
2 changed files with 19 additions and 7 deletions
  1. 1 1
      public/app/features/explore/ExploreToolbar.tsx
  2. 18 6
      public/sass/pages/_explore.scss

+ 1 - 1
public/app/features/explore/ExploreToolbar.tsx

@@ -88,7 +88,7 @@ export class ExploreToolbar extends PureComponent<Props, {}> {
           <div className={toolbarHeader}>
             <div className="toolbar-header-title">
               {exploreId === 'left' && (
-                <a className="navbar-page-btn">
+                <a>
                   <i className="fa fa-rocket fa-fw" />
                   Explore
                 </a>

+ 18 - 6
public/sass/pages/_explore.scss

@@ -18,7 +18,9 @@
 }
 
 .sidemenu-open {
-  .toolbar {
+  .toolbar-header-splitted,
+  .toolbar-header {
+    padding: 0;
     margin-left: 0;
   }
 }
@@ -30,7 +32,6 @@
   justify-content: space-between;
   height: auto;
   padding: 0px $dashboard-padding;
-  margin-left: $panel-margin * 3;
 }
 
 .toolbar {
@@ -59,19 +60,23 @@
   min-height: 55px;
   line-height: 55px;
   justify-content: space-between;
+  margin-left: $panel-margin * 3;
 }
 
 .toolbar-header {
   align-items: center;
 }
 
+.toolbar-header-title {
+  color: darken($link-color, 5%);
+}
+
 .toolbar-header-datasource {
   padding-left: $dashboard-padding;
   flex: 2 1 auto;
 }
 
 .toolbar-header-close {
-  color: #d6d6d6;
   padding-right: 8px;
 }
 
@@ -117,9 +122,16 @@
     display: inline-block;
   }
 
-  .toolbar-splitted,
-  .toolbar {
-    margin-left: 0;
+  .sidemenu-open {
+    .toolbar-header-splitted,
+    .toolbar-header {
+      margin-left: $dashboard-padding;
+    }
+  }
+
+  .toolbar-header-splitted,
+  .toolbar-header {
+    margin-left: $dashboard-padding;
   }
 
   .toolbar {