diff --git a/public/app/features/datasources/partials/edit.html b/public/app/features/datasources/partials/edit.html index 22aee1047e8..8a0dc0f4e0a 100644 --- a/public/app/features/datasources/partials/edit.html +++ b/public/app/features/datasources/partials/edit.html @@ -5,8 +5,10 @@
-

Add data source

-

Edit data source

+
+

Add data source

+

Edit data source

+
diff --git a/public/app/features/org/partials/orgDetails.html b/public/app/features/org/partials/orgDetails.html index 2fa16fa62b3..1aa6046a28c 100644 --- a/public/app/features/org/partials/orgDetails.html +++ b/public/app/features/org/partials/orgDetails.html @@ -2,61 +2,67 @@
-
- +

Preferences

- - -
- Name - -
- -
- -
- - -

Address

- -
-
- Address1 - -
-
- Address2 - -
-
- -
- City - -
-
- Postal code - -
-
- -
- State - -
-
- Country - -
- -
- -
-
-

Org. Users

- Manage +
+
+ Name + +
+ +
+ +
+
+ +

Address

+ +
+
+ Address1 + +
+
+ Address2 + +
+
+ +
+ City + +
+
+ Postal code + +
+
+ +
+ State + +
+
+ Country + +
+ +
+ +
+
+ +
+

Users

+ Manage +
+ +
+

API Keys

+ Manage +
diff --git a/public/app/features/profile/partials/profile.html b/public/app/features/profile/partials/profile.html index 417f3728dfa..9ce7589a864 100644 --- a/public/app/features/profile/partials/profile.html +++ b/public/app/features/profile/partials/profile.html @@ -2,10 +2,13 @@
- -

Profile

+
+

Profile

+
+

Preferences

+
Name @@ -34,8 +37,10 @@
-

Password

- Change Password +
+

Password

+ Change Password +

Organizations

diff --git a/public/img/page_header_line.png b/public/img/page_header_line.png new file mode 100644 index 00000000000..ec98becd093 Binary files /dev/null and b/public/img/page_header_line.png differ diff --git a/public/less/bootswatch.dark.less b/public/less/bootswatch.dark.less index cef058fa2f5..1f11a50e08d 100644 --- a/public/less/bootswatch.dark.less +++ b/public/less/bootswatch.dark.less @@ -34,10 +34,6 @@ body { background: @bodyBackground; } -.page-header { - border-bottom: 1px solid @grayDark -} - hr { border-bottom: none; } diff --git a/public/less/grafana-responsive.less b/public/less/grafana-responsive.less index 2ebf8d02264..ee8b26ef751 100644 --- a/public/less/grafana-responsive.less +++ b/public/less/grafana-responsive.less @@ -22,7 +22,7 @@ @fluidGridColumnWidth768: percentage(@gridColumnWidth768/@gridRowWidth768); @fluidGridGutterWidth768: percentage(@gridGutterWidth768/@gridRowWidth768); -@screen-xs: 480px; +@screen-xs: 320px; @screen-sm: 768px; @screen-md: 992px; @screen-lg: 1200px; @@ -67,6 +67,18 @@ .dashnav-action-icons { display: none; } + .page-container { + padding: 0 20px; + } +} + +// form styles +@media @breakpoint-sm-up { + .gf-size-m { width: 120px; } + .gf-size-l { width: 150px; } + .gf-size-xl { width: 200px; } + .gf-size-xxl { width: 300px; } + .gf-size-xxxl { width: 400px; } } @media @breakpoint-sm-up { diff --git a/public/less/grafana.less b/public/less/grafana.less index 3b744c7db98..f28893faafc 100644 --- a/public/less/grafana.less +++ b/public/less/grafana.less @@ -30,7 +30,6 @@ @import "simple-box.less"; @import "dropdown.less"; @import "page.less"; -@import url(https://fonts.googleapis.com/css?family=Open+Sans:400,300,400italic,600,700); .row-control-inner { padding:0px; diff --git a/public/less/normform.less b/public/less/normform.less index bfb6fe1a685..3dd0e0a294a 100644 --- a/public/less/normform.less +++ b/public/less/normform.less @@ -16,6 +16,11 @@ margin-bottom: 20px; } +.gf-form-flow { + float: left; + margin-right: 20px; +} + .gf-form-button-row { margin-top: 20px; margin-bottom: 10px; @@ -56,13 +61,14 @@ select.gf-form-input { font-size: 15px; } -.gf-size-xs { width: 60px;} -.gf-size-s { width: 80px;} +.gf-size-xs { width: 60px; } +.gf-size-s { width: 80px; } .gf-size-ms { width: 100px;} -.gf-size-m { width: 120px; } -.gf-size-l { width: 150px; } -.gf-size-xl { width: 200px; } -.gf-size-xxl { width: 300px; } -.gf-size-xxxl { width: 400px; } - +.gf-size-m { width: 110px; } +.gf-size-l { width: 120px; } +.gf-size-xl { width: 150px; } +.gf-size-xxl { width: 200px; } +.gf-size-xxxl { width: 300px; } .gf-size-auto { width: auto; } + + diff --git a/public/less/page.less b/public/less/page.less index e9a025f423f..ed775ecb07c 100644 --- a/public/less/page.less +++ b/public/less/page.less @@ -33,6 +33,8 @@ .page-header { + padding: 10px 0 39px 0px; + display: flex; justify-content: space-between; align-items: center; @@ -41,6 +43,10 @@ display: -ms-flexbox; /* TWEENER - IE 10 */ display: -webkit-flex; /* NEW - Chrome */ flex-wrap: wrap-reverse; + background: transparent url(../img/page_header_line.png) no-repeat left 60px; + h1 { + font-style: italic; + } } .admin-page { diff --git a/public/less/type.less b/public/less/type.less index 8d27a195e82..cefc051c091 100644 --- a/public/less/type.less +++ b/public/less/type.less @@ -88,17 +88,6 @@ h3 small { font-size: @baseFontSize; } h4 small { font-size: @baseFontSize; } -// Page header -// ------------------------- - -.page-header { - padding-bottom: (@baseLineHeight / 2) - 1; - margin: @baseLineHeight 0 (@baseLineHeight * 1.5); - border-bottom: 1px solid @grayLighter; -} - - - // Lists // -------------------------------------------------- diff --git a/public/less/variables.dark.less b/public/less/variables.dark.less index b2799b04b0c..2159b5196b8 100644 --- a/public/less/variables.dark.less +++ b/public/less/variables.dark.less @@ -78,7 +78,7 @@ @altFontFamily: @serifFontFamily; @headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily -@headingsFontWeight: 200; // instead of browser default, bold +@headingsFontWeight: 400; // instead of browser default, bold @headingsFontStyle: normal; @headingsColor: darken(@white,11%); // empty to use BS default, @textColor @inputText: @black; diff --git a/public/views/index.html b/public/views/index.html index e24d4ec6e7d..3208c5ae9ff 100644 --- a/public/views/index.html +++ b/public/views/index.html @@ -8,6 +8,8 @@ Grafana + + [[if .User.LightTheme]] [[else]]