Ver Fonte

ux(): minor fixes and cleanup, fixes for white theme

Torkel Ödegaard há 10 anos atrás
pai
commit
7d75e0e53c

+ 2 - 3
public/app/features/datasources/partials/list.html

@@ -5,15 +5,14 @@
 </navbar>
 
 <div class="page-container">
-	<div class="page-wide">
-	<div class="page-header-align">
+	<div class="page-header">
 		<h1>Data Sources</h1>
 		<a class="btn btn-success" href="datasources/new">
 			<i class="fa fa-plus"></i>
 			Add data source
 		</a>
-
 	</div>
+
 		<br>
 
 		<div ng-if="ctrl.datasources.length === 0">

+ 0 - 3
public/less/bootswatch.light.less

@@ -459,9 +459,6 @@ legend {
 // DROPDOWNS
 // -----------------------------------------------------
 
-.dropdown-menu {
-	.border-radius(0);
-}
 
 // ALERTS, LABELS, BADGES
 // -----------------------------------------------------

+ 1 - 2
public/less/dropdown.less

@@ -5,7 +5,6 @@
 // ==========================================================================
 
 
-
 .select-input {
   display: inline-block;
   position: relative;
@@ -88,4 +87,4 @@
 .rt-form .select-input > select {
   height: 34px;
   line-height: 34px;
-}
+}

+ 0 - 56
public/less/gfbox.less

@@ -67,59 +67,3 @@
     color: @textColor;
   }
 }
-
-.page-container {
-  background-color: @pageBackground;
-  position: relative;
-  padding: 25px 56px;
-  padding: 25px 56px;
-  min-height: 900px;
-  max-width: 1060px;
-  margin-left: 0;
-}
-
-
-.page {
-  max-width: 653px;
-}
-
-.page-header-align {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  display: -webkit-box;      /* OLD - iOS 6-, Safari 3.1-6 */
-  display: -moz-box;         /* OLD - Firefox 19- (buggy but mostly works) */
-  display: -ms-flexbox;      /* TWEENER - IE 10 */
-  display: -webkit-flex;     /* NEW - Chrome */
-  flex-wrap: wrap-reverse;
-}
-.page-wide {
-  max-width: 1060px;
-}
-
-.page-wide-margined {
-  margin-left: 170px;
-  max-width: 1000px;
-}
-
-.admin-page {
-  max-width: 800px;
-  margin-left: 10px;
-  .gf-box {
-    margin-top: 0;
-  }
-  .gf-box-body {
-    min-height: 0;
-  }
-  h2 {
-    margin-left: 15px;
-    margin-bottom: 0px;
-    font-size: @fontSizeLarge;
-    color: @textColor;
-    i {
-      padding-right: 6px;
-    }
-  }
-}
-
-

+ 1 - 1
public/less/grafana.less

@@ -29,7 +29,7 @@
 @import "filter-table.less";
 @import "simple-box.less";
 @import "dropdown.less";
-// @import url(https://fonts.googleapis.com/css?family=PT+Sans:400,700,400italic,700italic|PT+Sans+Caption:400,700);
+@import "page.less";
 @import url(https://fonts.googleapis.com/css?family=Open+Sans:400,300,400italic,600,700);
 
 .row-control-inner {

+ 1 - 1
public/less/navbar.less

@@ -6,7 +6,7 @@
 
 .navbar .navbar-inner {
   padding-left: 0px;
-  border: none;
+  border-bottom: @navbarBorder;
 }
 
 .navbar .nav>li>a {

+ 42 - 0
public/less/page.less

@@ -0,0 +1,42 @@
+
+.page-container {
+  background-color: @pageBackground;
+  position: relative;
+  padding: 25px 56px;
+  padding: 25px 56px;
+  max-width: 1060px;
+  margin-left: 0;
+}
+
+
+.page-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  display: -webkit-box;      /* OLD - iOS 6-, Safari 3.1-6 */
+  display: -moz-box;         /* OLD - Firefox 19- (buggy but mostly works) */
+  display: -ms-flexbox;      /* TWEENER - IE 10 */
+  display: -webkit-flex;     /* NEW - Chrome */
+  flex-wrap: wrap-reverse;
+}
+
+.admin-page {
+  max-width: 800px;
+  margin-left: 10px;
+  .gf-box {
+    margin-top: 0;
+  }
+  .gf-box-body {
+    min-height: 0;
+  }
+  h2 {
+    margin-left: 15px;
+    margin-bottom: 0px;
+    font-size: @fontSizeLarge;
+    color: @textColor;
+    i {
+      padding-right: 6px;
+    }
+  }
+}
+

+ 0 - 18
public/less/sidemenu.less

@@ -132,26 +132,8 @@
   }
 }
 
-.sidemenu-system-section {
-  background-color: @blueDark;
-  color: @white;
-  padding: 3px 0;
-  margin-left: 10px;
-  margin-right: 10px;
-  border-radius: 2px;
-
-  .sidemenu-system-section-inner {
-    border: 2px solid black;
-    border-left: none;
-    border-right: none;
-    padding: 4px;
-    overflow: hidden;
-  }
-}
-
 .sidemenu-section-tagline {
   font-style: italic;
-  font-size: 75%;
   line-height: 10px;
 }
 

+ 1 - 1
public/less/variables.dark.less

@@ -241,7 +241,7 @@
 @navbarHeight:                    52px;
 @navbarBackgroundHighlight:       @grayDark;
 @navbarBackground:                @grayDark;
-@navbarBorder:                    none;
+@navbarBorder:                    1px solid @grayDark;
 
 @navbarText:                      @grayLight;
 @navbarLinkColor:                 @grayLight;

+ 4 - 6
public/less/variables.light.less

@@ -67,9 +67,8 @@
 
 // Scaffolding
 // -------------------------
-// @bodyBackground:      #EFEFEF;
-@pageBackground:      @grayDarker;
-@bodyBackground:  	  @pageBackground;
+@bodyBackground:      #EFEFEF;
+@pageBackground:  	  @white;
 @textColor:           @gray;
 
 // Links
@@ -189,7 +188,7 @@
 // Dropdowns
 // -------------------------
 @dropdownBackground:            @white;
-@dropdownBorder:                rgba(0,0,0,.2);
+@dropdownBorder:                @grafanaTargetBorder;
 @dropdownDividerTop:            #e5e5e5;
 @dropdownDividerBottom:         @white;
 @dropdownDivider:               @dropdownDividerTop;
@@ -203,7 +202,6 @@
 @dropdownLinkBackgroundHover:   @blue;
 
 
-
 // COMPONENT VARIABLES
 // --------------------------------------------------
 
@@ -254,7 +252,7 @@
 @navbarHeight:                    52px;
 @navbarBackgroundHighlight:       #f8f8f8;
 @navbarBackground:                #f8f8f8;
-@navbarBorder:                    none;
+@navbarBorder:                    1px solid @grafanaTargetBorder;
 
 @navbarText:                      #666;
 @navbarLinkColor:                 #666;

+ 0 - 7
public/vendor/bootstrap/less/dropdowns.less

@@ -52,13 +52,6 @@
   background-color: @dropdownBackground;
   border: 1px solid #ccc; // Fallback for IE7-8
   border: 1px solid @dropdownBorder;
-  *border-right-width: 2px;
-  *border-bottom-width: 2px;
-  .border-radius(6px);
-  .box-shadow(0 5px 10px rgba(0,0,0,.2));
-  -webkit-background-clip: padding-box;
-     -moz-background-clip: padding;
-          background-clip: padding-box;
 
   // Aligns the dropdown menu to right
   &.pull-right {