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

wip: css cleanup

Browse Source
This commit is contained in:
Florian BLOUET
2015-11-23 18:43:51 +01:00
parent 7ee9d5e740
commit 749136c017
18 changed files with 114 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/www/_shared/styles/_override-bootstrap.scss Normal file
View File

@@ -0,0 +1,4 @@
/** override hardcoded value in bootstrap2 */
.dropdown-menu {
@include border-radius($borderRadiusSmall);
}

5
resources/www/_shared/styles/_variables.scss
View File

@@ -3,3 +3,8 @@ $iconsPath: '/assets/common/images/icons/' !default;
$mainMenuHeight: 40px;
$mainMenuLineHeight: 36px;
$baseBorderRadius: 3px;
$borderRadiusLarge: 4px;
$borderRadiusSmall: 2px;

BIN
resources/www/common/images/icons/loader-black.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
resources/www/common/images/icons/loader-white.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

3
resources/www/common/styles/main.scss
View File

@@ -1,9 +1,10 @@
/**
* Common stylesheet, builded into assets/common/styles/common.css
*/
@import '../../_shared/styles/variables';
@import '../../vendors/bootstrap/bootstrap';
@import '../../vendors/bootstrap/responsive';
@import '../../_shared/styles/variables';
@import '../../_shared/styles/override-bootstrap';
@import '../../../../www/bower_components/font-awesome/sass/font-awesome.scss';
@import '../../_shared/styles/main';

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

@@ -28,8 +28,7 @@ $gg: #292929;
$gg: #076882;
$gg: #0088CC;
*/
$col1: #3b3b3b;
$col2: #1a1a1a;
$skinsImagesPath: '/assets/vendors/jquery-ui/images/dark-hive/';
$defaultBorderColor: #303030;
@@ -39,16 +38,22 @@ $backgroudSecondaryColor: #3b3b3b;
$backgroudAltColor: #404040;
$backgroundAltPrimaryColor: #1a1a1a;
$textPrimaryColor: #b1b1b1;
$textPrimaryColor: #FFFFFF; //#b1b1b1;
$textPrimaryHoverColor: #FFFFFF;
$textPrimaryActiveColor: #FFFFFF;
$textPrimaryInverseColor: #3b3b3b;
$textSecondaryColor: #999999;
$highlightTextColor: #FFFFFF;
$highlightColor: #076882;
$hightlightLighterColor: #005580;
$highlightDarkerColor: #0c4554;
// inverse
$textInverseColor: #FFFFFF;
$textInverseHoverColor: #000;
$bgInverseHoverColor: #FFF;
/******* GLOBAL PROD **********************************************************/
$mainMenuColor: #b1b1b1;
@@ -57,15 +62,16 @@ $mainMenuRightListBorderLeft: #292929;
$scrollBgColor: #3b3b3b;
$paginateBorderColor: #3b3b3b;
$paginateBorder2Color: #076882;
$paginateTextColor: #FFFFFF;
$paginateBorder2Color: $highlightColor;
$paginateTextColor: $highlightTextColor;
$paginateBg1: #141414;
$paginateBg2: #076882;
$paginateBg2: $highlightColor;
$contextMenuBgHover: $highlightDarkerColor;
$uploadBg1: #FFFFFF;
$uploadBg2: #FFFFFF;
$uploadLoaderImg: 'loaderFFF.gif';
$uploadLoaderImg: 'loader-black.gif';
$bridgeDialogBg: #000000;
$bridgeDialogBg2: #404040;
@@ -170,7 +176,7 @@ $preferencesLabelColor: #999999;
$uiColor1: #111111;
$activeStateIcon: 'ui-icons_cccccc_256x240.png';
$accordionLoaderImg: 'loader000.gif';
$accordionLoaderImg: 'loader-white.gif';
$accordionBorderColor: $defaultBorderColor;
$accordionBgHeaderHover: #474747;
$accordionBgContent: #212121;
@@ -189,9 +195,9 @@ $dropdownDividerBorder: #404040;
$overlayBg: #111111;
$tabsNavBg: #666666;
$tabsNavBgActive: #404040;
$tabsNavBgActive: $backgroudSecondaryColor;
$sliderBg: #1a1a1a;
$dialogLoaderImg: 'loader000.gif';
$contentLoaderImg: 'loader-white.gif';
$btnBackground: #EAEAEA;
$btnBackgroundHighlight: #D6D6D6;

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

@@ -1,17 +1,10 @@
$col1: #B1B1B1;
$col2: #D9D9D9;
$skinsImagesPath: '/assets/vendors/jquery-ui/images/ui-lightness/';
$defaultBorderColor: #666666;
$defaultBorderColor: #999999;
$defaultBorderRadius: 2px;
// @TODO borders:
// $hardBorder: #333333;
// $softBorder: #666666;
$backgroudPrimaryColor: #D9D9D9;
$backgroudSecondaryColor: #D9D9D9;
$backgroudPrimaryColor: #F1F1F1;
$backgroudSecondaryColor: #B2B2B2; //#D9D9D9;
$backgroundAltPrimaryColor: #1a1a1a;
$textPrimaryColor: #333333;
$textPrimaryHoverColor: #1a1a1a;
@@ -19,6 +12,11 @@ $textPrimaryActiveColor: #1a1a1a;
$textPrimaryInverseColor: #3b3b3b;
$textSecondaryColor: #999999;
$highlightTextColor: #FFFFFF;
$highlightColor: #076882;
$hightlightLighterColor: #005580;
$highlightDarkerColor: #0c4554;
// inverse
$textInverseColor: #000;
$textInverseHoverColor: #000;
@@ -28,7 +26,7 @@ $bgInverseHoverColor: #FFF;
$mainMenuColor: #FFF;
$mainMenuRightListBorderLeft: #999;
$scrollBgColor: #3b3b3b;
$scrollBgColor: $backgroudSecondaryColor; //#3b3b3b;
$paginateBorderColor: #999999;
$paginateBorder2Color: #999999;
@@ -38,7 +36,7 @@ $paginateBg2: #999;
$uploadBg1: #FFFFFF;
$uploadBg2: transparent;
$uploadLoaderImg: 'loaderB1B1B1.gif';
$uploadLoaderImg: 'loader-black.gif';
$bridgeDialogBg: #D9D9D9;
$bridgeDialogBg2: #B1B1B1;
@@ -141,7 +139,7 @@ $preferencesLabelColor: #333333;
$uiColor1: #D9D9D9;
$activeStateIcon: 'ui-icons_ffffff_256x240.png';
$accordionLoaderImg: 'loaderd9d9d9.gif';
$accordionLoaderImg: 'loader-black.gif';
$accordionBorderColor: $defaultBorderColor;
$accordionBgHeaderHover: #999;
$accordionBgContent: #D9D9D9;
@@ -159,9 +157,9 @@ $dropdownDividerBorder: #404040;
$overlayBg: #B1B1B1;
$tabsNavBg: #999999;
$tabsNavBgActive: #D9D9D9;
$tabsNavBgActive: #B2B2B2; //#D9D9D9;
$sliderBg: #1a1a1a;
$dialogLoaderImg: 'loaderd9d9d9.gif';
$contentLoaderImg: 'loader-black.gif';
$btnBackground: #444444; //#B9B9B9;
$btnBackgroundHighlight: #393939;

52
resources/www/prod/skins/skin-shared.scss
View File

@@ -7,7 +7,7 @@ $basketsColor: #076882;
::-webkit-scrollbar-track
{
border-radius: 0;
background-color: #080808;
background-color: $backgroudPrimaryColor;
}
::-webkit-scrollbar {
@@ -54,7 +54,7 @@ legend {
body {
color: $textPrimaryColor;
background-color: $col2;
background-color: $backgroudPrimaryColor;
position: absolute;
top: 0;
left: 0;
@@ -101,9 +101,6 @@ EM {
cursor: pointer;
}
.diapo.selected {
cursor: url('#{$iconsPath}cursor-move.png'), -moz-grab;
}
.ui-state-default, .ui-widget-content .ui-state-default,
.ui-widget-header .ui-state-default {
@@ -226,32 +223,6 @@ span.ww_winTitle {
padding: 3px 5px 0;
}
#idFrameC {
top: 0 !important;
min-width: 300px;
bottom: 0 !important;
}
#idFrameC.closed {
min-width: 0;
}
#idFrameC #retractableButton {
cursor: pointer;
width: 70px;
height: 85px;
float: right;
text-align: center;
line-height: 70px;
margin-bottom: -20px;
background: url('#{$iconsPath}workzoneEscamote.png') 30px 36px no-repeat;
}
#idFrameC.closed #retractableButton {
background: url('#{$iconsPath}workzoneEscamote_on.png') 30px 30px no-repeat;
}
#keyboard-dialog h1 {
font-size: 14px;
font-weight: bold;
@@ -337,25 +308,6 @@ span.ww_winTitle {
z-index: 10000;
}
#BasketBrowser .diapo .title {
height: 16px;
}
#answers .status img {
max-width: 16px;
max-height: 16px;
}
#answers #answersNext {
width: 150px;
margin: 5px;
height: 193px;
line-height: 193px;
font-size: 25px;
color: #666666;
cursor: pointer;
}
/******* DIALOGS **************************************************************/

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

@@ -91,7 +91,7 @@
#idFrameT .tools .dropdown-menu a:hover {
background-color: $answersToolsBtnHoverBg;
color: $answersToolsBtnHoverColor;
color: $highlightTextColor; //$answersToolsBtnHoverColor;
}
#idFrameT .tools .dropdown-menu img {

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

@@ -38,24 +38,22 @@
background-image: url('#{$iconsPath}download.gif');
}
.diapo div.title {
overflow: hidden;
text-overflow: ellipsis;
#answers .status img {
max-width: 16px;
max-height: 16px;
}
div.diapo {
position: relative;
display: block;
float: left;
border: 1px solid #404040;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
text-align: center;
margin: 8px 5px;
#answers #answersNext {
width: 150px;
margin: 5px;
height: 193px;
line-height: 193px;
font-size: 25px;
color: #666666;
cursor: pointer;
}
#idFrameT #answers {
background-color: $answersBg;
border: 1px solid $answersBorderTop;

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

@@ -1,5 +1,5 @@
@import '../../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/_mixins.scss';
button, .btn, input[type="file"] {
.btn, input[type="file"] {
//font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif;
//font-size: 12px;
//font-weight: bold;

40
resources/www/prod/skins/ui-components/_diapo.scss
View File

@@ -15,7 +15,7 @@
#reorder_box .CHIM.diapo img {
z-index: 1000;
position: relative;
margin:0;
margin: 0;
}
#reorder_dialog .ui-sortable-placeholder,
@@ -25,14 +25,36 @@
background-color: $backgroudSecondaryColor;
}
.diapo .thumb {
overflow: hidden;
.diapo {
position: relative;
}
display: block;
float: left;
border: 1px solid #404040;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
text-align: center;
margin: 8px 5px;
&.selected {
cursor: url('#{$iconsPath}cursor-move.png'), -moz-grab;
}
.diapo .thumb .record {
position: relative;
margin: 0 auto;
.thumb {
overflow: hidden;
position: relative;
.record {
position: relative;
margin: 0 auto;
}
}
.bottom {
position: absolute;
bottom: 0px;
}
div.title {
overflow: hidden;
text-overflow: ellipsis;
}
}
.diapo.CHIM .thumb_wrapper {
@@ -42,7 +64,3 @@
.diapo.IMGT .thumb_wrapper {
padding: 0 11px;
}
.diapo .bottom {
position: absolute; bottom: 0px;
}

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

@@ -1,5 +1,5 @@
.ui-dialog .ui-dialog-content.loading, .loading {
background-image: url('#{$iconsPath}#{$dialogLoaderImg}');
background-image: url('#{$iconsPath}#{$contentLoaderImg}');
background-position: center center;
background-repeat: no-repeat;
}

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

@@ -1,4 +1,26 @@
/**
* Workzone
*/
#idFrameC {
top: 0 !important;
min-width: 300px;
bottom: 0 !important;
&.closed {
min-width: 0;
#retractableButton {
background: url('#{$iconsPath}workzoneEscamote_on.png') 30px 30px no-repeat;
}
}
#retractableButton {
cursor: pointer;
width: 70px;
height: 85px;
float: right;
text-align: center;
line-height: 70px;
margin-bottom: -20px;
background: url('#{$iconsPath}workzoneEscamote.png') 30px 36px no-repeat;
}
.wrapper {
background-color: $workzoneBg;
right: 10px;

2
templates/web/prod/actions/Property/index.html.twig
View File

@@ -114,7 +114,7 @@
{% endif %}
<button type="button" class="btn cancel">{{ "Cancel" | trans }}</button>
<span class="form-action-loader" style="display:none;">
<img src="../assets/common/images/icons/loader414141.gif" />
<img src="/assets/common/images/icons/loader414141.gif" />
</span>
</div>
</form>

2
templates/web/prod/actions/Property/type.html.twig
View File

@@ -49,7 +49,7 @@
<button type="button" class="btn btn-primary submiter">{{ "Apply changes" | trans }}</button>
<button type="button" class="btn cancel">{{ "Cancel" | trans }}</button>
<span class="form-action-loader" style="display:none;">
<img src="../assets/common/images/icons/loader414141.gif" />
<img src="/assets/common/images/icons/loader414141.gif" />
</span>
</div>
</form>

2
templates/web/prod/actions/delete_records_confirm.html.twig
View File

@@ -23,7 +23,7 @@
<button type="button" class="btn btn-danger submiter">{{ "Delete" | trans }} ({{ nbEligibleDocuments }})</button>
<button type="button" class="btn cancel">{{ "Cancel" | trans }}</button>
<span class="form-action-loader" style="display:none;">
<img src="../assets/common/images/icons/loader000.gif" />
<img src="/assets/common/images/icons/loader000.gif" />
</span>
</div>
</form>

2
templates/web/prod/results/record.html.twig
View File

@@ -59,7 +59,7 @@
{% set l_width = 30 %}
{% if settings.rollover_thumbnail == 'preview' %}
{% if settings.rollover_thumbnail == 'preview' or settings.rollover_thumbnail == 'caption' %}
{% set l_width = l_width + 50 %}
{% elseif settings.technical_display == '1' %}
{% set l_width = l_width + 50 %}