IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Trent White
2016-02-11 12:02:12 -05:00
parent ff913333a2
commit cd40362d47
7 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/features/datasources/partials/edit.html
View File

@@ -64,9 +64,9 @@
</div>
<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-large 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-success" ng-show="isNew" ng-click="saveChanges()">Add</button>
<button type="submit" class="btn btn-success" ng-show="!isNew" ng-click="saveChanges()">Save</button>
<button type="submit" class="btn btn-inverse" ng-show="!isNew" ng-click="saveChanges(true)">
Test Connection
</button>
<a class="btnText" href="datasources">Cancel</a>

7
public/less/gfbox.less
View File

@@ -71,7 +71,10 @@
.page-container {
background-color: @pageBackground;
position: relative;
padding: 25px 60px 60px 88px;
padding: 25px 56px;
min-height: 900px;
max-width: 1060px;
margin-left: 0;
}
@@ -90,7 +93,7 @@
flex-wrap: wrap-reverse;
}
.page-wide {
max-width: 1000px;
max-width: 1060px;
}
.page-wide-margined {

3
public/less/grafana.less
View File

@@ -29,7 +29,8 @@
@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);
// @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 {
padding:0px;

2
public/less/navbar.less
View File

@@ -81,7 +81,7 @@
overflow: hidden;
white-space: nowrap;
display: block;
padding: 16px 17px 15px 13px;
padding: 16px 17px 16px 13px;
}
.fa-th-large {

4
public/less/normform.less
View File

@@ -157,7 +157,7 @@ input[type=text].norm-form-clear-input {
padding: 8px 6px;
height: 100%;
box-sizing: border-box;
font-size: 16px;
font-size: 15px;
&.last {
border-right: none;
}
@@ -181,7 +181,7 @@ select.norm-form-input {
border-radius: 0;
height: 36px;
padding: 9px 3px;
font-size: 16px;
font-size: 15px;
&.last {
border-right: none;
}

14
public/less/sidemenu.less
View File

@@ -6,13 +6,13 @@
position: absolute;
top: 52px;
left: 0;
width: 200px;
background-color: @sideMenuBackground;
width: 220px;
background-color: @bodyBackground;
border: @sideMenuBorder;
z-index: 101;
transform: translate3d(0, -100%, 0);
visibility: hidden;
box-shadow: @sideMenuShadow;
// box-shadow: @sideMenuShadow;
a:focus {
text-decoration: none;
@@ -35,13 +35,13 @@
padding-left: 210px;
}
.page-container {
margin-left: 190px;
padding-left: 55px;
margin-left: 195px;
padding-left: 77px;
}
.top-nav-menu-btn {
a {
background-color: @sideMenuBackground;
padding-right: 46px;
padding-right: 67px;
padding-left: 24px;
}
.icon-gf-grafana_wordmark {
@@ -207,7 +207,7 @@
.sidemenu-org .fa-caret-right {
position: absolute;
top: 50%;
right: 4px;
right: 25px;
font-size: 80%;
color: @linkColor;
}

11
public/less/variables.dark.less
View File

@@ -34,7 +34,7 @@
// grafana Variables
// -------------------------
@grafanaPanelBackground: @grayDarker;
@grafanaPanelBorder: solid 1px @grayDark;
@grafanaPanelBorder: solid 1px @grayDark;
@grafanaTriggerBorder: solid 1px #555;
// Graphite Target Editor
@@ -54,9 +54,8 @@
// Scaffolding
// -------------------------
// @bodyBackground: rgb(20,20,20);
@bodyBackground: rgb(20,20,20);
@pageBackground: @grayDarker;
@bodyBackground: @pageBackground;
@textColor: @grayLighter;
// Links
@@ -68,11 +67,11 @@
// 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;
@monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace;
@baseFontSize: 14px;
@baseFontSize: 13px;
@baseFontWeight: 400;
@baseFontFamily: @sansFontFamily;
@baseLineHeight: 20px;
@@ -80,7 +79,7 @@
@headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily
@headingsFontWeight: 200; // instead of browser default, bold
@headingsFontStyle: italic;
@headingsFontStyle: normal;
@headingsColor: darken(@white,11%); // empty to use BS default, @textColor
@inputText: @black;