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

Various css updates

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-02-07 22:00:33 +01:00
parent 48e5a82e7f
commit f82cb3aefe
4 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/features/annotations/partials/editor.html
View File

@@ -27,16 +27,17 @@
<i class="fa fa-bolt"></i> &nbsp;
{{annotation.name}}
</td>
<td style="width: 1%">
<a ng-click="edit(annotation)" class="btn btn-success btn-small">
<td style="width: 1%"><i ng-click="_.move(annotations,$index,$index-1)" ng-hide="$first" class="pointer fa fa-arrow-up"></i></td>
<td style="width: 1%"><i ng-click="_.move(annotations,$index,$index+1)" ng-hide="$last" class="pointer fa fa-arrow-down"></i></td>
<td style="width: 1%" class="nobg">
<a ng-click="edit(annotation)" class="btn btn-inverse btn-mini">
<i class="fa fa-edit"></i>
Edit
</a>
</td>
<td style="width: 1%"><i ng-click="_.move(annotations,$index,$index-1)" ng-hide="$first" class="pointer fa fa-arrow-up"></i></td>
<td style="width: 1%"><i ng-click="_.move(annotations,$index,$index+1)" ng-hide="$last" class="pointer fa fa-arrow-down"></i></td>
<td style="width: 1%">
<a ng-click="removeAnnotation(annotation)" class="btn btn-danger btn-small">
<td style="width: 1%" class="nobg">
<a ng-click="removeAnnotation(annotation)" class="btn btn-danger btn-mini">
<i class="fa fa-remove"></i>
</a>
</td>

6
src/app/features/profile/partials/profile.html
View File

@@ -55,9 +55,9 @@
<table class="grafana-options-table">
<tr ng-repeat="ac in accounts">
<td style="width: 98%">Name: {{ac.name}}</td>
<td>Role: {{ac.role}}</td>
<td>
<td style="width: 98%"><strong>Name: </strong> {{ac.name}}</td>
<td><strong>Role: </strong> {{ac.role}}</td>
<td class="nobg max-width-btns">
<span class="btn btn-primary" ng-show="ac.isUsing">
Current
</span>

24
src/css/less/tables_lists.less
View File

@@ -3,13 +3,22 @@
tr:nth-child(odd) td {
background-color: @grafanaListAccent;
&.nobg {
background-color: transparent;
border:none;
border-left: 1px solid @grafanaListBorderBottom;
}
}
td, th {
text-align: left;
td {
padding: 5px 10px;
white-space: nowrap;
border-bottom: 1px solid @grafanaListBorderBottom;
&.nobg {
background-color: transparent;
border:none;
border-left: 1px solid @grafanaListBorderBottom;
}
}
tr:first-child {
@@ -25,6 +34,17 @@
td:last-child {
border-right: 1px solid @grafanaListBorderBottom;
}
.max-width-btns {
.btn {
width: 100%;
}
}
strong {
font-weight: normal;
color: @white;
}
}
.max-width {

8
src/css/less/variables.dark.less
View File

@@ -16,7 +16,7 @@
// Accent colors
// -------------------------
@blue: #33B5E5;
@blueDark: #0086b3;
@blueDark: #005f81;
@green: #669900;
@red: #CC3900;
@yellow: #ECBB13;
@@ -89,7 +89,7 @@
@grafanaListAccent: lighten(@grayDarker, 2%);
@grafanaListBorderTop: @grayDark;
@grafanaListBorderBottom: @black;
@grafanaListHighlight: #343434;
@grafanaListHighlight: #333;
@grafanaListMainLinkColor: @textColor;
// Scrollbars
@@ -110,8 +110,8 @@
@btnBackgroundHighlight: darken(@grayLight, 15%);
@btnBorder: #bbb;
@btnPrimaryBackground: lighten(@blueDark, 5%);
@btnPrimaryBackgroundHighlight: darken(@blueDark, 5%);
@btnPrimaryBackground: @blueDark;
@btnPrimaryBackgroundHighlight: lighten(@blueDark, 10%);
@btnInfoBackground: lighten(@purple, 5%);
@btnInfoBackgroundHighlight: darken(@purple, 5%);