Css polish and tweaks

This commit is contained in:
Torkel Ödegaard
2014-08-26 15:02:25 +02:00
parent 647feb7b33
commit fdffb03eba
6 changed files with 12 additions and 65 deletions
+4 -4
View File
@@ -11,19 +11,19 @@
<ul class="grafana-target-controls"> <ul class="grafana-target-controls">
<li ng-show="parserError"> <li ng-show="parserError">
<a bs-tooltip="parserError" style="color: rgb(229, 189, 28)" role="menuitem"> <a bs-tooltip="parserError" style="color: rgb(229, 189, 28)" role="menuitem">
<i class="icon-warning-sign"></i> <i class="icon icon-warning-sign"></i>
</a> </a>
</li> </li>
<li> <li>
<a class="pointer" tabindex="1" ng-click="showTextEditor = !showTextEditor"> <a class="pointer" tabindex="1" ng-click="showTextEditor = !showTextEditor">
<i class="icon-pencil"></i> <i class="icon icon-pencil"></i>
</a> </a>
</li> </li>
<li class="dropdown"> <li class="dropdown">
<a class="pointer dropdown-toggle" <a class="pointer dropdown-toggle"
data-toggle="dropdown" data-toggle="dropdown"
tabindex="1"> tabindex="1">
<i class="icon-cog"></i> <i class="icon icon-cog"></i>
</a> </a>
<ul class="dropdown-menu pull-right" role="menu"> <ul class="dropdown-menu pull-right" role="menu">
<li role="menuitem"> <li role="menuitem">
@@ -42,7 +42,7 @@
</li> </li>
<li> <li>
<a class="pointer" tabindex="1" ng-click="removeDataQuery(target)"> <a class="pointer" tabindex="1" ng-click="removeDataQuery(target)">
<i class="icon-remove"></i> <i class="icon icon-remove"></i>
</a> </a>
</li> </li>
</ul> </ul>
+2 -1
View File
@@ -212,7 +212,8 @@ div.subnav {
.nav-tabs { .nav-tabs {
border-bottom: 1px solid @grayDark; border-bottom: 1px solid @fullEditBorder;
& > li > a { & > li > a {
.border-radius(0); .border-radius(0);
-2
View File
@@ -8,8 +8,6 @@
} }
.grafana-console-header { .grafana-console-header {
background: @fullEditTabsBackground;
border-top: @fullEditTabsBorder;
padding: 2px 5px; padding: 2px 5px;
} }
+6 -52
View File
@@ -190,46 +190,6 @@
position:relative; position:relative;
} }
.panel-full-edit-tabs {
margin-top: 30px;
min-height: 250px;
margin-left: -10px;
margin-right: -10px;
background-color: @fullEditBackground;
border-top: 1px solid @fullEditBorder;
.tabs {
.nav-tabs {
margin: 0;
background: @fullEditTabsBackground;
border-top: 1px solid @fullEditTabsBorder;
border-bottom: 1px solid @fullEditTabsBorder
}
.tab-content {
display: none;
}
}
.tab-content {
overflow: visible;
padding: 15px;
background-color: @grafanaPanelBackground;
border-top: 1px solid @fullEditBorder;
}
.nav-tabs > li {
margin-bottom: 0;
}
.nav-tabs > li > a {
line-height: 15px;
padding-top: 6px;
padding-bottom: 6px;
font-size: 0.8rem;
}
}
.grafana-target:last-child { .grafana-target:last-child {
border-bottom: 1px solid @grafanaTargetBorder; border-bottom: 1px solid @grafanaTargetBorder;
} }
@@ -344,10 +304,13 @@ input[type=text].grafana-function-param-input {
white-space: nowrap; white-space: nowrap;
} }
a { .icon {
padding: 8px 7px;
position: relative; position: relative;
top: 8px; top: 8px;
}
a {
padding: 8px 7px;
color: @grafanaTargetColor; color: @grafanaTargetColor;
font-size: 16px; font-size: 16px;
@@ -572,17 +535,8 @@ select.grafana-target-segment-input {
} }
} }
// .panel-fullscreen {
// .dashboard-editor-header {
// margin-left: -20px;
// margin-right: -20px;
// background: @grayDark;
// padding-left: 20px;
// }
// }
.dashboard-editor-title { .dashboard-editor-title {
border-bottom: 1px solid @grayDark; border-bottom: 1px solid @fullEditBorder;
padding-right: 20px; padding-right: 20px;
float: left; float: left;
color: @linkColor; color: @linkColor;
-3
View File
@@ -34,10 +34,7 @@
@submenuBorder: #202020; @submenuBorder: #202020;
// Tabs // Tabs
@fullEditTabsBackground: @grayDark;
@fullEditBorder: #555; @fullEditBorder: #555;
@fullEditBackground: transparent;
@fullEditTabsBorder: @black;
// Graphite Target Editor // Graphite Target Editor
@grafanaTargetBorder: @black; @grafanaTargetBorder: @black;
-3
View File
@@ -38,10 +38,7 @@
@submenuBorder: @white; @submenuBorder: @white;
// Tabs // Tabs
@fullEditTabsBackground: @white;
@fullEditBorder: @white; @fullEditBorder: @white;
@fullEditBackground: @navbarBackground;
@fullEditTabsBorder: @white;
// Graphite Target Editor // Graphite Target Editor
@grafanaTargetBorder: @submenuBackground; @grafanaTargetBorder: @submenuBackground;