more style and layout changes

This commit is contained in:
adriant 2014-12-12 11:23:15 +13:00
parent 1f8436119c
commit f35c33e056
5 changed files with 21 additions and 24 deletions

View File

@ -336,7 +336,7 @@
Dashing.on('ready', function() {
var contentWidth;
Dashing.widget_margins || (Dashing.widget_margins = [5, 5]);
Dashing.widget_base_dimensions || (Dashing.widget_base_dimensions = [310, 350]);
Dashing.widget_base_dimensions || (Dashing.widget_base_dimensions = [300, 340]);
Dashing.numColumns || (Dashing.numColumns = 6);
contentWidth = (Dashing.widget_base_dimensions[0] + Dashing.widget_margins[0] * 2) * Dashing.numColumns;
return Batman.setImmediate(function() {

View File

@ -3,20 +3,20 @@
width: 100%;
padding: 5px;
position: relative;
background-color: #30A2BD;
background-color: #1b5c6c;
vertical-align: baseline; }
.widget.widget-progress-bars * {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box; }
.widget.widget-progress-bars .title {
color: #dcf1f6;
color: #ffffff;
margin-bottom: 5px; }
.widget.widget-progress-bars .rows-container {
height: 85%;
width: 100%;
color: #dcf1f6;
font-size: 0.7em;
color: #ffffff;
font-size: 1em;
text-align: center; }
.widget.widget-progress-bars .row {
height: 0%;
@ -33,7 +33,7 @@
.widget.widget-progress-bars .project-name {
display: inline-block;
width: 35%;
padding-right: 0.7em;
padding-right: 1em;
text-align: left;
vertical-align: middle;
text-overflow: ellipsis;
@ -43,17 +43,16 @@
display: inline-block;
width: 65%;
vertical-align: middle;
border: 0.23333em solid #267f94;
border-radius: 1.4em;
background-color: #8bd1e2; }
border: 0.33333em solid #113943;
border-radius: 2em;
background-color: #3ab1cd; }
.widget.widget-progress-bars .outer-progress-bar .inner-progress-bar {
background-color: #267f94;
border-radius: 0.35em;
background-color: #113943;
border-radius: 0.5em;
color: #ffffff;
white-space: pre;
font-size: 1em; }
white-space: pre; }
.widget.widget-progress-bars .zebra-stripe {
background-color: #4eb9d2; }
background-color: #267f94; }
.widget-iframe {
padding: 3px 0px 0px 0px !important; }

View File

@ -4,9 +4,8 @@ from example_samplers import (
RegionsRAMSampler,
RegionsCPUSampler,
NagiosSampler,
BuzzwordsSampler,
ConvergenceSampler,
UsageGaugeSampler,
# BuzzwordsSampler,
# ConvergenceSampler,
)

View File

@ -44,14 +44,14 @@
<div data-id="ram_regions" data-view="ProgressBars" data-title="RAM usage per region"></div>
</li>
<li data-row="2" data-col="1" data-sizex="1" data-sizey="2">
<!-- <li data-row="2" data-col="1" data-sizex="1" data-sizey="2">
<div data-id="buzzwords" data-view="List" data-unordered="true" data-title="Buzzwords" data-moreinfo="Absolute ranking of pony preferences"></div>
</li>
<li data-row="4" data-col="2" data-sizex="2" data-sizey="1">
<li data-row="3" data-col="2" data-sizex="2" data-sizey="1">
<div data-id="convergence" data-view="Graph" data-title="Convergence" style="background-color:#ff9618"></div>
</li>
-->
</ul>
</div>
</body>

View File

@ -5,18 +5,18 @@
// row-size is a magic number used for scaling. It will make things bigger
// or smaller but always in proportion with each other. Feel free to change
// this to reflect your personal needs.
$row-size: 0.7em;
$row-size: 1em;
$blue: #30A2BD;
$white: #ffffff;
$base-color: $blue;
$base-color: darken($blue, 20%);
$base-color-dark: darken($base-color, 10%);
$base-color-light: lighten($base-color, 10%);
$base-color-lighter: lighten($base-color, 25%);
$base-color-lightest: lighten($base-color, 45%);
$text-color: $base-color-lightest;
$text-color: $white;
// ----------------------------------------------------------------------------
// Widget-project-completion styles
@ -88,7 +88,6 @@ $text-color: $base-color-lightest;
border-radius: $row-size / 2;
color: $white;
white-space: pre;
font-size: 1em;
}
}