diff --git a/public/app/core/components/sidemenu/sidemenu.html b/public/app/core/components/sidemenu/sidemenu.html index a651c87aa7c..4a886dc34eb 100644 --- a/public/app/core/components/sidemenu/sidemenu.html +++ b/public/app/core/components/sidemenu/sidemenu.html @@ -28,7 +28,7 @@
  • - +
    Grafana Admin
    v {{ctrl.grafanaVersion}}
    diff --git a/public/app/features/apps/partials/edit.html b/public/app/features/apps/partials/edit.html index efc5f93c738..dd30bbb28ba 100644 --- a/public/app/features/apps/partials/edit.html +++ b/public/app/features/apps/partials/edit.html @@ -1,4 +1,4 @@ - + diff --git a/public/app/features/apps/partials/list.html b/public/app/features/apps/partials/list.html index 6d2d8cc24df..6eaf010c95c 100644 --- a/public/app/features/apps/partials/list.html +++ b/public/app/features/apps/partials/list.html @@ -1,4 +1,4 @@ - +
    diff --git a/public/app/features/dashboard/dashnav/dashnav.html b/public/app/features/dashboard/dashnav/dashnav.html index 67c98520bd3..971bb39a09c 100644 --- a/public/app/features/dashboard/dashnav/dashnav.html +++ b/public/app/features/dashboard/dashnav/dashnav.html @@ -2,7 +2,7 @@
    - + {{dashboard.title}} diff --git a/public/app/features/datasources/partials/edit.html b/public/app/features/datasources/partials/edit.html index f59178184c5..3dd3e8fdc0b 100644 --- a/public/app/features/datasources/partials/edit.html +++ b/public/app/features/datasources/partials/edit.html @@ -1,14 +1,22 @@ - -
      + +
      + + + Data Sources + + +
      +

      Add data source

      Edit data source

      +

      This text will only appear on Add Data Source

      @@ -18,13 +26,13 @@
    • - +
      • -
    • - Default  +
    • + Default
    @@ -35,7 +43,7 @@ Type
  • - +
    • @@ -55,13 +63,13 @@ -
    - - - + + - Cancel + Cancel

    diff --git a/public/app/features/datasources/partials/http_settings.html b/public/app/features/datasources/partials/http_settings.html index dd651f85f81..9d78b3273a4 100644 --- a/public/app/features/datasources/partials/http_settings.html +++ b/public/app/features/datasources/partials/http_settings.html @@ -9,7 +9,12 @@
    • -
  • + +
    + +
    +
    +
    +
    +
    +
    diff --git a/public/app/features/datasources/partials/list.html b/public/app/features/datasources/partials/list.html index ec660ef79d4..34e05954c5e 100644 --- a/public/app/features/datasources/partials/list.html +++ b/public/app/features/datasources/partials/list.html @@ -1,15 +1,23 @@ - + +
    + + + Data Sources + + +
    - - +
    +

    Data sources

    +     Add data source -

    Data sources

    +

    diff --git a/public/less/bootswatch.dark.less b/public/less/bootswatch.dark.less index a7e33c95eb4..1a403e8767c 100644 --- a/public/less/bootswatch.dark.less +++ b/public/less/bootswatch.dark.less @@ -355,11 +355,11 @@ div.subnav { // BUTTONS // ----------------------------------------------------- .btn { - padding: 5px 12px; + padding: 7px 12px 5px 12px; background-image: none; - .box-shadow(0px 0px 8px @bodyBackground); + // .box-shadow(0px 0px 8px @bodyBackground); border: none; - .border-radius(3px); + .border-radius(0px); text-shadow: none; &.disabled { @@ -369,10 +369,11 @@ div.subnav { .btn-inverse { border: 1px solid #444; + box-shadow: none; } .btn-large { - padding: 14px 23px; + padding: 6px 20px; } .btn-small { diff --git a/public/less/gfbox.less b/public/less/gfbox.less index 8e957d50351..94b90d462c0 100644 --- a/public/less/gfbox.less +++ b/public/less/gfbox.less @@ -71,13 +71,24 @@ .page-container { background-color: @pageBackground; position: relative; - padding: 20px 20px 60px 81px; + padding: 25px 60px 60px 88px; } + .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: 1000px; } diff --git a/public/less/grafana.less b/public/less/grafana.less index 1f516020c0f..11bba793b43 100644 --- a/public/less/grafana.less +++ b/public/less/grafana.less @@ -28,6 +28,8 @@ @import "filter-list.less"; @import "filter-table.less"; @import "simple-box.less"; +@import "dropdown.less"; +@import url(https://fonts.googleapis.com/css?family=PT+Sans:400,700,400italic,700italic|PT+Sans+Caption:400,700); .row-control-inner { padding:0px; diff --git a/public/less/navbar.less b/public/less/navbar.less index f4a405ad25c..a429adea224 100644 --- a/public/less/navbar.less +++ b/public/less/navbar.less @@ -34,6 +34,7 @@ position: absolute; right: 8px; top: 23px; + margin-right: 2px; } a { @@ -90,8 +91,8 @@ .icon-gf { position: relative; - top: 5px; - font-size: 27px; + top: 2px; + font-size: 20px; line-height: 8px; } } diff --git a/public/less/normform.less b/public/less/normform.less index c4fad4c648e..30a687df555 100644 --- a/public/less/normform.less +++ b/public/less/normform.less @@ -58,6 +58,9 @@ float: left; background: @labelBackground; } + & .trans { + background: transparent; + } } .norm-form-flex-wrapper { @@ -145,7 +148,7 @@ input[type=text].norm-form-clear-input { [type=text], [type=email], [type=number], -[type=password] { +[type=password], { &.norm-form-input { border: none; border-right: 3px solid @pageBackground; @@ -154,6 +157,7 @@ input[type=text].norm-form-clear-input { padding: 8px 6px; height: 100%; box-sizing: border-box; + font-size: 16px; &.last { border-right: none; } @@ -176,7 +180,8 @@ select.norm-form-input { margin: 0px; border-radius: 0; height: 36px; - padding: 9px 3px; + padding: 9px 3px; + font-size: 16px; &.last { border-right: none; } diff --git a/public/less/sidemenu.less b/public/less/sidemenu.less index d58f5a654cc..56352528f7b 100644 --- a/public/less/sidemenu.less +++ b/public/less/sidemenu.less @@ -35,7 +35,7 @@ padding-left: 210px; } .page-container { - margin-left: 210px; + margin-left: 190px; padding-left: 55px; } .top-nav-menu-btn { diff --git a/public/less/type.less b/public/less/type.less index 1e958c4b097..8d27a195e82 100644 --- a/public/less/type.less +++ b/public/less/type.less @@ -63,6 +63,7 @@ h1, h2, h3, h4, h5, h6 { line-height: @baseLineHeight; color: @headingsColor; text-rendering: optimizelegibility; // Fix the character spacing for headings + font-style: @headingsFontStyle; small { font-weight: normal; line-height: 1; diff --git a/public/less/variables.dark.less b/public/less/variables.dark.less index 0420540675e..4e8ba2c28d7 100644 --- a/public/less/variables.dark.less +++ b/public/less/variables.dark.less @@ -47,13 +47,16 @@ @grafanaTargetFuncBackground: #333; @grafanaTargetFuncHightlight: #444; +@grafanaSelectBackground: @grafanaTargetFuncBackground; + @modalBackground: @black; @codeTagBackground: #444; // Scaffolding // ------------------------- -@bodyBackground: rgb(20,20,20); +// @bodyBackground: rgb(20,20,20); @pageBackground: @grayDarker; +@bodyBackground: @pageBackground; @textColor: @grayLighter; // Links @@ -65,18 +68,19 @@ // Typography // ------------------------- -@sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif; +@sansFontFamily: "PT Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; @serifFontFamily: Georgia, "Times New Roman", Times, serif; @monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace; @baseFontSize: 14px; -@baseFontWeight: 400; +@baseFontWeight: 400; @baseFontFamily: @sansFontFamily; @baseLineHeight: 20px; @altFontFamily: @serifFontFamily; @headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily -@headingsFontWeight: normal; // instead of browser default, bold +@headingsFontWeight: 200; // instead of browser default, bold +@headingsFontStyle: italic; @headingsColor: darken(@white,11%); // empty to use BS default, @textColor @inputText: @black; @@ -98,7 +102,7 @@ @borderRadiusSmall: 2px; // Lists -@grafanaListBackground: #262626; +@grafanaListBackground: @grayDark; @grafanaListAccent: lighten(@grayDarker, 2%); @grafanaListBorderTop: @grayDark; @grafanaListBorderBottom: @black; @@ -121,6 +125,7 @@ // ------------------------- @btnBackground: @grayDark; @btnBackgroundHighlight: darken(@grayLight, 15%); +@btnBackgroundShadow: darken(@grayLight, 15%); @btnBorder: #bbb; @btnPrimaryBackground: @blueDark; @@ -141,6 +146,8 @@ @btnInverseBackground: @grayDark; @btnInverseBackgroundHighlight: lighten(@grayDark, 5%); +@btnText: @gray; + @iconContainerBackground: @black; @iconContainerBackgroundHighlight: lighten(@black, 5%); @iconContainerBorder: 1px solid transparent; diff --git a/public/less/variables.light.less b/public/less/variables.light.less index 1a0c5957d04..0c4f09db1dd 100644 --- a/public/less/variables.light.less +++ b/public/less/variables.light.less @@ -60,13 +60,16 @@ @grafanaTargetFuncBackground: darken(@grafanaTargetBackground, 5%); @grafanaTargetFuncHightlight: darken(@grafanaTargetBackground, 10%); +@grafanaSelectBackground: @grafanaTargetFuncBackground; + @modalBackground: @bodyBackground; @codeTagBackground: #ddd; // Scaffolding // ------------------------- -@bodyBackground: #EFEFEF; +// @bodyBackground: #EFEFEF; @pageBackground: @grayDarker; +@bodyBackground: @pageBackground; @textColor: @gray; // Links @@ -77,18 +80,19 @@ // Typography // ------------------------- -@sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif; +@sansFontFamily: "PT Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; @serifFontFamily: Georgia, "Times New Roman", Times, serif; @monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace; @baseFontSize: 14px; -@baseFontWeight: 400; +@baseFontWeight: 400; @baseFontFamily: @sansFontFamily; @baseLineHeight: 20px; @altFontFamily: @serifFontFamily; -@headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily -@headingsFontWeight: bold; // instead of browser default, bold +@headingsFontFamily: inherit; // inherit. empty to use BS default, @baseFontFamily +@headingsFontWeight: normal; // instead of browser default, bold +@headingsFontStyle: italic; @headingsColor: @textColor; // empty to use BS default, @textColor @@ -154,6 +158,8 @@ @btnInverseBackground: @white; @btnInverseBackgroundHighlight: darken(@grayLight, 15%); +@btnText: @grayLighter; + @iconContainerBackground: @white; @iconContainerBackgroundHighlight: lighten(@white, 5%); @iconContainerBorder: 1px solid rgba(0,0,0, 0.05); diff --git a/public/vendor/bootstrap/less/buttons.less b/public/vendor/bootstrap/less/buttons.less index 4cd4d862b38..94922100e0c 100644 --- a/public/vendor/bootstrap/less/buttons.less +++ b/public/vendor/bootstrap/less/buttons.less @@ -17,8 +17,8 @@ text-align: center; vertical-align: middle; cursor: pointer; - .buttonBackground(@btnBackground, @btnBackgroundHighlight, @grayDark, 0 1px 1px rgba(255,255,255,.75)); - border: 1px solid @btnBorder; + .buttonBackground(@btnBackground, @btnBackgroundHighlight, @grayDark, 0 1px 1px rgba(255,255,255,.75)); + border: none; *border: 0; // Remove the border to prevent IE7's black border on input:focus border-bottom-color: darken(@btnBorder, 10%); .border-radius(@baseBorderRadius); @@ -226,3 +226,8 @@ input[type="submit"].btn { color: @grayDark; text-decoration: none; } + +.btnText { + color: @btnText; + margin: 0 10px; +} \ No newline at end of file diff --git a/public/vendor/bootstrap/less/mixins.less b/public/vendor/bootstrap/less/mixins.less index 857561e9a08..e0aef540dd4 100644 --- a/public/vendor/bootstrap/less/mixins.less +++ b/public/vendor/bootstrap/less/mixins.less @@ -514,6 +514,7 @@ // gradientBar will set the background to a pleasing blend of these, to support IE<=9 .gradientBar(@startColor, @endColor, @textColor, @textShadow); *background-color: @endColor; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ + box-shadow: inset 0 -3px rgba(0,0,0,0.3); .reset-filter(); // in these cases the gradient won't cover the background, so we override