hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 10:23:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-879 - misc fixes on white skin

Browse Source
This commit is contained in:
Florian Blouet
2016-02-11 15:33:08 +01:00
committed by Benoît Burnichon
parent 229f0e64cb
commit f59fc905b4
7 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/www/prod/skins/000000/skin-000000.scss
View File

@@ -155,7 +155,7 @@ $workzoneToolsLabelColor: #7f7f7f;
/******** PROPOSALS CONFIG ********/ /******** PROPOSALS CONFIG ********/
$proposalsTitleColor: #A6A6A6; $proposalsTitleColor: #A6A6A6;
$proposalsTitleHoverColor: lighten($proposalsTitleColor, 5); $proposalsTitleHoverColor: lighten($proposalsTitleColor, 10); // $mediumTextHoverColor
$proposalsTitleBorder: #303030; $proposalsTitleBorder: #303030;

3
resources/www/prod/skins/959595/skin-959595.scss
View File

@@ -172,7 +172,8 @@ $workzoneToolsLabelColor: #FFFFFF;
/******** PROPOSALS CONFIG ********/ /******** PROPOSALS CONFIG ********/
$proposalsTitleColor: #FFFFFF; $proposalsTitleColor: #FFFFFF;
$proposalsTitleBorder: #666666; $proposalsTitleBorder: #666666;
$proposalsTitleHoverColor: lighten($proposalsTitleColor, 10);
$facetHover: #FFF;
@import '../../../_shared/styles/jquery-ui/ui-lightness'; @import '../../../_shared/styles/jquery-ui/ui-lightness';
@import '../skin-shared'; @import '../skin-shared';

2
resources/www/prod/skins/FFFFFF/skin-FFFFFF.scss
View File

@@ -156,6 +156,8 @@ $mainMenuLinkHoverColor: darken($mainMenuLinkColor, 10);
/******** PROPOSALS CONFIG ********/ /******** PROPOSALS CONFIG ********/
$proposalsTitleColor: #333; $proposalsTitleColor: #333;
$proposalsTitleBorder: #bfbfbf; $proposalsTitleBorder: #bfbfbf;
$proposalsTitleHoverColor: lighten($proposalsTitleColor, 10);
$facetHover: #FFF;
//$proposalsContentTextColor: #FF0000; //$proposalsContentTextColor: #FF0000;
/******** WORKZONE TABS CONFIG ********/ /******** WORKZONE TABS CONFIG ********/

2
resources/www/prod/skins/ui-components/_answers.scss
View File

@@ -59,7 +59,7 @@ $answersInfoLabelColor: #949494 !default;
margin: 10px; margin: 10px;
width: 600px; width: 600px;
overflow: hidden; overflow: hidden;
border: 3px solid #404040; border: 3px solid $darkerBorderColor;
.desc { .desc {
.dl-horizontal { .dl-horizontal {
dt { dt {

4
resources/www/prod/skins/ui-components/_modal-edit.scss
View File

@@ -310,9 +310,7 @@
} }
#idFrameE { #idFrameE {
.ui-datepicker-inline { .ui-datepicker-inline {
background-color: #111111; background-color: $darkerBackgroundColor;
// /assets/prod/skins/{{cssfile}}/images/
background-image: url('#{$iconsPath}ui-bg_gloss-wave_20_111111_500x100.png');
background-repeat: repeat-x; background-repeat: repeat-x;
background-position: 50% top; background-position: 50% top;
} }

9
resources/www/prod/skins/ui-components/_workzone-proposals.scss
View File

@@ -2,6 +2,7 @@ $proposalsTitleColor: $darkerTextColor !default;
$proposalsTitleHoverColor: $darkerTextHoverColor !default; $proposalsTitleHoverColor: $darkerTextHoverColor !default;
$proposalsContentTextColor: $darkerTextColor !default; $proposalsContentTextColor: $darkerTextColor !default;
$proposalsContentTextColor: $darkerTextColor !default; $proposalsContentTextColor: $darkerTextColor !default;
$proposalFacetColor: #FFF !default;
/******* PROPOSALS ************************************************************/ /******* PROPOSALS ************************************************************/
@@ -40,7 +41,8 @@ $proposalsContentTextColor: $darkerTextColor !default;
&:hover { &:hover {
background-color: $proposalColor; background-color: $proposalColor;
.fancytree-title { .fancytree-title {
color: $textPrimaryHoverColor; color: $facetHover;
// color: $textPrimaryHoverColor;
} }
} }
} }
@@ -62,9 +64,9 @@ $proposalsContentTextColor: $darkerTextColor !default;
} }
&:hover { &:hover {
border-left: 4px solid $proposalColor; border-left: 4px solid $proposalColor;
color: $mediumTextHoverColor; color: $proposalsTitleHoverColor;
.fancytree-title { .fancytree-title {
color: $mediumTextHoverColor; color: $proposalsTitleHoverColor;
} }
} }
.fancytree-expander { .fancytree-expander {
@@ -125,6 +127,7 @@ $proposalsContentTextColor: $darkerTextColor !default;
border-radius: 4px; border-radius: 4px;
right: 28px; right: 28px;
background-color: $proposalColor; background-color: $proposalColor;
color: $proposalFacetColor;
padding-left: 13px; padding-left: 13px;
padding-right: 13px; padding-right: 13px;
margin-top: 11px; margin-top: 11px;

8
templates/web/prod/actions/Tools/index.html.twig
View File

@@ -74,7 +74,7 @@
<div id="subdefs" class="tabBox"> <div id="subdefs" class="tabBox">
<form id="new-img-form" action="{{ path('prod_tools_image') }}" method="post"> <form id="new-img-form" action="{{ path('prod_tools_image') }}" method="post">
<fieldset style='border:1px solid #999; padding:20px;'> <fieldset style='border:1px solid #999; padding:20px;'>
<legend style='color:#EEE'>&nbsp;<b>{{ "Reconstruire les sous definitions" | trans }}</b>&nbsp;</legend> <legend>&nbsp;<b>{{ "Reconstruire les sous definitions" | trans }}</b>&nbsp;</legend>
{% if nbSubdefSubstitute > 0 %} {% if nbSubdefSubstitute > 0 %}
<div style="color:#A00;"> <div style="color:#A00;">
{{ "Attention, certain documents ont des sous-definitions substituees" | trans }} {{ "Attention, certain documents ont des sous-definitions substituees" | trans }}
@@ -181,7 +181,7 @@
</div> </div>
<form name="formpushdoc" action="{{ path('prod_tools_rotate') }}" method="post"> <form name="formpushdoc" action="{{ path('prod_tools_rotate') }}" method="post">
<fieldset style='border:1px solid #999;padding:20px;'> <fieldset style='border:1px solid #999;padding:20px;'>
<legend style='color:#EEE'>&nbsp;<b>{{ "image rotation" | trans }}</b>&nbsp;</legend> <legend>&nbsp;<b>{{ "image rotation" | trans }}</b>&nbsp;</legend>
<label for="ROTA_90" class="radio"> <label for="ROTA_90" class="radio">
<input type="radio" name="rotation" id="ROTA_90" value="90" checked="checked"> <input type="radio" name="rotation" id="ROTA_90" value="90" checked="checked">
{{ "rotation 90 degres horaire" | trans }} {{ "rotation 90 degres horaire" | trans }}
@@ -220,7 +220,7 @@
target="uploadHdsub"> target="uploadHdsub">
<fieldset style='border:1px solid #999;padding:20px;'> <fieldset style='border:1px solid #999;padding:20px;'>
<legend style='color:#EEE'>&nbsp;<b>{{ "substitution HD" | trans }}</b>&nbsp;</legend> <legend>&nbsp;<b>{{ "substitution HD" | trans }}</b>&nbsp;</legend>
<div> <div>
<input id='new-hd-file' name="newHD" type="file"/> <input id='new-hd-file' name="newHD" type="file"/>
<br /> <br />
@@ -252,7 +252,7 @@
method="post" method="post"
target="uploadHdsub"> target="uploadHdsub">
<fieldset style='border:1px solid #999;padding:20px;'> <fieldset style='border:1px solid #999;padding:20px;'>
<legend style='color:#EEE'>&nbsp;<b>{{ "substitution SD" | trans }}</b>&nbsp;</legend> <legend>&nbsp;<b>{{ "substitution SD" | trans }}</b>&nbsp;</legend>
<div> <div>
<input id='new-sd-file' name="newThumb" type="file" /> <input id='new-sd-file' name="newThumb" type="file" />
<input type="hidden" name="sbas_id" value="{{record.get_sbas_id()}}" /> <input type="hidden" name="sbas_id" value="{{record.get_sbas_id()}}" />