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

Merge branch 'pluginlist'

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-04-11 21:10:54 -04:00
parent 7031645f4b 6ce934f1dd
commit 497e9343aa
46 changed files with 866 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/sass/_grafana.scss
View File

@@ -42,6 +42,7 @@
@import "components/panel_graph";
@import "components/submenu";
@import "components/panel_dashlist";
@import "components/panel_pluginlist";
@import "components/panel_singlestat";
@import "components/panel_table";
@import "components/panel_text";

21
public/sass/_variables.dark.scss
View File

@@ -70,6 +70,7 @@ $page-gradient: linear-gradient(60deg, transparent 70%, darken($page-bg, 4%) 98%
$link-color: darken($white,11%);
$link-color-disabled: darken($link-color,30%);
$link-hover-color: $white;
$external-link-color: $blue;
// Typography
// -------------------------
@@ -241,14 +242,6 @@ $successBackground: $btn-success-bg;
$infoText: $blue-dark;
$infoBackground: $blue-dark;
// Tooltips and popovers
// -------------------------
$tooltipColor: $text-color;
$tooltipBackground: $dark-4;
$tooltipArrowWidth: 5px;
$tooltipArrowColor: $tooltipBackground;
$tooltipLinkColor: $link-color;
// popover
$popover-bg: $dark-4;
$popover-color: $text-color;
@@ -256,6 +249,16 @@ $popover-color: $text-color;
$popover-help-bg: $btn-secondary-bg;
$popover-help-color: $text-color;
// Tooltips and popovers
// -------------------------
$tooltipColor: $text-color;
$tooltipBackground: $dark-5;
$tooltipArrowWidth: 5px;
$tooltipArrowColor: $tooltipBackground;
$tooltipLinkColor: $link-color;
$graph-tooltip-bg: $dark-5;
// images
$checkboxImageUrl: '../img/checkbox.png';
@@ -263,5 +266,3 @@ $checkboxImageUrl: '../img/checkbox.png';
$card-background: linear-gradient(135deg, #2f2f2f, #262626);
$card-background-hover: linear-gradient(135deg, #343434, #262626);
$card-shadow: -1px -1px 0 0 hsla(0, 0%, 100%, .1), 1px 1px 0 0 rgba(0, 0, 0, .3);

18
public/sass/_variables.light.scss
View File

@@ -76,6 +76,7 @@ $page-gradient: linear-gradient(60deg, transparent 70%, darken($page-bg, 4%) 98%
$link-color: $gray-1;
$link-color-disabled: lighten($link-color, 30%);
$link-hover-color: darken($link-color, 20%);
$external-link-color: $blue;
// Typography
// -------------------------
@@ -267,6 +268,12 @@ $infoText: $blue;
$infoBackground: $blue-dark;
$infoBorder: transparent;
// popover
$popover-bg: $gray-5;
$popover-color: $text-color;
$popover-help-bg: $blue-dark;
$popover-help-color: $gray-6;
// Tooltips and popovers
// -------------------------
@@ -274,14 +281,8 @@ $tooltipColor: $text-color;
$tooltipBackground: $gray-5;
$tooltipArrowWidth: 5px;
$tooltipArrowColor: $tooltipBackground;
$tooltipLinkColor: $text-color;
// popover
$popover-bg: $gray-5;
$popover-color: $text-color;
$popover-help-bg: $blue-dark;
$popover-help-color: $gray-6;
$tooltipLinkColor: $link-color;
$graph-tooltip-bg: $gray-5;
// images
$checkboxImageUrl: '../img/checkbox_white.png';
@@ -290,4 +291,3 @@ $checkboxImageUrl: '../img/checkbox_white.png';
$card-background: linear-gradient(135deg, $gray-5, $gray-6);
$card-background-hover: linear-gradient(135deg, $gray-6, $gray-7);
$card-shadow: -1px -1px 0 0 hsla(0, 0%, 100%, .1), 1px 1px 0 0 rgba(0, 0, 0, .1);

11
public/sass/base/_code.scss
View File

@@ -23,6 +23,16 @@ code {
white-space: nowrap;
}
code.code--small {
font-size: $font-size-xs;
padding: 5px;
margin: 0 2px;
}
p.code--line {
line-height: 1.8;
}
// Blocks of code
pre {
display: block;
@@ -49,4 +59,3 @@ pre {
border: 0;
}
}

2
public/sass/base/_type.scss
View File

@@ -114,7 +114,7 @@ hr {
small,
.small {
font-size: 85%;
font-size: $font-size-sm;
font-weight: normal;
}

29
public/sass/components/_cards.scss
View File

@@ -76,13 +76,20 @@
}
.card-item-header {
margin-bottom: $spacer;
}
.card-item-type {
color: $text-color-weak;
text-transform: uppercase;
margin-bottom: $spacer;
font-size: $font-size-sm;
font-weight: bold;
}
.card-item-notice {
font-size: $font-size-sm;
}
.card-item-name {
color: $headings-color;
overflow: hidden;
@@ -107,6 +114,16 @@
.card-list-layout-grid {
.card-item-type {
display: inline-block;
}
.card-item-notice {
font-size: $font-size-sm;
display: inline-block;
margin-left: $spacer;
}
.card-item-header-action {
float: right;
}
@@ -116,6 +133,10 @@
padding: 0 1.5rem 1.5rem 0rem;
}
.card-item-wrapper--clickable {
cursor: pointer;
}
.card-item-figure {
margin: 0 $spacer $spacer 0;
height: 6rem;
@@ -157,6 +178,10 @@
width: 100%;
}
.card-item-wrapper--clickable {
cursor: pointer;
}
.card-item {
border-bottom: .2rem solid $page-bg;
border-radius: 0;
@@ -165,6 +190,7 @@
.card-item-header {
float: right;
text-align: right;
}
.card-item-figure {
@@ -186,4 +212,3 @@
margin-right: 0;
}
}

8
public/sass/components/_panel_dashlist.scss
View File

@@ -1,3 +1,11 @@
.dashlist-section-header {
margin-bottom: $spacer;
color: $text-color-weak;
}
.dashlist-section {
margin-bottom: $spacer;
}
.dashlist-link {
display: block;

2
public/sass/components/_panel_graph.scss
View File

@@ -234,6 +234,8 @@
.graph-tooltip {
white-space: nowrap;
font-size: $font-size-sm;
background-color: $graph-tooltip-bg;
.graph-tooltip-time {
text-align: center;

75
public/sass/components/_panel_pluginlist.scss Normal file
View File

@@ -0,0 +1,75 @@
.pluginlist-section-header {
margin-bottom: $spacer;
color: $text-color-weak;
}
.pluginlist-section {
margin-bottom: $spacer;
}
.pluginlist-link {
display: block;
margin: 5px;
padding: 7px;
background-color: $tight-form-bg;
&:hover {
background-color: $tight-form-func-bg;
}
}
.pluginlist-icon {
vertical-align: sub;
font-size: $font-size-h1;
margin-right: $spacer / 2;
}
.pluginlist-image {
width: 20px;
}
.pluginlist-title {
margin-right: $spacer / 3;
}
.pluginlist-version {
font-size: $font-size-sm;
color: $text-color-weak;
}
.pluginlist-message {
float: right;
font-size: $font-size-sm;
}
.pluginlist-message--update {
&:hover {
border-bottom: 1px solid $text-color;
}
}
.pluginlist-message--enable{
color: $external-link-color;
&:hover {
border-bottom: 1px solid $external-link-color;
}
}
.pluginlist-message--no-update {
color: $text-color-weak;
}
.pluginlist-emphasis {
font-weight: 600;
}
.pluginlist-none-installed {
color: $text-color-weak;
font-size: $font-size-sm;
}
.pluginlist-inline-logo {
vertical-align: sub;
margin-right: $spacer / 3;
width: 16px;
}

2
public/sass/components/_tooltip.scss
View File

@@ -2,7 +2,6 @@
// Tooltips
// --------------------------------------------------
// Base class
.tooltip {
position: absolute;
@@ -37,6 +36,7 @@
border-color: transparent;
border-style: solid;
}
.tooltip {
&.top .tooltip-arrow {
bottom: 0;

4
public/sass/pages/_dashboard.scss
View File

@@ -278,11 +278,11 @@ div.flot-text {
.dashboard-header {
font-family: $headings-font-family;
font-size: $font-size-h2;
font-size: $font-size-h3;
text-align: center;
span {
display: inline-block;
@include brand-bottom-border();
padding: 1.2rem .5rem .4rem .5rem;
padding: 0.5rem .5rem .2rem .5rem;
}
}