Skip to content

Commit

Permalink
Merge pull request #57 from Icinga/feature/refine-layout
Browse files Browse the repository at this point in the history
Refine Dashing layout
  • Loading branch information
Michael Friedrich authored Mar 8, 2018
2 parents 5c2e3b4 + 80151b3 commit 0fefdb7
Show file tree
Hide file tree
Showing 28 changed files with 1,890 additions and 937 deletions.
217 changes: 145 additions & 72 deletions README.md

Large diffs are not rendered by default.

Binary file added assets/fonts/FontAwesome.otf
Binary file not shown.
Binary file modified assets/fonts/fontawesome-webfont.eot
Binary file not shown.
330 changes: 293 additions & 37 deletions assets/fonts/fontawesome-webfont.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/fonts/fontawesome-webfont.ttf
Binary file not shown.
Binary file modified assets/fonts/fontawesome-webfont.woff
Binary file not shown.
Binary file added assets/fonts/fontawesome-webfont.woff2
Binary file not shown.
Binary file added assets/images/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/icinga-hero-background.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions assets/javascripts/application.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ console.log("Yeah! The dashboard has started!")

Dashing.on 'ready', ->
Dashing.widget_margins ||= [5, 5]
Dashing.widget_base_dimensions ||= [250, 250]
Dashing.numColumns ||= 6
Dashing.widget_base_dimensions ||= [300, 300]
Dashing.numColumns ||= 5

contentWidth = (Dashing.widget_base_dimensions[0] + Dashing.widget_margins[0] * 2) * Dashing.numColumns

Expand Down
2 changes: 2 additions & 0 deletions assets/javascripts/gridster/jquery.gridster.min.js

Large diffs are not rendered by default.

76 changes: 27 additions & 49 deletions assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,26 @@
// ----------------------------------------------------------------------------
// Sass declarations
// ----------------------------------------------------------------------------
$background-color: #fff;
$text-color: #fff;
$text-color: rgba(255, 255, 255, 0.97);
$value-color: rgba(255, 255, 255, 0.97);

$background-warning-color-1: #e82711;
$background-warning-color-2: #9b2d23;
$text-warning-color: #fff;
$label-color: rgba(255, 255, 255, 0.7);
$title-color: rgba(255, 255, 255, 0.7);
$title-color-uns: rgba(0, 0, 0, 0.7);
$moreinfo-color: rgba(255, 255, 255, 0.7);
$updatedat-color: rgba(255, 255, 255, 0.0); //hide last updated entirely

$background-danger-color-1: #eeae32;
$background-danger-color-2: #ff9618;
$text-danger-color: #fff;
$background-color: transparent;
$background-color-transparent-factor: 0.75; //change this to influence transparency factor on simplelist/list background color

$icinga-blue: #0095bf;
$background-color-green: rgba(68, 187, 119, $background-color-transparent-factor);
$background-color-red: rgba(255, 85, 102, $background-color-transparent-factor);
$background-color-yellow: rgba(255, 170, 68, $background-color-transparent-factor);
$background-color-purple: rgba(170, 68, 255, $background-color-transparent-factor);
$background-color-grey: rgba(153, 153, 153, $background-color-transparent-factor);

$icinga-blue: rgba(0, 149, 191, 1);

@-webkit-keyframes status-warning-background {
0% { background-color: $background-warning-color-1; }
50% { background-color: $background-warning-color-2; }
100% { background-color: $background-warning-color-1; }
}
@-webkit-keyframes status-danger-background {
0% { background-color: $background-danger-color-1; }
50% { background-color: $background-danger-color-2; }
100% { background-color: $background-danger-color-1; }
}
@mixin animation($animation-name, $duration, $function, $animation-iteration-count:""){
-webkit-animation: $animation-name $duration $function #{$animation-iteration-count};
-moz-animation: $animation-name $duration $function #{$animation-iteration-count};
Expand All @@ -38,7 +35,14 @@ $icinga-blue: #0095bf;
// Base styles
// ----------------------------------------------------------------------------
html {
background-color: $icinga-blue;
background-image: url("icinga-hero-background.jpg");
background-color: $background-color;
/* Stretch the background image, don't duplicate it */
-webkit-background-size: cover; /* For WebKit */
-moz-background-size: cover; /* Mozilla */
-o-background-size: cover; /* Opera */
background-size: cover; /* Generic */

font-size: 100%;
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%;
Expand Down Expand Up @@ -158,7 +162,8 @@ h3 {
text-align: center;
width: 100%;
height: 100%;
background-color: $icinga-blue;
//background-color: $icinga-blue;
background-color: $background-color;
/* Hack to fill the surrounding list element */
position: absolute;
top: 0;
Expand Down Expand Up @@ -198,34 +203,7 @@ h3 {
.updated-at {
padding: 5px;
font-size: 12px;
color: rgba(0, 0, 0, 0.3);
}

.widget.status-warning {
background-color: $background-warning-color-1;
@include animation(status-warning-background, 2s, ease, infinite);

.icon-warning-sign {
display: inline-block;
}

.title, .more-info {
color: $text-warning-color;
}
}

.widget.status-danger {
color: $text-danger-color;
background-color: $background-danger-color-1;
@include animation(status-danger-background, 2s, ease, infinite);

.icon-warning-sign {
display: inline-block;
}

.title, .more-info {
color: $text-danger-color;
}
color: $updatedat-color;
}

#save-gridster {
Expand Down
Loading

0 comments on commit 0fefdb7

Please sign in to comment.