From a02a97650beb7420048c3f64890fdd98b6a7dffd Mon Sep 17 00:00:00 2001 From: Vicente Falco Date: Fri, 13 Jan 2017 14:41:34 +0100 Subject: [PATCH] color default consignatarios --- @salix/app/src/styles/background.scss | 60 +++++++++++---------- @salix/app/src/styles/display.css | 2 +- @salix/crud/src/client/addresses/index.html | 2 +- services/nginx/logs/error.log | 2 + 4 files changed, 37 insertions(+), 29 deletions(-) diff --git a/@salix/app/src/styles/background.scss b/@salix/app/src/styles/background.scss index 34921ae46..3b5a996c7 100644 --- a/@salix/app/src/styles/background.scss +++ b/@salix/app/src/styles/background.scss @@ -1,27 +1,33 @@ -@import "colors"; - -$bg-main: $color-green; -$bg-minor: $color-orange; -$bg-content: $color-light-grey; -$bg-panel: $color-white; -$bg-dark-bar: $color-dark; -$bg-dark-menu: $color-dark-grey; - -html [bg-main], .bg-main { - background-color: $bg-main; -} -html [bg-minor], .bg-minor { - background-color: $bg-minor; -} -html [bg-content], .bg-content { - background-color: $bg-content; -} -html [bg-panel], .bg-panel { - background-color: $bg-panel; -} -html [bg-dark-bar], .bg-dark-bar { - background-color: $bg-dark-bar; -} -html [bg-dark-menu], .bg-dark-menu { - background-color: darken($bg-dark-menu, 35%); -} +@import "colors"; + +$bg-main: $color-green; +$bg-minor: $color-orange; +$bg-content: $color-light-grey; +$bg-panel: $color-white; +$bg-dark-bar: $color-dark; +$bg-dark-menu: $color-dark-grey; + +html [bg-main], .bg-main { + background-color: $bg-main; +} +html [bg-minor], .bg-minor { + background-color: $bg-minor; +} +html [bg-content], .bg-content { + background-color: $bg-content; +} +html [bg-panel], .bg-panel { + background-color: $bg-panel; +} +html [bg-dark-bar], .bg-dark-bar { + background-color: $bg-dark-bar; +} +html [bg-dark-menu], .bg-dark-menu { + background-color: darken($bg-dark-menu, 35%); +} + +/* utilizado para mostrar el color default en el consignatario */ +.bg-dark-item{ + background-color: $bg-dark-bar; + color: $color-white; +} diff --git a/@salix/app/src/styles/display.css b/@salix/app/src/styles/display.css index b1fe0fb3d..29100e06c 100644 --- a/@salix/app/src/styles/display.css +++ b/@salix/app/src/styles/display.css @@ -1,3 +1,3 @@ .display-block{ display: block; -} \ No newline at end of file +} diff --git a/@salix/crud/src/client/addresses/index.html b/@salix/crud/src/client/addresses/index.html index aa605c131..5f3465bc7 100644 --- a/@salix/crud/src/client/addresses/index.html +++ b/@salix/crud/src/client/addresses/index.html @@ -7,7 +7,7 @@ - +
{{i.consignee}}
{{i.street}}
diff --git a/services/nginx/logs/error.log b/services/nginx/logs/error.log index 8d7b83b24..d2c258803 100644 --- a/services/nginx/logs/error.log +++ b/services/nginx/logs/error.log @@ -43,3 +43,5 @@ 2017/01/10 12:26:32 [notice] 6916#8152: signal process started 2017/01/11 14:07:56 [notice] 9308#5756: signal process started 2017/01/11 14:08:53 [notice] 8600#6600: signal process started +2017/01/13 13:15:39 [notice] 9764#10160: signal process started +2017/01/13 13:15:39 [error] 9764#10160: OpenEvent("Global\ngx_stop_5224") failed (2: FormatMessage() error:(15100))