Skip to content

N
nexpie-grafana-theme
Commit 7d75e0e5 by Torkel Ödegaard
Options

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

parent f7e3297a
Showing with 51 additions and 97 deletions
public/app/features/datasources/partials/list.html
...@@ -5,15 +5,14 @@ ...@@ -5,15 +5,14 @@
</navbar> </navbar>
<div class="page-container"> <div class="page-container">
<div class="page-wide"> <div class="page-header">
<div class="page-header-align">
<h1>Data Sources</h1> <h1>Data Sources</h1>
<a class="btn btn-success" href="datasources/new"> <a class="btn btn-success" href="datasources/new">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
Add data source Add data source
</a> </a>
</div> </div>
<br> <br>
<div ng-if="ctrl.datasources.length === 0"> <div ng-if="ctrl.datasources.length === 0">
......
public/less/bootswatch.light.less
...@@ -459,9 +459,6 @@ legend { ...@@ -459,9 +459,6 @@ legend {
// DROPDOWNS // DROPDOWNS
// ----------------------------------------------------- // -----------------------------------------------------
.dropdown-menu {
.border-radius(0);
}
// ALERTS, LABELS, BADGES // ALERTS, LABELS, BADGES
// ----------------------------------------------------- // -----------------------------------------------------
......
public/less/dropdown.less
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
// ========================================================================== // ==========================================================================
.select-input { .select-input {
display: inline-block; display: inline-block;
position: relative; position: relative;
......
public/less/gfbox.less
...@@ -67,59 +67,3 @@ ...@@ -67,59 +67,3 @@
color: @textColor; 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;
}
}
}
public/less/grafana.less
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
@import "filter-table.less"; @import "filter-table.less";
@import "simple-box.less"; @import "simple-box.less";
@import "dropdown.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); @import url(https://fonts.googleapis.com/css?family=Open+Sans:400,300,400italic,600,700);
.row-control-inner { .row-control-inner {
......
public/less/navbar.less
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
.navbar .navbar-inner { .navbar .navbar-inner {
padding-left: 0px; padding-left: 0px;
border: none; border-bottom: @navbarBorder;
} }
.navbar .nav>li>a { .navbar .nav>li>a {
......
public/less/page.less 0 → 100644
.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;
}
}
}
public/less/sidemenu.less
...@@ -132,26 +132,8 @@ ...@@ -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 { .sidemenu-section-tagline {
font-style: italic; font-style: italic;
font-size: 75%;
line-height: 10px; line-height: 10px;
} }
......
public/less/variables.dark.less
...@@ -241,7 +241,7 @@ ...@@ -241,7 +241,7 @@
@navbarHeight: 52px; @navbarHeight: 52px;
@navbarBackgroundHighlight: @grayDark; @navbarBackgroundHighlight: @grayDark;
@navbarBackground: @grayDark; @navbarBackground: @grayDark;
@navbarBorder: none; @navbarBorder: 1px solid @grayDark;
@navbarText: @grayLight; @navbarText: @grayLight;
@navbarLinkColor: @grayLight; @navbarLinkColor: @grayLight;
......
public/less/variables.light.less
...@@ -67,9 +67,8 @@ ...@@ -67,9 +67,8 @@
// Scaffolding // Scaffolding
// ------------------------- // -------------------------
// @bodyBackground: #EFEFEF; @bodyBackground: #EFEFEF;
@pageBackground: @grayDarker; @pageBackground: @white;
@bodyBackground: @pageBackground;
@textColor: @gray; @textColor: @gray;
// Links // Links
...@@ -189,7 +188,7 @@ ...@@ -189,7 +188,7 @@
// Dropdowns // Dropdowns
// ------------------------- // -------------------------
@dropdownBackground: @white; @dropdownBackground: @white;
@dropdownBorder: rgba(0,0,0,.2); @dropdownBorder: @grafanaTargetBorder;
@dropdownDividerTop: #e5e5e5; @dropdownDividerTop: #e5e5e5;
@dropdownDividerBottom: @white; @dropdownDividerBottom: @white;
@dropdownDivider: @dropdownDividerTop; @dropdownDivider: @dropdownDividerTop;
...@@ -203,7 +202,6 @@ ...@@ -203,7 +202,6 @@
@dropdownLinkBackgroundHover: @blue; @dropdownLinkBackgroundHover: @blue;
// COMPONENT VARIABLES // COMPONENT VARIABLES
// -------------------------------------------------- // --------------------------------------------------
...@@ -254,7 +252,7 @@ ...@@ -254,7 +252,7 @@
@navbarHeight: 52px; @navbarHeight: 52px;
@navbarBackgroundHighlight: #f8f8f8; @navbarBackgroundHighlight: #f8f8f8;
@navbarBackground: #f8f8f8; @navbarBackground: #f8f8f8;
@navbarBorder: none; @navbarBorder: 1px solid @grafanaTargetBorder;
@navbarText: #666; @navbarText: #666;
@navbarLinkColor: #666; @navbarLinkColor: #666;
......
public/vendor/bootstrap/less/dropdowns.less
...@@ -52,13 +52,6 @@ ...@@ -52,13 +52,6 @@
background-color: @dropdownBackground; background-color: @dropdownBackground;
border: 1px solid #ccc; // Fallback for IE7-8 border: 1px solid #ccc; // Fallback for IE7-8
border: 1px solid @dropdownBorder; 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 // Aligns the dropdown menu to right
&.pull-right { &.pull-right {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment