diff options
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/base.less | 12 | ||||
| -rwxr-xr-x | themes/build-themes.sh | 6 | ||||
| -rw-r--r-- | themes/theme2.less | 36 |
3 files changed, 26 insertions, 28 deletions
diff --git a/themes/base.less b/themes/base.less index 99c7cfc5..83602c3b 100644 --- a/themes/base.less +++ b/themes/base.less @@ -1,6 +1,6 @@ @import "../vendor/bootstrap/less/bootstrap"; -@icon-font-path: "../vendor/bootstrap/fonts/"; +@icon-font-path: "../fonts/"; body { padding-top: 50px; @@ -13,15 +13,15 @@ body { #shifts { td { &.free { - border: 1px solid @gray-light; + border: 1px solid @brand-danger; .bg-danger(); } &.occupied { - border: 1px solid @gray-light; + border: 1px solid @brand-success; .bg-success(); } &.collides { - border: 1px solid @gray-light; + border: 1px solid @brand-warning; .bg-warning(); } &.own { @@ -30,10 +30,6 @@ body { } } -.shifts-table { - overflow-x: scroll; -} - .row-day { border-top: 2px solid @gray-light; } diff --git a/themes/build-themes.sh b/themes/build-themes.sh index 5260ecb4..5ea1d63b 100755 --- a/themes/build-themes.sh +++ b/themes/build-themes.sh @@ -1,5 +1,5 @@ #!/bin/sh -lessc theme0.less ../public/css/theme0.css -lessc theme1.less ../public/css/theme1.css -lessc theme2.less ../public/css/theme2.css +lessc theme0.less > ../public/css/theme0.css +lessc theme1.less > ../public/css/theme1.css +lessc theme2.less > ../public/css/theme2.css diff --git a/themes/theme2.less b/themes/theme2.less index 8e49cffd..d5cac763 100644 --- a/themes/theme2.less +++ b/themes/theme2.less @@ -1,25 +1,27 @@ @import "../vendor/bootstrap/less/variables"; -@brand-primary: #41145A; -@brand-success: #33CC24; -@brand-info: #6E50B4; -@brand-warning: #FF8232; -@brand-danger: #FF5A46; +@brand-primary: #758499; +@brand-success: #7b9c41; +@brand-info: #9c7357; +@brand-warning: #e3a14d; +@brand-danger: #7f528b; -@state-success-text: @brand-success; -@state-success-bg: lighten(@brand-success,40%); -@state-success-border: darken(spin(@state-success-bg, -10), 5%); +@link-color: #58585a; -@state-info-text: @brand-info; -@state-info-bg: lighten(@brand-info,40%);//#d9edf7; -@state-info-border: darken(spin(@state-info-bg, -10), 7%); +@state-success-text: #638232; +@state-success-bg: lighten(@brand-success,50%); +@state-success-border: @brand-success; -@state-warning-text: #8a6d3b; -@state-warning-bg: @brand-warning;//#fcf8e3; -@state-warning-border: darken(spin(@state-warning-bg, -10), 5%); +@state-info-text: #826045; +@state-info-bg: lighten(@brand-info,50%); +@state-info-border: @brand-info; -@state-danger-text: @brand-danger; -@state-danger-bg: lighten(@brand-danger,30%);//#f2dede; -@state-danger-border: darken(spin(@state-danger-bg, -10), 5%); +@state-warning-text: #bc8640; +@state-warning-bg: lighten(@brand-warning,50%); +@state-warning-border: @brand-warning; + +@state-danger-text: #694374; +@state-danger-bg: lighten(@brand-danger,50%); +@state-danger-border: @brand-danger; @import "base.less"; |