From ed6d50d6bad052da4038da0ef8b6cbc91f31bd91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 7 Feb 2015 13:04:24 +0100 Subject: [PATCH] Updated to profile page design --- .../features/profile/partials/profile.html | 171 ++++++++---------- src/css/less/gfbox.less | 18 ++ 2 files changed, 98 insertions(+), 91 deletions(-) diff --git a/src/app/features/profile/partials/profile.html b/src/app/features/profile/partials/profile.html index 8689a2785eb..6db4a45ce8e 100644 --- a/src/app/features/profile/partials/profile.html +++ b/src/app/features/profile/partials/profile.html @@ -5,102 +5,91 @@ show-menu-btn="!grafana.sidemenu"> -
-

Personal information

+
+
-
-
-
-
-
-
-
    -
  • - Name -
  • -
  • - -
  • -
-
-
-
-
    -
  • - Email -
  • -
  • - -
  • -
-
-
-
-
    -
  • - Username -
  • -
  • - -
  • -
-
-
-
+

Personal information

-
- -
-
-
-
- -

Your accounts

- -
-
- - - - - - -
Name: {{ac.name}}Role: {{ac.role}} - - Current - - - Select - -
-
-
- -

Add account

-
-
-
-
-
-
-
    -
  • - Account name -
  • -
  • - -
  • -
  • -
  • -
-
-
-
-
- + +
+
+
    +
  • + Name +
  • +
  • + +
  • +
+
+
+
+
    +
  • + Email +
  • +
  • + +
  • +
+
+
+
+
    +
  • + Username +
  • +
  • + +
  • +
+
+ +
+
+ +

Your accounts

+ + + + + + + +
Name: {{ac.name}}Role: {{ac.role}} + + Current + + + Select + +
+ +

Add account

+ +
+
+
+
    +
  • + Account name +
  • +
  • + +
  • +
  • +
  • +
+
+
+
+
+ +
+
diff --git a/src/css/less/gfbox.less b/src/css/less/gfbox.less index 8214cdb84b7..12b16974162 100644 --- a/src/css/less/gfbox.less +++ b/src/css/less/gfbox.less @@ -59,6 +59,24 @@ } } +.page-container { + margin: 15px; + background: @grafanaPanelBackground; + position: relative; + border: 1px solid @grayDark; + padding: 20px 20px 60px 49px; + + h2 { + color: @textColor; + font-weight: normal; + font-size: 22px; + } +} + +.page { + max-width: 653px; +} + .admin-page { max-width: 800px; margin-left: 10px;