From f3d277cbab29141767e1cd66eea5b151316e0fc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 14 Feb 2016 13:41:42 +0100 Subject: [PATCH] ux(): general ux polish and experimental work on page header --- .../features/datasources/partials/edit.html | 6 +- .../app/features/org/partials/orgDetails.html | 110 +++++++++--------- .../features/profile/partials/profile.html | 13 ++- public/img/page_header_line.png | Bin 0 -> 32993 bytes public/less/bootswatch.dark.less | 4 - public/less/grafana-responsive.less | 14 ++- public/less/grafana.less | 1 - public/less/normform.less | 22 ++-- public/less/page.less | 6 + public/less/type.less | 11 -- public/less/variables.dark.less | 2 +- public/views/index.html | 2 + 12 files changed, 107 insertions(+), 84 deletions(-) create mode 100644 public/img/page_header_line.png 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

+
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 @@
-
- + -

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

+
+

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 0000000000000000000000000000000000000000..ec98becd09382ba3cacbf972f503c4c238e6b0b2 GIT binary patch literal 32993 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 literal 0 HcmV?d00001 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]]