Skip to content

N
nexpie-grafana-theme
Commit cd40362d by Trent White
Options

sidenav tweaks, creating a content channel for the main content on non-dashboard pages

parent ff913333
Showing with 25 additions and 22 deletions
public/app/features/datasources/partials/edit.html
...@@ -64,9 +64,9 @@ ...@@ -64,9 +64,9 @@
</div> </div>
<div class="" style="margin-top: 35px"> <div class="" style="margin-top: 35px">
<button type="submit" class="btn btn-large btn-success" ng-show="isNew" ng-click="saveChanges()">Add</button> <button type="submit" class="btn btn-success" ng-show="isNew" ng-click="saveChanges()">Add</button>
<button type="submit" class="btn btn-large btn-success" ng-show="!isNew" ng-click="saveChanges()">Save</button> <button type="submit" class="btn btn-success" ng-show="!isNew" ng-click="saveChanges()">Save</button>
<button type="submit" class="btn btn-large btn-inverse" ng-show="!isNew" ng-click="saveChanges(true)"> <button type="submit" class="btn btn-inverse" ng-show="!isNew" ng-click="saveChanges(true)">
Test Connection Test Connection
</button> </button>
<a class="btnText" href="datasources">Cancel</a> <a class="btnText" href="datasources">Cancel</a>
......
public/less/gfbox.less
...@@ -71,7 +71,10 @@ ...@@ -71,7 +71,10 @@
.page-container { .page-container {
background-color: @pageBackground; background-color: @pageBackground;
position: relative; position: relative;
padding: 25px 60px 60px 88px; padding: 25px 56px;
min-height: 900px;
max-width: 1060px;
margin-left: 0;
} }
...@@ -90,7 +93,7 @@ ...@@ -90,7 +93,7 @@
flex-wrap: wrap-reverse; flex-wrap: wrap-reverse;
} }
.page-wide { .page-wide {
max-width: 1000px; max-width: 1060px;
} }
.page-wide-margined { .page-wide-margined {
......
public/less/grafana.less
...@@ -29,7 +29,8 @@ ...@@ -29,7 +29,8 @@
@import "filter-table.less"; @import "filter-table.less";
@import "simple-box.less"; @import "simple-box.less";
@import "dropdown.less"; @import "dropdown.less";
@import url(https://fonts.googleapis.com/css?family=PT+Sans:400,700,400italic,700italic|PT+Sans+Caption:400,700); // @import url(https://fonts.googleapis.com/css?family=PT+Sans:400,700,400italic,700italic|PT+Sans+Caption:400,700);
@import url(https://fonts.googleapis.com/css?family=Open+Sans:400,300,400italic,600,700);
.row-control-inner { .row-control-inner {
padding:0px; padding:0px;
......
public/less/navbar.less
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
display: block; display: block;
padding: 16px 17px 15px 13px; padding: 16px 17px 16px 13px;
} }
.fa-th-large { .fa-th-large {
......
public/less/normform.less
...@@ -157,7 +157,7 @@ input[type=text].norm-form-clear-input { ...@@ -157,7 +157,7 @@ input[type=text].norm-form-clear-input {
padding: 8px 6px; padding: 8px 6px;
height: 100%; height: 100%;
box-sizing: border-box; box-sizing: border-box;
font-size: 16px; font-size: 15px;
&.last { &.last {
border-right: none; border-right: none;
} }
...@@ -181,7 +181,7 @@ select.norm-form-input { ...@@ -181,7 +181,7 @@ select.norm-form-input {
border-radius: 0; border-radius: 0;
height: 36px; height: 36px;
padding: 9px 3px; padding: 9px 3px;
font-size: 16px; font-size: 15px;
&.last { &.last {
border-right: none; border-right: none;
} }
......
public/less/sidemenu.less
...@@ -6,13 +6,13 @@ ...@@ -6,13 +6,13 @@
position: absolute; position: absolute;
top: 52px; top: 52px;
left: 0; left: 0;
width: 200px; width: 220px;
background-color: @sideMenuBackground; background-color: @bodyBackground;
border: @sideMenuBorder; border: @sideMenuBorder;
z-index: 101; z-index: 101;
transform: translate3d(0, -100%, 0); transform: translate3d(0, -100%, 0);
visibility: hidden; visibility: hidden;
box-shadow: @sideMenuShadow; // box-shadow: @sideMenuShadow;
a:focus { a:focus {
text-decoration: none; text-decoration: none;
...@@ -35,13 +35,13 @@ ...@@ -35,13 +35,13 @@
padding-left: 210px; padding-left: 210px;
} }
.page-container { .page-container {
margin-left: 190px; margin-left: 195px;
padding-left: 55px; padding-left: 77px;
} }
.top-nav-menu-btn { .top-nav-menu-btn {
a { a {
background-color: @sideMenuBackground; background-color: @sideMenuBackground;
padding-right: 46px; padding-right: 67px;
padding-left: 24px; padding-left: 24px;
} }
.icon-gf-grafana_wordmark { .icon-gf-grafana_wordmark {
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
.sidemenu-org .fa-caret-right { .sidemenu-org .fa-caret-right {
position: absolute; position: absolute;
top: 50%; top: 50%;
right: 4px; right: 25px;
font-size: 80%; font-size: 80%;
color: @linkColor; color: @linkColor;
} }
......
public/less/variables.dark.less
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
// grafana Variables // grafana Variables
// ------------------------- // -------------------------
@grafanaPanelBackground: @grayDarker; @grafanaPanelBackground: @grayDarker;
@grafanaPanelBorder: solid 1px @grayDark; @grafanaPanelBorder: solid 1px @grayDark;
@grafanaTriggerBorder: solid 1px #555; @grafanaTriggerBorder: solid 1px #555;
// Graphite Target Editor // Graphite Target Editor
...@@ -54,9 +54,8 @@ ...@@ -54,9 +54,8 @@
// Scaffolding // Scaffolding
// ------------------------- // -------------------------
// @bodyBackground: rgb(20,20,20); @bodyBackground: rgb(20,20,20);
@pageBackground: @grayDarker; @pageBackground: @grayDarker;
@bodyBackground: @pageBackground;
@textColor: @grayLighter; @textColor: @grayLighter;
// Links // Links
...@@ -68,11 +67,11 @@ ...@@ -68,11 +67,11 @@
// Typography // Typography
// ------------------------- // -------------------------
@sansFontFamily: "PT Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; @sansFontFamily: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
@serifFontFamily: Georgia, "Times New Roman", Times, serif; @serifFontFamily: Georgia, "Times New Roman", Times, serif;
@monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace; @monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace;
@baseFontSize: 14px; @baseFontSize: 13px;
@baseFontWeight: 400; @baseFontWeight: 400;
@baseFontFamily: @sansFontFamily; @baseFontFamily: @sansFontFamily;
@baseLineHeight: 20px; @baseLineHeight: 20px;
...@@ -80,7 +79,7 @@ ...@@ -80,7 +79,7 @@
@headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily @headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily
@headingsFontWeight: 200; // instead of browser default, bold @headingsFontWeight: 200; // instead of browser default, bold
@headingsFontStyle: italic; @headingsFontStyle: normal;
@headingsColor: darken(@white,11%); // empty to use BS default, @textColor @headingsColor: darken(@white,11%); // empty to use BS default, @textColor
@inputText: @black; @inputText: @black;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment