From 170f1bd80df64ba8431056801408c5c932702929 Mon Sep 17 00:00:00 2001 From: Florian BLOUET Date: Wed, 25 Nov 2015 12:40:21 +0100 Subject: [PATCH] update favicons, fix ie8 issues in workzone, misc css fixes --- .../www/authentication/images/favicon.ico | Bin 0 -> 4286 bytes resources/www/prod/images/favicon.ico | Bin 4286 -> 1406 bytes resources/www/prod/skins/skin-shared.scss | 6 +- .../prod/skins/ui-components/_buttons.scss | 3 +- .../skins/ui-components/_colorpicker.scss | 4 +- .../skins/ui-components/_context-menu.scss | 8 +- .../www/prod/skins/ui-components/_diapo.scss | 4 +- .../prod/skins/ui-components/_modal-edit.scss | 48 ++- .../skins/ui-components/_modal-export.scss | 4 +- .../skins/ui-components/_modal-preview.scss | 9 +- .../prod/skins/ui-components/_modal-push.scss | 2 +- .../prod/skins/ui-components/_pagination.scss | 4 +- .../skins/ui-components/_search-form.scss | 11 +- .../ui-components/_workzone-baskets.scss | 360 ++++++------------ .../ui-components/_workzone-thesaurus.scss | 35 +- .../prod/skins/ui-components/_workzone.scss | 63 +-- resources/www/prod/styles/_ie8.scss | 14 + resources/www/prod/styles/main.scss | 5 +- .../web/login/layout/base-layout.html.twig | 15 +- .../web/prod/actions/edit_default.html.twig | 2 + templates/web/prod/toolbar.html.twig | 40 +- 21 files changed, 264 insertions(+), 373 deletions(-) create mode 100644 resources/www/authentication/images/favicon.ico diff --git a/resources/www/authentication/images/favicon.ico b/resources/www/authentication/images/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..a2e52bb47c920f5beacedb914a664b57aeb52773 GIT binary patch literal 4286 zcmdUy3s6+&701_UTH8q*cZrFXK?OA+0)k-TgU6Bu(Et)a6DcujtRf(3cnM-qs3?yD zL5l<-D~QM=LM);JQKVW0vbrD;jRYH1gsU`Q#9d%vckjRF?q;JVlVNdeXL5J`_s)FZ zchB#fbI-Z^T^?@&{fv!y+?iL(=kZ?V@pyAcG{kczapT+(PjfFmua#!t7kmO>N~$BB zCe8kTg+i>~kYZW2y05ifaz)nLcm=GwpBv-m{+E7`eS6Zi?#^4S!7e_sxIYClUsn4t zS1X-miie%8G~Y>F;P zR0pdbxl3#FNt2(2A7tk(mSvfy3-!{~^Bt6{%opJuD<`}+-xW#gLYc7)~Kne1kS-?}@Vvu&`_d?EZT9kJfV1)E=W zN7{x+=3I#jQ1Dwnh;PV47p-yas`hppn z=h0GbiErC;TBttz$mVX+Z^!b3)<}DMn5%w{F84(<=D>Z{JouQs3O@^bthE+llihNJ zEb>Bx<0@nY#xke!L`-Q4ALZ!+9N%Yv>W?R*mU407&~$upWG0$FHOKW+BDrGV>nmjY z-(&IBYPQG5$VciteXeTxOe=VsEx>AvC3x5Rb!@a-hAj(MAl$(h+noJyAUKYx$PqDz zcJWc1#79}G02P#rQ~O`UnVcy&muCpBHl-!6$STXsT3J^8a4bIM{kDbCM$9)3yXR)= z{q@_LT6e~uZQT&O&=X&}*IuUE+f%Vt+{NIM=lr zeo@BjOlA}x+1mvW#|co7AkgL_P0%YoWZ2Geb<&q_X|xHp#*xHNfYY46!_}f-$lorx zInv3G*zaiAI(|W_1Cti^d+goHM^=mgxjO`GPO?CnUNA+OadgHH?D52JX%qlk6OO<8 zd;Vd#TUWxzuJ&exb4(Y<*73zj_RO9wzr)`?cpe``zHl=!jejTU6F$<8Ou>)&^iCKU z>-lr}w=~*J{H<7Qx`+6g6u*}5ZF_-yXuz6<n zCm~5}fOO*T{Zah-@TvapTTR;xJCi64UueD`ODzg1{*&;wy{O@HKKReTzf}N?v-_J)f$1nOL_Llu5|Gi_yPy7L^X@SI#evE(QC;a4y_HT|=%P&=4 z?{Ca63Aqs+KlKs+ppO5j_O#Dmb!UA1L^zvgQT#>l(8OPl_m*BBt~%Z)3CS4lc8nat z^70Xc)vNBF?`V^x=UB^jXT5;rgM#nle_DPJ#lH(Xe&b7aL;lW4$-N_=B-vrjDPDjb11F zYO4Ar{@aJXa|$MQ7%7_gJBP9CQw7{ljKcGb3SRXrHe7+cu7{D7)UNE&^}X&&{okce z{^w2S_%RS#q@p0Fr8zBE{*`cp98N*R4IP9-6tQ;o1lq;Op6FZRDe<5+~SS{N=MFF>B;#Z8q<8vjv z{-yqb&-wB8Wv~_9a%oLdyyiVf{dZfB_y@~MnlDBt%5Mt&WN=zX>;O3&-zWA~Vt+{N zU8H0M?9+%}G>qlPM&MCR{Buw8b-4)r65lrT+#rwG{;~M&Z0;J=itqlTz*Vx{qz8W@t&3N)=r5`o zZ4q*8uGY7a;)tF2h|Ter9@g~$@u>&A8y?lb%1c01FPd3^+aHIMo*Rp=o2RvAq_YEq zY)4?0g5hf2VfQfXQ=jC!77+iawg*k!I-Zj^|4EO(3mh zS=?*5p_VSqP^h?=AD3(Xpr!{kJwQF^*T^cHA3#bmbNgVw@$i0bE!i<3iIr;HORQ10 zKfymp{1R;sq_wF#l&prEOX~$cXYXmp$)*G8TGxHHZPh0u1Dqc&;z9UVC}g)EvMn^n zeSbJUt$ls&Bm2K5ZRhIqXp^e>Nb@M|>ooNhN8=OqvGFX{5Njr>hQ#gfxzFui&H{c^LTM89#8my$D8yl#MxqbJgsex!Lc|d9sdOr-a7{X literal 0 HcmV?d00001 diff --git a/resources/www/prod/images/favicon.ico b/resources/www/prod/images/favicon.ico index a2e52bb47c920f5beacedb914a664b57aeb52773..e778aa4c4369985fc2dfbc6f856033f7fd08ccb4 100644 GIT binary patch literal 1406 zcmeH{%TB^j6h$|W%3Dzp-+%&&pwdEnK@d_pz-Xc-f+l_esE8O5^*PON<)vdH=GZ7N9WxPO> z2f3YyvMIZLKw^{RP9nypX@*#Uri)l)ewS-RVLtMHVu>kok}+|R+)d2WPfJ>!8RI_G M1y2Xv_R;PA2lbIhoB#j- literal 4286 zcmdUy3s6+&701_UTH8q*cZrFXK?OA+0)k-TgU6Bu(Et)a6DcujtRf(3cnM-qs3?yD zL5l<-D~QM=LM);JQKVW0vbrD;jRYH1gsU`Q#9d%vckjRF?q;JVlVNdeXL5J`_s)FZ zchB#fbI-Z^T^?@&{fv!y+?iL(=kZ?V@pyAcG{kczapT+(PjfFmua#!t7kmO>N~$BB zCe8kTg+i>~kYZW2y05ifaz)nLcm=GwpBv-m{+E7`eS6Zi?#^4S!7e_sxIYClUsn4t zS1X-miie%8G~Y>F;P zR0pdbxl3#FNt2(2A7tk(mSvfy3-!{~^Bt6{%opJuD<`}+-xW#gLYc7)~Kne1kS-?}@Vvu&`_d?EZT9kJfV1)E=W zN7{x+=3I#jQ1Dwnh;PV47p-yas`hppn z=h0GbiErC;TBttz$mVX+Z^!b3)<}DMn5%w{F84(<=D>Z{JouQs3O@^bthE+llihNJ zEb>Bx<0@nY#xke!L`-Q4ALZ!+9N%Yv>W?R*mU407&~$upWG0$FHOKW+BDrGV>nmjY z-(&IBYPQG5$VciteXeTxOe=VsEx>AvC3x5Rb!@a-hAj(MAl$(h+noJyAUKYx$PqDz zcJWc1#79}G02P#rQ~O`UnVcy&muCpBHl-!6$STXsT3J^8a4bIM{kDbCM$9)3yXR)= z{q@_LT6e~uZQT&O&=X&}*IuUE+f%Vt+{NIM=lr zeo@BjOlA}x+1mvW#|co7AkgL_P0%YoWZ2Geb<&q_X|xHp#*xHNfYY46!_}f-$lorx zInv3G*zaiAI(|W_1Cti^d+goHM^=mgxjO`GPO?CnUNA+OadgHH?D52JX%qlk6OO<8 zd;Vd#TUWxzuJ&exb4(Y<*73zj_RO9wzr)`?cpe``zHl=!jejTU6F$<8Ou>)&^iCKU z>-lr}w=~*J{H<7Qx`+6g6u*}5ZF_-yXuz6<n zCm~5}fOO*T{Zah-@TvapTTR;xJCi64UueD`ODzg1{*&;wy{O@HKKReTzf}N?v-_J)f$1nOL_Llu5|Gi_yPy7L^X@SI#evE(QC;a4y_HT|=%P&=4 z?{Ca63Aqs+KlKs+ppO5j_O#Dmb!UA1L^zvgQT#>l(8OPl_m*BBt~%Z)3CS4lc8nat z^70Xc)vNBF?`V^x=UB^jXT5;rgM#nle_DPJ#lH(Xe&b7aL;lW4$-N_=B-vrjDPDjb11F zYO4Ar{@aJXa|$MQ7%7_gJBP9CQw7{ljKcGb3SRXrHe7+cu7{D7)UNE&^}X&&{okce z{^w2S_%RS#q@p0Fr8zBE{*`cp98N*R4IP9-6tQ;o1lq;Op6FZRDe<5+~SS{N=MFF>B;#Z8q<8vjv z{-yqb&-wB8Wv~_9a%oLdyyiVf{dZfB_y@~MnlDBt%5Mt&WN=zX>;O3&-zWA~Vt+{N zU8H0M?9+%}G>qlPM&MCR{Buw8b-4)r65lrT+#rwG{;~M&Z0;J=itqlTz*Vx{qz8W@t&3N)=r5`o zZ4q*8uGY7a;)tF2h|Ter9@g~$@u>&A8y?lb%1c01FPd3^+aHIMo*Rp=o2RvAq_YEq zY)4?0g5hf2VfQfXQ=jC!77+iawg*k!I-Zj^|4EO(3mh zS=?*5p_VSqP^h?=AD3(Xpr!{kJwQF^*T^cHA3#bmbNgVw@$i0bE!i<3iIr;HORQ10 zKfymp{1R;sq_wF#l&prEOX~$cXYXmp$)*G8TGxHHZPh0u1Dqc&;z9UVC}g)EvMn^n zeSbJUt$ls&Bm2K5ZRhIqXp^e>Nb@M|>ooNhN8=OqvGFX{5Njr>hQ#gfxzFui&H{c^LTM89#8my$D8yl#MxqbJgsex!Lc|d9sdOr-a7{X diff --git a/resources/www/prod/skins/skin-shared.scss b/resources/www/prod/skins/skin-shared.scss index 5db5e7dde1..6cb8ebffc3 100644 --- a/resources/www/prod/skins/skin-shared.scss +++ b/resources/www/prod/skins/skin-shared.scss @@ -361,9 +361,7 @@ span.ww_winTitle { #order_manager .order_list li { display: inline-block; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; + border-radius: $defaultBorderRadius; border: 1px solid #FFFFFF; margin: 0 5px; } @@ -465,7 +463,7 @@ H4 { border: 2px solid $darkerBorderColor; padding: 0px; color: $darkerTextColor; - border-radius: 4px; + border-radius: $defaultBorderRadius; } .popover-inner .popover-title { diff --git a/resources/www/prod/skins/ui-components/_buttons.scss b/resources/www/prod/skins/ui-components/_buttons.scss index a1ccd4eb5c..a27d1a99cc 100644 --- a/resources/www/prod/skins/ui-components/_buttons.scss +++ b/resources/www/prod/skins/ui-components/_buttons.scss @@ -26,7 +26,7 @@ // not used: -.history-collection { +/*.history-collection { background-image: url('#{$iconsPath}chgcoll_history.png'); } @@ -69,3 +69,4 @@ only screen and (min-resolution: 120dpi) background-size: 16px 16px; } } +*/ \ No newline at end of file diff --git a/resources/www/prod/skins/ui-components/_colorpicker.scss b/resources/www/prod/skins/ui-components/_colorpicker.scss index 1514c0372b..8f096a7859 100644 --- a/resources/www/prod/skins/ui-components/_colorpicker.scss +++ b/resources/www/prod/skins/ui-components/_colorpicker.scss @@ -34,9 +34,7 @@ $colorpickerFocusBorder: #999999; } .colorpicker_focus { border: 1px solid $colorpickerFocusBorder; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; + border-radius: $defaultBorderRadius; } .colorpicker_current_color, .colorpicker_field, diff --git a/resources/www/prod/skins/ui-components/_context-menu.scss b/resources/www/prod/skins/ui-components/_context-menu.scss index fd0ac05890..a9fc731098 100644 --- a/resources/www/prod/skins/ui-components/_context-menu.scss +++ b/resources/www/prod/skins/ui-components/_context-menu.scss @@ -62,12 +62,8 @@ Menu contextuel .context-menu-theme-vista { background-image: none; background-color: #212121; - -webkit-border-bottom-left-radius: 3px; - -webkit-border-bottom-right-radius: 3px; - -moz-border-radius-bottomleft: 3px; - -moz-border-radius-bottomright: 3px; - border-bottom-left-radius: 3px; - border-bottom-right-radius: 3px; + border-bottom-left-radius: $defaultBorderRadius; + border-bottom-right-radius: $defaultBorderRadius; } .context-menu-theme-vista .context-menu-item .context-menu-item-inner.published { diff --git a/resources/www/prod/skins/ui-components/_diapo.scss b/resources/www/prod/skins/ui-components/_diapo.scss index ab29c113ff..361d65fd1a 100644 --- a/resources/www/prod/skins/ui-components/_diapo.scss +++ b/resources/www/prod/skins/ui-components/_diapo.scss @@ -32,9 +32,7 @@ $diapoBorderColor: $darkerBorderColor !default; display: block; float: left; border: 1px solid $diapoBorderColor; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + border-radius: $defaultBorderRadius; text-align: center; margin: 8px 5px; &.selected { diff --git a/resources/www/prod/skins/ui-components/_modal-edit.scss b/resources/www/prod/skins/ui-components/_modal-edit.scss index 8688ffc836..9e6bb7fda3 100644 --- a/resources/www/prod/skins/ui-components/_modal-edit.scss +++ b/resources/www/prod/skins/ui-components/_modal-edit.scss @@ -7,6 +7,14 @@ left: 0; right: 0; bottom: 0; + .content-wrapper { + margin: 10px; + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; + } } #EDIT_TOP { @@ -16,9 +24,7 @@ left: 0; width: 100%; overflow: visible; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; + border-radius: $defaultBorderRadius; } #EDIT_MENU { @@ -83,9 +89,7 @@ background-color: $mediumBackgroundColor; width: 700px; left: 0; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; + border-radius: $defaultBorderRadius; } #EDIT_MID_R { @@ -451,11 +455,29 @@ div.thesaurus { cursor: pointer; } } -} -#idFrameE .ui-tabs { - position: absolute; - top: 0px; - left: 10px; - bottom: 0px; - right: 0; + .ui-tabs { + position: absolute; + top: 0px; + left: 10px; + bottom: 0px; + right: 0; + .ui-tabs-nav { + background-color: transparent; + top: 0px; + left: 10px; + right: 10px; + margin-top: 21px; + border-top: 1px solid $workzoneTabBorderTop; + border-radius: 0; + height: 43px; + border-bottom: 1px solid $workzoneTabBorderBottom; + } + .ui-tabs-panel { + position: absolute; + top: 56px; + left: 0; + bottom: 0; + right: 0; + } + } } diff --git a/resources/www/prod/skins/ui-components/_modal-export.scss b/resources/www/prod/skins/ui-components/_modal-export.scss index 287c877d2a..9f0ba861df 100644 --- a/resources/www/prod/skins/ui-components/_modal-export.scss +++ b/resources/www/prod/skins/ui-components/_modal-export.scss @@ -2,9 +2,7 @@ #printBox { background-color: $mediumBackgroundColor; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; + border-radius: $defaultBorderRadius; } #printBox h4, #download h4, diff --git a/resources/www/prod/skins/ui-components/_modal-preview.scss b/resources/www/prod/skins/ui-components/_modal-preview.scss index adc9d9c3c5..4d7c05dc2a 100644 --- a/resources/www/prod/skins/ui-components/_modal-preview.scss +++ b/resources/www/prod/skins/ui-components/_modal-preview.scss @@ -1,9 +1,10 @@ #PREVIEWBOX, #EDITWINDOW { z-index: 1200; - background-color: $darkerBackgroundColor; + background-color: $modalBackground; display: none; - border: 2px solid $darkerBorderColor; + border: $modalBorder; //1px solid $darkerBorderColor; + border-radius: $defaultBorderRadius; } #PREVIEWBOX img { @@ -82,9 +83,7 @@ #PREVIEWOTHERSINNER li.otherRegToolTip, #PREVIEWOTHERSINNER li.otherBaskToolTip { background-color: $mediumBackgroundColor; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + border-radius: $defaultBorderRadius; cursor: pointer; } diff --git a/resources/www/prod/skins/ui-components/_modal-push.scss b/resources/www/prod/skins/ui-components/_modal-push.scss index 8ae6da4cb7..f21c86a86a 100644 --- a/resources/www/prod/skins/ui-components/_modal-push.scss +++ b/resources/www/prod/skins/ui-components/_modal-push.scss @@ -329,7 +329,7 @@ #QuickAddUser input { border: 1px solid #CCCCCC; - border-radius: 4px 4px 4px 4px; + border-radius: $defaultBorderRadius; box-shadow: 0 1px 1px #EEEEEE; display: inline-block; margin: 0 5px 0 0; diff --git a/resources/www/prod/skins/ui-components/_pagination.scss b/resources/www/prod/skins/ui-components/_pagination.scss index 843a05e79a..fe2df0da81 100644 --- a/resources/www/prod/skins/ui-components/_pagination.scss +++ b/resources/www/prod/skins/ui-components/_pagination.scss @@ -7,9 +7,7 @@ padding: 1px 5px; margin: 0 4px; background-color: #0077BC; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + border-radius: $defaultBorderRadius; font-size: 12px; line-height: 14px; font-weight: bold; diff --git a/resources/www/prod/skins/ui-components/_search-form.scss b/resources/www/prod/skins/ui-components/_search-form.scss index af740f96be..a0ce129c26 100644 --- a/resources/www/prod/skins/ui-components/_search-form.scss +++ b/resources/www/prod/skins/ui-components/_search-form.scss @@ -78,9 +78,7 @@ form.phrasea_query input.query { #adv_search .sbasglob .sbas_list, .adv_options .sbasglob .sbas_list { padding: 5px 0; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + border-radius: $defaultBorderRadius; } #adv_search .sbasglob .sbas_list.selected, @@ -95,13 +93,6 @@ form.phrasea_query input.query { text-align: center; } -/*.sbaslist { - background-color: $searchSbasListBg; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -}*/ - .sbas_list label { color: $lightTextColor; } diff --git a/resources/www/prod/skins/ui-components/_workzone-baskets.scss b/resources/www/prod/skins/ui-components/_workzone-baskets.scss index 00fa263269..9dac4554fc 100644 --- a/resources/www/prod/skins/ui-components/_workzone-baskets.scss +++ b/resources/www/prod/skins/ui-components/_workzone-baskets.scss @@ -1,259 +1,129 @@ -/* workzone brower - DEPRECATED - #BasketBrowser { - h1 { - font-size: 14px; - line-height: 20px; - margin: 0; - padding: 0; - } - .Browser{ - background-color: #111111; - } - .Basket{ - background-color: #111111; - display:none; - .thumb_wrapper { - margin:5px; + +#idFrameC { + #baskets { + > div { + border-top: 1px solid $mediumBorderColor; } - } - .result{ - position:relative; - height:100px; - &.odd{ - background-color:#404040; - } - .PNB10 { - overflow: hidden; - } - .datas{ - top:50px; - bottom:50px; - overflow-y:auto; - overflow-x:hidden; - } - .footer, - .header{ - height:50px; - } - .header{ - bottom:auto; - } - .footer{ - top:auto; - } - table{ - height:80px; - } - td { - &.content{ - width:390px; - vertical-align:top; - } - &.thumbnail{ - display: table-cell; - width: 105px; - height: 80px; - padding: 0; - border: none; - border-radius: 0; - box-shadow: none; - line-height: 18px; - text-align: center; - vertical-align:top; - .counter{ - bottom: 18px; - font-size: 14px; - position: relative; - right: 5px; - text-align: right; - } + .bloc { + position: absolute; + top: 31px; + left: 0pt; + right: 1px; + bottom: 0px; + overflow-y: auto; + overflow-x: hidden; + &.groupDrop { + border: 3px solid #a00; } } - } - h1.title{ - font-size:14px; - .loader{ - display:none; - margin:4px; - } - } - img{ - vertical-align: middle; - } - table{ - width:100%; - border:none; - vertical-align:top; - td.paginator{ - text-align:right; - } - } - label { - cursor:pointer; - color:#9a9a9a; - } - input { - display:none; - &.Query { - padding: 3px; - display: block; - border-radius: 4px; - width: 155px; - padding-left: 25px; - } - } - input:checked + label, - label.selected { - color: #d18827; - } - form { - h1{ - margin:10px 0; - } - ul { - - li{ - padding:5px 0; - border-top:1px solid #9A9A9A; - &.first{ - border-top:none; - } - label{ - margin: 0 0 0 40px; - } + .content { + &.grouping .alert_datas_changed, + &.basket .alert_datas_changed { + position: relative; + margin: 10px 0; + right: 0; + left: 0; } } - } -}*/ - -#idFrameC #baskets .alert_datas_changed { - position: absolute; - top: 5px; - height: 20px; - right: 26px; - left: 10px; - background-color: $workzoneBasketAlertDataBg; - color: $workzoneBasketAlertDataColor; - text-align: center; - font-weight: bold; - font-size: 12px; - display: none; - z-index: 5000; -} - -#idFrameC #baskets .content.grouping .alert_datas_changed, -#idFrameC #baskets .content.basket .alert_datas_changed { - position: relative; - margin: 10px 0; - right: 0; - left: 0; -} - -#idFrameC #baskets .bloc { - position: absolute; - top: 31px; - left: 0pt; - right: 1px; - bottom: 0px; - overflow-y: auto; - overflow-x: hidden; -} - -#baskets .insidebloc { - top: 0; -} - -#baskets .top-scroller, -#baskets .bottom-scroller { - height: 80px; - position: absolute; - border: none; - top: 0px; - bottom: 0; - left: 0; - right: 0; -} - -#baskets .top-scroller { - bottom: auto; -} - -#baskets .bottom-scroller { - top: auto; -} - -#idFrameC #baskets .bloc.groupDrop { - border: 3px solid #a00; -} - -#baskets { - > div { - border-top: 1px solid $mediumBorderColor; - } - .SSTT { - &.active { - border: 1px solid #b1b1b1; - &.ui-corner-top { - border: none; - border-top: 1px solid $mediumBorderColor; - top: 0; - background-color: $mediumBackgroundColor; - } - } - &.grouping { - &.active { - // border: 1px solid #2f4a6f; - &.ui-corner-top { - border-bottom: none; - } - } - } - .title { - overflow: hidden; - left: 30px; - right: 40px; - height: 16px; - margin: 2px 0; + .alert_datas_changed { + position: absolute; + top: 5px; + height: 20px; + right: 26px; + left: 10px; + background-color: $workzoneBasketAlertDataBg; + color: $workzoneBasketAlertDataColor; + text-align: center; + font-weight: bold; font-size: 12px; + display: none; + z-index: 5000; + } + .insidebloc { + top: 0; + } + .top-scroller, .bottom-scroller { + height: 80px; + position: absolute; + border: none; + top: 0px; + bottom: 0; + left: 0; + right: 0; + } + .top-scroller { + bottom: auto; + } + + .bottom-scroller { + top: auto; + } + .SSTT { + &.active { + border: 1px solid #b1b1b1; + &.ui-corner-top { + border: none; + border-top: 1px solid $mediumBorderColor; + top: 0; + background-color: $mediumBackgroundColor; + } + } + &.grouping { + &.active { + // border: 1px solid #2f4a6f; + &.ui-corner-top { + border-bottom: none; + } + } + } + .title { + overflow: hidden; + left: 30px; + right: 40px; + height: 16px; + margin: 2px 0; + font-size: 12px; + } + .menu { + text-align: right; + position: absolute; + right: 0; + top: 0; + padding: 3px; + margin: 0 5px 0 0; + table td { + width: 20px; + } + } + .workzone-menu-title { + text-overflow: ellipsis; + padding-right: 65px; + overflow: hidden; + white-space: nowrap; + display: block; + } + img { + max-height: 18px; + vertical-align: middle; + cursor: help; + margin-right: 9px; + } } .menu { - text-align: right; - position: absolute; - right: 0; - top: 0; - padding: 3px; - margin: 0 5px 0 0; - table td { - width: 20px; + .contextMenuTrigger { + cursor: pointer; + display: block; + padding: 0; + margin: 0; + background: url('#{$iconsPath}contextMenuTrigger.png') 0 13px no-repeat; + height: 45px; + width: 13px; } } - .workzone-menu-title { - text-overflow: ellipsis; - padding-right: 65px; - overflow: hidden; - white-space: nowrap; - display: block; + .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { + color: $textPrimaryActiveColor; + font-size: 1em; } - img { - max-height: 18px; - vertical-align: middle; - cursor: help; - margin-right: 9px; - } - } - .menu { - .contextMenuTrigger { - cursor: pointer; - display: block; - padding: 0; - margin: 0; - background: url('#{$iconsPath}contextMenuTrigger.png') 0 13px no-repeat; - height: 45px; - width: 13px; - } - } - .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { - color: $textPrimaryActiveColor; - font-size: 1em; } } diff --git a/resources/www/prod/skins/ui-components/_workzone-thesaurus.scss b/resources/www/prod/skins/ui-components/_workzone-thesaurus.scss index d31eea675d..55ebd64755 100644 --- a/resources/www/prod/skins/ui-components/_workzone-thesaurus.scss +++ b/resources/www/prod/skins/ui-components/_workzone-thesaurus.scss @@ -80,10 +80,37 @@ /* ================================== dans l'onglet thesaurus : arbres, menus contextuels ===================================== */ +.ui-tabs { + #thesaurus_tab { + top: 87px !important; + } +} #THPD_tabs { right: 0; + .ui-tabs-nav { + li.th_tab { + a { + color: $textPrimaryColor; + } + &.th_tab { + height: 43px; + margin: 0; + .ui-state-active { + border-bottom: 1px solid $thesaurusColor; + } + a { + height: 43px; + line-height: 43px; + vertical-align: middle; + margin: 0; + padding: 0 20px; + display: block; + text-decoration: none; + } + } + } .ui-state-default A { color: $thesaurusContextMenuColor; } @@ -137,9 +164,15 @@ dans l'onglet thesaurus : arbres, menus contextuels background-color: #ff0000; } } +#idFrameC .ui-tabs { + #THPD_C.ui-tabs-panel, + #THPD_T.ui-tabs-panel{ + top: 46px; + } +} #THPD_T, #THPD_C { - margin-top: 10px; + // margin-top: 10px; margin-left: 0px; } diff --git a/resources/www/prod/skins/ui-components/_workzone.scss b/resources/www/prod/skins/ui-components/_workzone.scss index 12521f49a9..c35f0ce39d 100644 --- a/resources/www/prod/skins/ui-components/_workzone.scss +++ b/resources/www/prod/skins/ui-components/_workzone.scss @@ -33,7 +33,18 @@ left: 0px; bottom: 0px; right: 0; + margin: 0; + padding: 0; .ui-tabs-nav { + background-color: transparent; + top: 0; + left: 10px; + right: 10px; + //margin-top: 21px; + border-top: 1px solid $workzoneTabBorderTop; + border-radius: 0; + height: 43px; + border-bottom: 1px solid $workzoneTabBorderBottom; li { width: auto; height: 85px; @@ -41,6 +52,7 @@ background-color: $mediumBackgroundColor; z-index: 10; border-radius: 0; + margin: 0; &.proposals_WZ { &.ui-state-active { a { @@ -89,29 +101,14 @@ } } } - #thesaurus_tab { - li { - a { - color: $textPrimaryColor; - } - &.th_tab { - height: 43px; - margin: 0; - .ui-state-active { - border-bottom: 1px solid $thesaurusColor; - } - a { - height: 43px; - line-height: 43px; - vertical-align: middle; - margin: 0; - padding: 0 20px; - display: block; - text-decoration: none; - } - } - } + .ui-tabs-panel { + position: absolute; + top: 56px; + left: 0; + bottom: 0; + right: 0; } + } ul.icon-menu { width: 100%; @@ -166,28 +163,6 @@ } } -#idFrameC .ui-tabs .ui-tabs-nav, -#idFrameE .ui-tabs .ui-tabs-nav { - background-color: transparent; - top: 0px; - left: 10px; - right: 10px; - margin-top: 21px; - border-top: 1px solid $workzoneTabBorderTop; - border-radius: 0; - height: 43px; - border-bottom: 1px solid $workzoneTabBorderBottom; -} - -#idFrameC .ui-tabs .ui-tabs-panel, -#idFrameE .ui-tabs .ui-tabs-panel { - position: absolute; - top: 56px; - left: 0px; - bottom: 0px; - right: 0px; -} - .alert_datas_changed a { color: #404040; text-decoration: underline; diff --git a/resources/www/prod/styles/_ie8.scss b/resources/www/prod/styles/_ie8.scss index 0c61f87314..6e779ae041 100644 --- a/resources/www/prod/styles/_ie8.scss +++ b/resources/www/prod/styles/_ie8.scss @@ -8,4 +8,18 @@ { width:580px; } + .btn-image { + width: 16px; + height: 16px; + // border: 1px solid #FF0000; + } + #idFrameC { + .ui-tabs { + .ui-tabs-nav { + li { + margin-top: -20px; + } + } + } + } } \ No newline at end of file diff --git a/resources/www/prod/styles/main.scss b/resources/www/prod/styles/main.scss index 9a31c1241c..666b3ffd16 100644 --- a/resources/www/prod/styles/main.scss +++ b/resources/www/prod/styles/main.scss @@ -100,4 +100,7 @@ .ui-tabs-vertical .ui-tabs-nav li { clear: left; width: 100%; border-bottom-width: 1px !important; border-right-width: 0 !important; margin: 0 -1px .2em 0; } .ui-tabs-vertical .ui-tabs-nav li a { display:block; } .ui-tabs-vertical .ui-tabs-nav li.ui-tabs-active { padding-bottom: 0; padding-right: .1em; border-right-width: 1px; border-right-width: 1px; } -.ui-tabs-vertical .ui-tabs-panel { padding: 1em; float: right;} \ No newline at end of file +.ui-tabs-vertical .ui-tabs-panel { padding: 1em; float: right;} + +@import 'ie7'; +@import 'ie8'; \ No newline at end of file diff --git a/templates/web/login/layout/base-layout.html.twig b/templates/web/login/layout/base-layout.html.twig index 9e2894ef20..c3a1dfab42 100644 --- a/templates/web/login/layout/base-layout.html.twig +++ b/templates/web/login/layout/base-layout.html.twig @@ -1,15 +1,12 @@ {% if form is defined %} {% form_theme form 'login/common/fields.html.twig' %} {% endif %} - - - - - - - + + + + + {% block header %} {% block title %}Phraseanet{% endblock title %} @@ -26,7 +23,7 @@ {% block header_rss %}{% endblock %} {% block favicon %} - + {% endblock favicon %} {% block header_stylesheet %} diff --git a/templates/web/prod/actions/edit_default.html.twig b/templates/web/prod/actions/edit_default.html.twig index 429bdc1b0b..858a8c1a2a 100644 --- a/templates/web/prod/actions/edit_default.html.twig +++ b/templates/web/prod/actions/edit_default.html.twig @@ -122,6 +122,7 @@
+
@@ -349,6 +350,7 @@
+
diff --git a/templates/web/prod/toolbar.html.twig b/templates/web/prod/toolbar.html.twig index 51246e7343..229b9a587b 100644 --- a/templates/web/prod/toolbar.html.twig +++ b/templates/web/prod/toolbar.html.twig @@ -47,15 +47,14 @@