Commit fdffb03e by Torkel Ödegaard

Css polish and tweaks

parent 647feb7b
......@@ -11,19 +11,19 @@
<ul class="grafana-target-controls">
<li ng-show="parserError">
<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>
</li>
<li>
<a class="pointer" tabindex="1" ng-click="showTextEditor = !showTextEditor">
<i class="icon-pencil"></i>
<i class="icon icon-pencil"></i>
</a>
</li>
<li class="dropdown">
<a class="pointer dropdown-toggle"
data-toggle="dropdown"
tabindex="1">
<i class="icon-cog"></i>
<i class="icon icon-cog"></i>
</a>
<ul class="dropdown-menu pull-right" role="menu">
<li role="menuitem">
......@@ -42,7 +42,7 @@
</li>
<li>
<a class="pointer" tabindex="1" ng-click="removeDataQuery(target)">
<i class="icon-remove"></i>
<i class="icon icon-remove"></i>
</a>
</li>
</ul>
......
......@@ -212,7 +212,8 @@ div.subnav {
.nav-tabs {
border-bottom: 1px solid @grayDark;
border-bottom: 1px solid @fullEditBorder;
& > li > a {
.border-radius(0);
......
......@@ -8,8 +8,6 @@
}
.grafana-console-header {
background: @fullEditTabsBackground;
border-top: @fullEditTabsBorder;
padding: 2px 5px;
}
......
......@@ -190,46 +190,6 @@
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 {
border-bottom: 1px solid @grafanaTargetBorder;
}
......@@ -344,10 +304,13 @@ input[type=text].grafana-function-param-input {
white-space: nowrap;
}
a {
padding: 8px 7px;
.icon {
position: relative;
top: 8px;
}
a {
padding: 8px 7px;
color: @grafanaTargetColor;
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 {
border-bottom: 1px solid @grayDark;
border-bottom: 1px solid @fullEditBorder;
padding-right: 20px;
float: left;
color: @linkColor;
......
......@@ -34,10 +34,7 @@
@submenuBorder: #202020;
// Tabs
@fullEditTabsBackground: @grayDark;
@fullEditBorder: #555;
@fullEditBackground: transparent;
@fullEditTabsBorder: @black;
// Graphite Target Editor
@grafanaTargetBorder: @black;
......
......@@ -38,10 +38,7 @@
@submenuBorder: @white;
// Tabs
@fullEditTabsBackground: @white;
@fullEditBorder: @white;
@fullEditBackground: @navbarBackground;
@fullEditTabsBorder: @white;
// Graphite Target Editor
@grafanaTargetBorder: @submenuBackground;
......
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