From 21b0945d08d5c5ba1c1a3096443199db517c061b Mon Sep 17 00:00:00 2001 From: Matthew Toback Date: Sat, 6 Feb 2016 17:37:33 -0500 Subject: [PATCH] Beginnings of form restyling, nowhere near merge yet --- .bra.toml | 2 +- package.json | 1 + .../features/datasources/partials/edit.html | 18 ++++----- .../datasources/partials/http_settings.html | 38 +++++++++---------- public/less/bootswatch.dark.less | 2 +- public/less/filter-table.less | 4 +- public/less/grafana.less | 3 +- public/less/variables.dark.less | 3 ++ public/less/variables.light.less | 9 +++-- 9 files changed, 44 insertions(+), 36 deletions(-) diff --git a/.bra.toml b/.bra.toml index ef1a925158d..5ff554bfc75 100644 --- a/.bra.toml +++ b/.bra.toml @@ -3,7 +3,7 @@ init_cmds = [ ["go", "build", "-o", "./bin/grafana-server"], ["./bin/grafana-server"] ] -watch_all = true +watch_all = false watch_dirs = [ "$WORKDIR/pkg", "$WORKDIR/public/views", diff --git a/package.json b/package.json index 7a358ce3e04..22a517747b2 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "grunt-git-describe": "~2.3.2", "grunt-karma": "~0.12.1", "grunt-ng-annotate": "^1.0.1", + "grunt-notify": "^0.4.3", "grunt-string-replace": "~1.2.1", "grunt-systemjs-builder": "^0.2.5", "grunt-tslint": "^3.0.1", diff --git a/public/app/features/datasources/partials/edit.html b/public/app/features/datasources/partials/edit.html index 00706cb4de5..f59178184c5 100644 --- a/public/app/features/datasources/partials/edit.html +++ b/public/app/features/datasources/partials/edit.html @@ -11,17 +11,17 @@

Edit data source

-
-
    -
  • +
    +
      +
    • Name
    • - +
      • -
    • +
    • Default  @@ -29,13 +29,13 @@
    -
    -
      -
    • +
      +
        +
      • Type
      • - +
      diff --git a/public/app/features/datasources/partials/http_settings.html b/public/app/features/datasources/partials/http_settings.html index d0d4206c579..dd651f85f81 100644 --- a/public/app/features/datasources/partials/http_settings.html +++ b/public/app/features/datasources/partials/http_settings.html @@ -1,53 +1,53 @@

      Http settings

      -
      -
      -
        -
      • +
        +
        +
          +
        • Url
        • - +
          • -
        • +
        • Access Direct = url is used directly from browser, Proxy = Grafana backend will proxy the request
        • - +
        -
        -
          -
        • +
          +
            +
          • Http Auth
            • -
          • +
            • -
          • +
          -
          -
            -
          • +
            +
              +
              • -
            • +
            • User
            • - +
              • -
            • +
            • Password
            • - +
            diff --git a/public/less/bootswatch.dark.less b/public/less/bootswatch.dark.less index 5f871b4f837..f084ee6c40c 100644 --- a/public/less/bootswatch.dark.less +++ b/public/less/bootswatch.dark.less @@ -33,7 +33,7 @@ body { height: 100%; //#gradient > .vertical (@bodyBackground, #252A30); //background: @bodyBackground; - background: @bodyBackground; + background: @nonDashBodyBackground; // url('../img/cubes.png') repeat right top; } diff --git a/public/less/filter-table.less b/public/less/filter-table.less index 6729b425e51..6bb4377189f 100644 --- a/public/less/filter-table.less +++ b/public/less/filter-table.less @@ -18,8 +18,8 @@ } .filter-table tr { - background: @grafanaPanelBackground; - border-bottom: 2px solid @bodyBackground; + background: @grafanaListBackground; + border-bottom: 2px solid @nonDashBodyBackground; } .filter-table th { diff --git a/public/less/grafana.less b/public/less/grafana.less index d33db98376b..6f5abd7c375 100644 --- a/public/less/grafana.less +++ b/public/less/grafana.less @@ -12,6 +12,7 @@ @import "panel.less"; @import "forms.less"; @import "tightform.less"; +@import "normform.less"; @import "sidemenu.less"; @import "navbar.less"; @import "gfbox.less"; @@ -405,6 +406,6 @@ border-image: linear-gradient(to right, rgba(255,213,0,1) 0%, rgba(255,68,0,1) 99%, rgba(255,68,0,1) 100%); border-image-slice: 1; border-bottom: 2px solid transparent; - padding: 1.2rem 3rem 0.8rem 3rem; + padding: 1.2rem .2rem .4rem .2rem; } } diff --git a/public/less/variables.dark.less b/public/less/variables.dark.less index 4a989af8c2e..9a1315eb83b 100644 --- a/public/less/variables.dark.less +++ b/public/less/variables.dark.less @@ -53,6 +53,7 @@ // Scaffolding // ------------------------- @bodyBackground: rgb(22,22,22); +@nonDashBodyBackground: @grayDarker; @textColor: @grayLighter; // Links @@ -156,6 +157,8 @@ @inputDisabledBackground: #555; @formActionsBackground: transparent; @inputHeight: @baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border +@labelBackground: @grayDark; + // Sidemenu // ------------------------- diff --git a/public/less/variables.light.less b/public/less/variables.light.less index 22b661c6adf..6b5403333e3 100644 --- a/public/less/variables.light.less +++ b/public/less/variables.light.less @@ -33,9 +33,9 @@ // Status colors // ------------------------- -@online: #10a345; -@warn: #ffc03c; -@critical: #ed2e18; +@online: #01A64F; +@warn: #F79520; +@critical: #EC2128; // grafana Variables // ------------------------- @@ -66,6 +66,7 @@ // Scaffolding // ------------------------- @bodyBackground: #EFEFEF; +@nonDashBodyBackground: @grayLighter; @textColor: @gray; // Links @@ -170,6 +171,8 @@ @formActionsBackground: #f5f5f5; @inputHeight: @baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border @inputText: #020202; +@labelBackground: #f8f8f8; + // Sidemenu // -------------------------