From 749136c017fab569e4ac6b97de85a3ea9a0d1459 Mon Sep 17 00:00:00 2001 From: Florian BLOUET Date: Mon, 23 Nov 2015 18:43:51 +0100 Subject: [PATCH] wip: css cleanup --- .../_shared/styles/_override-bootstrap.scss | 4 ++ resources/www/_shared/styles/_variables.scss | 7 ++- .../www/common/images/icons/loader-black.gif | Bin 1849 -> 3208 bytes .../www/common/images/icons/loader-white.gif | Bin 0 -> 26702 bytes resources/www/common/styles/main.scss | 3 +- .../www/prod/skins/000000/skin-000000.scss | 26 +++++---- .../www/prod/skins/959595/skin-959595.scss | 30 +++++----- resources/www/prod/skins/skin-shared.scss | 52 +----------------- .../skins/ui-components/_answers-tools.scss | 2 +- .../prod/skins/ui-components/_answers.scss | 26 ++++----- .../prod/skins/ui-components/_buttons.scss | 2 +- .../www/prod/skins/ui-components/_diapo.scss | 40 ++++++++++---- .../prod/skins/ui-components/_jquery-ui.scss | 2 +- .../prod/skins/ui-components/_workzone.scss | 22 ++++++++ .../web/prod/actions/Property/index.html.twig | 2 +- .../web/prod/actions/Property/type.html.twig | 2 +- .../actions/delete_records_confirm.html.twig | 2 +- templates/web/prod/results/record.html.twig | 2 +- 18 files changed, 114 insertions(+), 110 deletions(-) create mode 100644 resources/www/_shared/styles/_override-bootstrap.scss create mode 100644 resources/www/common/images/icons/loader-white.gif diff --git a/resources/www/_shared/styles/_override-bootstrap.scss b/resources/www/_shared/styles/_override-bootstrap.scss new file mode 100644 index 0000000000..67a41e08d0 --- /dev/null +++ b/resources/www/_shared/styles/_override-bootstrap.scss @@ -0,0 +1,4 @@ +/** override hardcoded value in bootstrap2 */ +.dropdown-menu { + @include border-radius($borderRadiusSmall); +} \ No newline at end of file diff --git a/resources/www/_shared/styles/_variables.scss b/resources/www/_shared/styles/_variables.scss index cb9cebd37b..40313353a3 100644 --- a/resources/www/_shared/styles/_variables.scss +++ b/resources/www/_shared/styles/_variables.scss @@ -2,4 +2,9 @@ $fontAwesomePath: '/assets/common/font' !default; // dist path $iconsPath: '/assets/common/images/icons/' !default; $mainMenuHeight: 40px; -$mainMenuLineHeight: 36px; \ No newline at end of file +$mainMenuLineHeight: 36px; + + +$baseBorderRadius: 3px; +$borderRadiusLarge: 4px; +$borderRadiusSmall: 2px; \ No newline at end of file diff --git a/resources/www/common/images/icons/loader-black.gif b/resources/www/common/images/icons/loader-black.gif index 27df81f46d9fe7398b9daf3d0f5fc97337d93750..3288d1035d70bb86517e2c233f1a904e41f06b29 100644 GIT binary patch literal 3208 zcmc(iX;4#H9>pJdFE7h`I{IF)0|5<6L}(j=N}5%L009EB2nYfyF)E0PvIqo$u!IC; z4PgyY5|S9AEh38G)(9eq4TbH7_UHg@yWrlIJ$6smIADL7s^P;_O;ykRc9soXl`UC*LwQJXkii*0rx|*7rI2=x7WaRkx_~XZqFJ8R3c=2Kg zf@aSAv8+BJ8+^hyay>(QR@t*blbKzsf0}bscEqRc5Hd3o(-N5RyW=zWB*zQw6Zh>* z2CROCDAbu#D`)S|J_o(lL9Yn3l*+8RdiRD_>iNz$#_IAzCna&Wl5 zSF_(rRCDD!wi#i8oAm&jYtn2_@VB%2-H*G%bN#|(6R6N?wM)3u`PiGzwuX7qmTgyF zpE)h0kuoxQ9?=kW7Y!=R@DmhU9)vwT*EZWzJ zrt+=2tqFts72yIp?|gvdLhs8Hfku^Z(){gmN%Y=K#P|%fkvgUj~HfIp3CuXqCtYGtJ#me+n+-LmP( z*XNuk%!aH8bIE@_Bj46>M*dSro|7<6vZ7WUHh5YQzN$>IJFqCb|CT!wj~R2C2%=q{ zpt8rzY$aw?W?=Ustv{jo?Ow@ZRkLe<)NItY>Cyhle*wR59dTdF6(@{5^ zAQBOB*hNtc3bkY-8{Cm$nFS@elbTtSqrt7MB{h_4y+~`!mVa}?c&N>&?P}GqdMuhQ z&@TD5Czd((DcG_Su~dKKV)Pj$-qi1WHM8_vc^O4?^!oY|tmK~i!{fjd&@_1E(T~r7 z_REZy&hMT^ySJB3W7l$4YhR`M(J7S5S~+4Q&3HPa)z%zPpisOp$^ zTEe99ig2$5_qFr!$;7A6CJ}PJmRhli>w?LC}Y`#HLGy6 zMU4EhL~dKCN5Ut;U2jd*83ShBNiu zcJB0l9>1Modc?-oM<R4?}3g}UJ%@K);kriq>)e*rh%hdqM)5Q)*+O8 zXm;SEbs@koiYS!9YXIclSg+5m_s~yrW#kKMdiRszg(gCP5HPmP7L)vCf8@fxUh6qY z@Z#TmkjzAZX{rwE+q|K~F2v5{_@vt%>yT_a#fF03SFt{0RXvDAiaY~K9CgS1O>frXgAjBCS}mEd4mIWZ$=ovd5| zR?GRdU}d6+Q`+JRW)|=v7$)XNkn3yE`!nAiSCvOB1jKT zG<1aK3s<0b0m==egTD#8i(Of=1pGDTOCho0XpIOMQ&P87cVKY1W=C6kIg z9cH=@a&zbm2+`|{(_?YC9fdm?1TY~-pwlBn?>=(~1pDKbco6jloP;0-cqRiwV1A_S zEyV0Dj8Pwy!nekzaN>{)7rgZ&_QLxK{~1yRe865^yx>}+a!ECd>#MMwddow z@CU{l+Rt$xuXuf}?ga{3IAr?Raql^c@a%sI0U5m}HvJ5O1#I%_MMPt#BH>OqUZ{-k zt>4Xzz=%jT*FVW(uYkWyx}9Gw$HdN*qU?Bit#ji(Wi7p-u|_8?h^%szIS^s^fNM}b zgGy>|=cbEufpguY5_6w~&ZLv=Bo06UF9EYIY;Er-1VK)SyF&!|J{axiE1z^(hXwVq zsFS=K-#zC}CcOs^8W{KAt+kK)jYDgDYbCXv{{rwsgqtIU3<910$CJi)s?? z_t8k{>7*0~4l~LLF7$WXT5OSq5QCTbP_l!SN|{R}3D&eWA8~0ltWh1IL+ZBX4rRSt zWF6Om3WDMu4xK^1(BF`2cL}rUCzhHAB`@j5&R-yk_l*t;mPGY|u2^o|myvcOdrg0W z%=lX;f^Vkqfp?u7*4qQq%A3Mpf!xspWBSKS@O%r*TSM}?dl(@*%{0Jm_8;(h{R__M Btmwo}u3o+BcDsEmBO@bs@7~SN z&*wO9adEM{y!`3Yr*m_2gM))BoBrP^^1qUlI;*ALx<}e*tKTcNR9Tv;_gVIAw!K=p z4~cvN5XyH{nkC~hc7+u%N^#HugZ42oEP(=_AKxXOEf3NyKX+TXPhO;lW@FgY6t4@HoWKwfv%vY zs5YDhz`Oa{XYNBUhg9|igKV@+hT)W*iZ{6m9RLElqqI4j$Cl`iywUvnal^@^;-pmy z8c1pKQ$A*V6p%`$$;jTxPPc0&u1-Dn-09lf*^qX$6$uenUGkcj43I~BCGv8RG?a&C zh}2Tm{O3BcW`td;*-QgjNXf8)xk>LC}>S z^Y0HdBI4A8%k~T8+*{`PT*aWCblpFFQnIvL`=gXk(keA@D*>j6(U!`pf7PZvq%ywJ zfADB0oi)(aS!!(2>rd-fa{+;r>Xj0S{kh1Rlg|&R<6Dw zL#u5x|Dw%P*%EccGpHXp8np_*0|705z`JT6z$qhL%aU0Ybtsv!=Udqqz$J;*IBvlv3!nS7QpQx7~5)LJvvS z{?MRW7fKNM8!LE_PnZdzQmJ4FjCk!}S!N&T*j`p5AT|loYm&$=`I?3Z)T}i0iUw7w z4@(uZs%gcKro>`VtT<>=`sbp_zwfl{jpU^tJ7;YYzdrdWQ`cd=rl0Y014 z-j&pv$+l>@;MO0$vWpptUqayN2-d{svj-3^1~dbPL50K%F%%JdRKriRB%;;IH47PN zSxH8DVqx^nO~w;hXOFyd?{2sHk5~R907pG(C5md-iL)D%6Q$kvV4^71GaJ^bdk}Fk z-f20n(})hQ@4KuC7tB9@W=1>!dTzMv83`c}FW|#y)`k(7P)ON}^JUF^vQGZccdk>Tm?@9W|9B z&hq!0!l!Zd#PvJDVblGmCq4?DzO`;)Ucna;b5rBbO94&tqN(i|!IC)5P;n|i2+>ZI zC$y<(z81%~!l4*BhV5U|P=T5T|EpQarn>l?{600A32Tf0W`Pr^idCz!$(4g8?rJg??6?SnrIi`9>|V<_Y$Q>-CB lXPcVF+Tga>T|!vOL#f|afc|5f*xFa*6zA6@`#++U@joVy6(Rrt diff --git a/resources/www/common/images/icons/loader-white.gif b/resources/www/common/images/icons/loader-white.gif new file mode 100644 index 0000000000000000000000000000000000000000..a2f003054260e22798794f7466abf3ab7dfb71ba GIT binary patch literal 26702 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�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 Nz~8@t|KxAr{{VsTAE5vM literal 0 HcmV?d00001 diff --git a/resources/www/common/styles/main.scss b/resources/www/common/styles/main.scss index b43cf41615..5561148cab 100644 --- a/resources/www/common/styles/main.scss +++ b/resources/www/common/styles/main.scss @@ -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'; \ No newline at end of file diff --git a/resources/www/prod/skins/000000/skin-000000.scss b/resources/www/prod/skins/000000/skin-000000.scss index 288cc671b2..26bb536c26 100644 --- a/resources/www/prod/skins/000000/skin-000000.scss +++ b/resources/www/prod/skins/000000/skin-000000.scss @@ -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; diff --git a/resources/www/prod/skins/959595/skin-959595.scss b/resources/www/prod/skins/959595/skin-959595.scss index 0a9b4318bb..54012d12b7 100644 --- a/resources/www/prod/skins/959595/skin-959595.scss +++ b/resources/www/prod/skins/959595/skin-959595.scss @@ -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; diff --git a/resources/www/prod/skins/skin-shared.scss b/resources/www/prod/skins/skin-shared.scss index 8c7c36aafc..29e21cb40e 100644 --- a/resources/www/prod/skins/skin-shared.scss +++ b/resources/www/prod/skins/skin-shared.scss @@ -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 **************************************************************/ diff --git a/resources/www/prod/skins/ui-components/_answers-tools.scss b/resources/www/prod/skins/ui-components/_answers-tools.scss index e91bbec046..2f0d82af1e 100644 --- a/resources/www/prod/skins/ui-components/_answers-tools.scss +++ b/resources/www/prod/skins/ui-components/_answers-tools.scss @@ -91,7 +91,7 @@ #idFrameT .tools .dropdown-menu a:hover { background-color: $answersToolsBtnHoverBg; - color: $answersToolsBtnHoverColor; + color: $highlightTextColor; //$answersToolsBtnHoverColor; } #idFrameT .tools .dropdown-menu img { diff --git a/resources/www/prod/skins/ui-components/_answers.scss b/resources/www/prod/skins/ui-components/_answers.scss index 67fcffcf18..92ba5724d2 100644 --- a/resources/www/prod/skins/ui-components/_answers.scss +++ b/resources/www/prod/skins/ui-components/_answers.scss @@ -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; diff --git a/resources/www/prod/skins/ui-components/_buttons.scss b/resources/www/prod/skins/ui-components/_buttons.scss index d086a4d513..a1ccd4eb5c 100644 --- a/resources/www/prod/skins/ui-components/_buttons.scss +++ b/resources/www/prod/skins/ui-components/_buttons.scss @@ -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; diff --git a/resources/www/prod/skins/ui-components/_diapo.scss b/resources/www/prod/skins/ui-components/_diapo.scss index 1df2a38449..af692a75bc 100644 --- a/resources/www/prod/skins/ui-components/_diapo.scss +++ b/resources/www/prod/skins/ui-components/_diapo.scss @@ -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 { @@ -41,8 +63,4 @@ .diapo.IMGT .thumb_wrapper { padding: 0 11px; -} - -.diapo .bottom { - position: absolute; bottom: 0px; } \ No newline at end of file diff --git a/resources/www/prod/skins/ui-components/_jquery-ui.scss b/resources/www/prod/skins/ui-components/_jquery-ui.scss index f716917a15..5c74e964d4 100644 --- a/resources/www/prod/skins/ui-components/_jquery-ui.scss +++ b/resources/www/prod/skins/ui-components/_jquery-ui.scss @@ -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; } diff --git a/resources/www/prod/skins/ui-components/_workzone.scss b/resources/www/prod/skins/ui-components/_workzone.scss index ce559a5d5a..6571940bc6 100644 --- a/resources/www/prod/skins/ui-components/_workzone.scss +++ b/resources/www/prod/skins/ui-components/_workzone.scss @@ -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; diff --git a/templates/web/prod/actions/Property/index.html.twig b/templates/web/prod/actions/Property/index.html.twig index 6414594a35..081ce9e2fc 100644 --- a/templates/web/prod/actions/Property/index.html.twig +++ b/templates/web/prod/actions/Property/index.html.twig @@ -114,7 +114,7 @@ {% endif %} diff --git a/templates/web/prod/actions/Property/type.html.twig b/templates/web/prod/actions/Property/type.html.twig index 7b26e0145b..3cc7eb2da7 100644 --- a/templates/web/prod/actions/Property/type.html.twig +++ b/templates/web/prod/actions/Property/type.html.twig @@ -49,7 +49,7 @@ diff --git a/templates/web/prod/actions/delete_records_confirm.html.twig b/templates/web/prod/actions/delete_records_confirm.html.twig index f5c9416a9c..5094921172 100644 --- a/templates/web/prod/actions/delete_records_confirm.html.twig +++ b/templates/web/prod/actions/delete_records_confirm.html.twig @@ -23,7 +23,7 @@ diff --git a/templates/web/prod/results/record.html.twig b/templates/web/prod/results/record.html.twig index 7c29a0c338..f84706fb66 100644 --- a/templates/web/prod/results/record.html.twig +++ b/templates/web/prod/results/record.html.twig @@ -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 %}