From f59fc905b49bd9b539646e15df036a02e8ec3045 Mon Sep 17 00:00:00 2001 From: Florian Blouet Date: Thu, 11 Feb 2016 15:33:08 +0100 Subject: [PATCH] PHRAS-879 - misc fixes on white skin --- resources/www/prod/skins/000000/skin-000000.scss | 2 +- resources/www/prod/skins/959595/skin-959595.scss | 3 ++- resources/www/prod/skins/FFFFFF/skin-FFFFFF.scss | 2 ++ resources/www/prod/skins/ui-components/_answers.scss | 2 +- resources/www/prod/skins/ui-components/_modal-edit.scss | 4 +--- .../prod/skins/ui-components/_workzone-proposals.scss | 9 ++++++--- templates/web/prod/actions/Tools/index.html.twig | 8 ++++---- 7 files changed, 17 insertions(+), 13 deletions(-) diff --git a/resources/www/prod/skins/000000/skin-000000.scss b/resources/www/prod/skins/000000/skin-000000.scss index 78c6d6bcdf..a5b429f706 100644 --- a/resources/www/prod/skins/000000/skin-000000.scss +++ b/resources/www/prod/skins/000000/skin-000000.scss @@ -155,7 +155,7 @@ $workzoneToolsLabelColor: #7f7f7f; /******** PROPOSALS CONFIG ********/ $proposalsTitleColor: #A6A6A6; -$proposalsTitleHoverColor: lighten($proposalsTitleColor, 5); +$proposalsTitleHoverColor: lighten($proposalsTitleColor, 10); // $mediumTextHoverColor $proposalsTitleBorder: #303030; diff --git a/resources/www/prod/skins/959595/skin-959595.scss b/resources/www/prod/skins/959595/skin-959595.scss index 60fdd7f254..ad02d844c8 100644 --- a/resources/www/prod/skins/959595/skin-959595.scss +++ b/resources/www/prod/skins/959595/skin-959595.scss @@ -172,7 +172,8 @@ $workzoneToolsLabelColor: #FFFFFF; /******** PROPOSALS CONFIG ********/ $proposalsTitleColor: #FFFFFF; $proposalsTitleBorder: #666666; - +$proposalsTitleHoverColor: lighten($proposalsTitleColor, 10); +$facetHover: #FFF; @import '../../../_shared/styles/jquery-ui/ui-lightness'; @import '../skin-shared'; diff --git a/resources/www/prod/skins/FFFFFF/skin-FFFFFF.scss b/resources/www/prod/skins/FFFFFF/skin-FFFFFF.scss index 50ec3295c4..881a550928 100644 --- a/resources/www/prod/skins/FFFFFF/skin-FFFFFF.scss +++ b/resources/www/prod/skins/FFFFFF/skin-FFFFFF.scss @@ -156,6 +156,8 @@ $mainMenuLinkHoverColor: darken($mainMenuLinkColor, 10); /******** PROPOSALS CONFIG ********/ $proposalsTitleColor: #333; $proposalsTitleBorder: #bfbfbf; +$proposalsTitleHoverColor: lighten($proposalsTitleColor, 10); +$facetHover: #FFF; //$proposalsContentTextColor: #FF0000; /******** WORKZONE TABS CONFIG ********/ diff --git a/resources/www/prod/skins/ui-components/_answers.scss b/resources/www/prod/skins/ui-components/_answers.scss index e596f438c9..52632b974a 100644 --- a/resources/www/prod/skins/ui-components/_answers.scss +++ b/resources/www/prod/skins/ui-components/_answers.scss @@ -59,7 +59,7 @@ $answersInfoLabelColor: #949494 !default; margin: 10px; width: 600px; overflow: hidden; - border: 3px solid #404040; + border: 3px solid $darkerBorderColor; .desc { .dl-horizontal { dt { diff --git a/resources/www/prod/skins/ui-components/_modal-edit.scss b/resources/www/prod/skins/ui-components/_modal-edit.scss index 50bf2d4785..890a17bbe6 100644 --- a/resources/www/prod/skins/ui-components/_modal-edit.scss +++ b/resources/www/prod/skins/ui-components/_modal-edit.scss @@ -310,9 +310,7 @@ } #idFrameE { .ui-datepicker-inline { - background-color: #111111; - // /assets/prod/skins/{{cssfile}}/images/ - background-image: url('#{$iconsPath}ui-bg_gloss-wave_20_111111_500x100.png'); + background-color: $darkerBackgroundColor; background-repeat: repeat-x; background-position: 50% top; } diff --git a/resources/www/prod/skins/ui-components/_workzone-proposals.scss b/resources/www/prod/skins/ui-components/_workzone-proposals.scss index f9d879cbdc..7be169bd81 100644 --- a/resources/www/prod/skins/ui-components/_workzone-proposals.scss +++ b/resources/www/prod/skins/ui-components/_workzone-proposals.scss @@ -2,6 +2,7 @@ $proposalsTitleColor: $darkerTextColor !default; $proposalsTitleHoverColor: $darkerTextHoverColor !default; $proposalsContentTextColor: $darkerTextColor !default; $proposalsContentTextColor: $darkerTextColor !default; +$proposalFacetColor: #FFF !default; /******* PROPOSALS ************************************************************/ @@ -40,7 +41,8 @@ $proposalsContentTextColor: $darkerTextColor !default; &:hover { background-color: $proposalColor; .fancytree-title { - color: $textPrimaryHoverColor; + color: $facetHover; + // color: $textPrimaryHoverColor; } } } @@ -62,9 +64,9 @@ $proposalsContentTextColor: $darkerTextColor !default; } &:hover { border-left: 4px solid $proposalColor; - color: $mediumTextHoverColor; + color: $proposalsTitleHoverColor; .fancytree-title { - color: $mediumTextHoverColor; + color: $proposalsTitleHoverColor; } } .fancytree-expander { @@ -125,6 +127,7 @@ $proposalsContentTextColor: $darkerTextColor !default; border-radius: 4px; right: 28px; background-color: $proposalColor; + color: $proposalFacetColor; padding-left: 13px; padding-right: 13px; margin-top: 11px; diff --git a/templates/web/prod/actions/Tools/index.html.twig b/templates/web/prod/actions/Tools/index.html.twig index c3e4f2c722..c7e9d3c836 100644 --- a/templates/web/prod/actions/Tools/index.html.twig +++ b/templates/web/prod/actions/Tools/index.html.twig @@ -74,7 +74,7 @@
-  {{ "Reconstruire les sous definitions" | trans }}  +  {{ "Reconstruire les sous definitions" | trans }}  {% if nbSubdefSubstitute > 0 %}
{{ "Attention, certain documents ont des sous-definitions substituees" | trans }} @@ -181,7 +181,7 @@
-  {{ "image rotation" | trans }}  +  {{ "image rotation" | trans }}