From d2c0dd68538434c85644274341aeabdb249e970c Mon Sep 17 00:00:00 2001 From: juanmont Date: Thu, 3 Nov 2016 18:59:53 +0100 Subject: [PATCH] F #4373 Added a custom css file in css folder - changed some SCSS file to work with labels - Added link custom.css in index.erb --- src/sunstone/public/css/custom.css | 146 ++++++++++++++++++++++++ src/sunstone/public/scss/_menu.scss | 4 +- src/sunstone/public/scss/_settings.scss | 5 + src/sunstone/public/scss/app.scss | 12 +- src/sunstone/views/index.erb | 2 + 5 files changed, 163 insertions(+), 6 deletions(-) create mode 100644 src/sunstone/public/css/custom.css diff --git a/src/sunstone/public/css/custom.css b/src/sunstone/public/css/custom.css new file mode 100644 index 0000000000..fe90c1c6a0 --- /dev/null +++ b/src/sunstone/public/css/custom.css @@ -0,0 +1,146 @@ +/* +.primary-color { + color: #4DBBD3; +} +.secondary-color { + color: #8a8a8a; +} +.success-color { + color: #3adb76; +} +.warning-color { + color: #ffae00; +} +.alert-color { + color: #ec5840; +}*/ + +/*-----APP----*/ + +body{ + padding:0;margin:0; + font-family:"Lato","Helvetica Neue",Helvetica,Roboto,Arial,sans-serif; + font-weight:300; + line-height:1.5; + color:#0a0a0a; + background:#fefefe; +} + +h1, +h2, +h3, +h4, +h5, +h6 { + font-weight: bold; + color: #555; +} + +.thin-font { + color: #333; +} + +label.secondary.is-invalid-label { + background-color: #ec5840; +} + +.log-tab { + background: #6f6f6f; + color: #f2f2f2; +} + +fieldset legend { + border-bottom: .1538461538rem solid #4DBBD3; + color: #555; +} + + +/*----BUTTONS----*/ +.button { + font-weight: bold; + margin-right: 0.2rem; + box-shadow: 0 2px 5px 1px rgba(0,0,0,0.1); + font-size: 1rem; + background-color: #4DBBD3; + color: #fefefe; +} +.button.secondary { + background-color: #8a8a8a; + color: #fefefe; +} +.button.success { + background-color: #3adb76; + color: #fefefe; +} +.button.alert { + background-color: #ec5840; + color: #fefefe; +} + +/*----MENU----*/ + +#menu-wrapper { + border: 1px solid #dfdfdf; + background: #f8f8f8; +} + +#menu #li_support-tab a { + border: 1px solid #dfdfdf; + background: #fff; +} + +/*----LAYOUT---*/ + +#footer { + font-size: 0.8rem; + color:#8a8a8a; +} + +#footer a{ + color: #8a8a8a; +} + +.provision-logo img { + height: 3rem; +} + +#top-row .user-zone-info a{ + font-weight:bold; + color:#555; +} +#top-row .user-zone-info .submenu a{ + color:#8a8a8a; +} +#top-row .user-zone-info .submenu a:hover{ + color:#0a0a0a; +} + +.labels-tree li .labeltree-line{ + color:#8a8a8a; +} +.labels-tree li .labeltree-line:hover{ + color:#0a0a0a; +} +.labels-tree li .labeltree-line .active{ + color:#333; + font-weight:bold; +} +.labels-tree .tree-toggle:hover{ + color:#0a0a0a; +} + +/*----TABLE----*/ + +table tbody{ + border-top:1px solid #f4f4f4; + /*color: #fff; + background: #4DBBD3;*/ + border-bottom:1px solid #f4f4f4; +} +table thead th{ + color:#555; +} +table .markrow,table .markrowchecked{ + background-color:#f4f4f4; + font-weight:normal; +} \ No newline at end of file diff --git a/src/sunstone/public/scss/_menu.scss b/src/sunstone/public/scss/_menu.scss index 3fcf516295..42ec934929 100644 --- a/src/sunstone/public/scss/_menu.scss +++ b/src/sunstone/public/scss/_menu.scss @@ -51,7 +51,7 @@ margin-top: 1rem; border: 1px solid #dfdfdf; padding: 1rem; - background: #fff; + background: $bg-li-support-tab; .support_connect { span { @@ -89,7 +89,7 @@ padding-top: 9rem; padding-bottom: 1rem; margin-top: -8rem; - background: #f8f8f8; + background: $bg-menu-wrapper; //margin-right: 1rem; //background-color: white &.menu-small { diff --git a/src/sunstone/public/scss/_settings.scss b/src/sunstone/public/scss/_settings.scss index ca9b125029..4586a5bd56 100644 --- a/src/sunstone/public/scss/_settings.scss +++ b/src/sunstone/public/scss/_settings.scss @@ -71,6 +71,11 @@ $error-color: #cf280e; $powering_off-color: #cf280e; $off-color: #555; $running-color: #368a54; +$bg-menu-wrapper: #f8f8f8; +$bg-li-support-tab: #fff; +$headers-color: #555; +$bg-log-tab: #6f6f6f; +$log-tab-color: #f2f2f2; $body-background: $white; $body-font-color: $black; diff --git a/src/sunstone/public/scss/app.scss b/src/sunstone/public/scss/app.scss index 3a0edb6ce9..b28de16eb0 100644 --- a/src/sunstone/public/scss/app.scss +++ b/src/sunstone/public/scss/app.scss @@ -11,6 +11,7 @@ @include foundation-progress-element; @include foundation-meter-element; + @mixin thin-font { font-weight: 300; color: $black; @@ -38,6 +39,8 @@ @import './visjs'; @import './flot'; + + //@font-face { // font-family: 'Open Sans'; // font-style: normal; @@ -136,7 +139,7 @@ h4, h5, h6 { font-weight: bold; - color: #555; + color: $headers-color; padding: 1rem 0; /* box-shadow: 0 5px 5px -4px rgba(0,0,0,0.1); */ /* border-bottom: 1px solid #dfdfdf; */ @@ -205,8 +208,8 @@ meter { } .log-tab { - background: #6f6f6f; - color: #f2f2f2; + background: $bg-log-tab; + color: $log-tab-color; padding: 20px; } @@ -228,4 +231,5 @@ meter { .mb_input_unit { width: 4em; -} \ No newline at end of file +} + diff --git a/src/sunstone/views/index.erb b/src/sunstone/views/index.erb index 41f7ad04ee..30334243df 100644 --- a/src/sunstone/views/index.erb +++ b/src/sunstone/views/index.erb @@ -57,8 +57,10 @@ <% if $conf[:env] == 'dev' %> + <% else %> + <% end %>