From 6f9674228c77efab817585cde702bf2258167e47 Mon Sep 17 00:00:00 2001 From: PayBas Date: Tue, 3 Jun 2014 10:15:53 +0200 Subject: [PATCH] [ticket/12648] More style fixes and also cleaned up CP left navigation PHPBB3-12648 --- phpBB/styles/prosilver/theme/colours.css | 37 +++++++--- phpBB/styles/prosilver/theme/cp.css | 69 +++++++----------- .../styles/prosilver/theme/images/bg_menu.gif | Bin 354 -> 0 bytes .../prosilver/theme/images/bg_menu_rtl.gif | Bin 345 -> 0 bytes .../prosilver/theme/images/bg_tabs1.gif | Bin 1520 -> 0 bytes .../prosilver/theme/images/bg_tabs2.gif | Bin 420 -> 0 bytes .../prosilver/theme/images/corners_left2.gif | Bin 112 -> 0 bytes .../prosilver/theme/images/corners_right2.gif | Bin 111 -> 0 bytes 8 files changed, 51 insertions(+), 55 deletions(-) delete mode 100644 phpBB/styles/prosilver/theme/images/bg_menu.gif delete mode 100644 phpBB/styles/prosilver/theme/images/bg_menu_rtl.gif delete mode 100644 phpBB/styles/prosilver/theme/images/bg_tabs1.gif delete mode 100644 phpBB/styles/prosilver/theme/images/bg_tabs2.gif delete mode 100644 phpBB/styles/prosilver/theme/images/corners_left2.gif delete mode 100644 phpBB/styles/prosilver/theme/images/corners_right2.gif diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 4fc7596698..8222c85354 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -50,7 +50,7 @@ hr { } .navbar { - background-color: #cadceb; + background-color: #CADCEB; } .forabg { @@ -92,7 +92,7 @@ table.zebra-list tr:nth-child(even) td, ul.zebra-list li:nth-child(even) { background-color: #e1ebf2; } -.bg3 { background-color: #cadceb; } +.bg3 { background-color: #CADCEB; } .ucprowbg { background-color: #DCDEE2; @@ -826,6 +826,7 @@ ul.cplist { background: -o-linear-gradient(top, #E2F2FF 0%, #CADCEB 100%); background: -ms-linear-gradient(top, #E2F2FF 0%, #CADCEB 100%); background: linear-gradient(to bottom, #E2F2FF 0%, #CADCEB 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#E2F2FF', endColorstr='#CADCEB', GradientType=0 ); border-color: #CADCEB; box-shadow: 0 1px 1px #F2F9FF inset; color: #333333; @@ -863,35 +864,47 @@ ul.cplist { /* Link styles for the sub-section links */ #navigation a { color: #333; - background-color: #B2C2CF; - background-image: url("./images/bg_menu.gif"); + background: #B4C4D1; + background: -moz-linear-gradient(left, #B4C4D1 50%, #CADCEB 100%); + background: -webkit-gradient(left top, right top, color-stop(50%, #B4C4D1), color-stop(100%, #CADCEB)); + background: -webkit-linear-gradient(left, #B4C4D1 50%, #CADCEB 100%); + background: -o-linear-gradient(left, #B4C4D1 50%, #CADCEB 100%); + background: -ms-linear-gradient(left, #B4C4D1 50%, #CADCEB 100%); + background: linear-gradient(to right, #B4C4D1 50%, #CADCEB 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#B4C4D1', endColorstr='#CADCEB', GradientType=1 ); } .rtl #navigation a { - background-image: url("./images/bg_menu_rtl.gif"); - background-position: 0 100%; + background: #B4C4D1; + background: -moz-linear-gradient(left, #CADCEB 0%, #B4C4D1 50%); + background: -webkit-gradient(left top, right top, color-stop(0%, #CADCEB), color-stop(50%, #B4C4D1)); + background: -webkit-linear-gradient(left, #CADCEB 0%, #B4C4D1 50%); + background: -o-linear-gradient(left, #CADCEB 0%, #B4C4D1 50%); + background: -ms-linear-gradient(left, #CADCEB 0%, #B4C4D1 50%); + background: linear-gradient(to right, #CADCEB 0%, #B4C4D1 50%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#CADCEB', endColorstr='#B4C4D1', GradientType=1 ); } #navigation a:hover { - background-image: none; - background-color: #aabac6; + background: #AABAC6; color: #BC2A4D; + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } #navigation #active-subsection a { + background: #F9F9F9; color: #D31141; - background-color: #F9F9F9; - background-image: none; + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } #navigation #active-subsection a:hover { color: #D31141; } -@media only screen and (max-width: 700px), only screen and (max-device-width: 700px) +@media only screen and (max-width: 900px), only screen and (max-device-width: 900px) { #navigation a, .rtl #navigation a { - background-image: none; + background: #B2C2CF; } } diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css index b482c3db80..a4f5da1770 100644 --- a/phpBB/styles/prosilver/theme/cp.css +++ b/phpBB/styles/prosilver/theme/cp.css @@ -97,46 +97,40 @@ ul.cplist { } .tabs-container:after { - display: block; clear: both; content: ''; + display: block; } -/* CP tabbed menu +/* CP tabs shared ----------------------------------------*/ -#tabs { +#tabs, #minitabs { line-height: normal; - margin: 20px 0 0 7px; - /**overflow: hidden;*/ } -#tabs > ul { +#tabs > ul, #minitabs > ul { list-style: none; - margin:0; + margin: 0; padding: 0; position: relative; } -#tabs > ul:after { +#tabs > ul:after, #minitabs > ul:after { + clear: both; content: ''; display: block; - clear: both; } -#tabs .tab { - display: inline; +#tabs .tab, #minitabs .tab { + display: inline-block; float: left; font-size: 1em; font-weight: bold; line-height: 14px; } -#tabs .tab > a { - background: none no-repeat 0% -35px; - border: 1px solid transparent; - border-radius: 4px 4px 0 0; +#tabs .tab > a, #minitabs .tab > a { display: block; - margin: 1px 1px 0 0; padding: 5px 9px; position: relative; text-decoration: none; @@ -144,6 +138,18 @@ ul.cplist { cursor: pointer; } +/* CP tabbed menu +----------------------------------------*/ +#tabs { + margin: 20px 0 0 7px; +} + +#tabs .tab > a { + border: 1px solid transparent; + border-radius: 4px 4px 0 0; + margin: 1px 1px 0 0; +} + #tabs .activetab > a { margin-top: 0; padding-bottom: 7px; @@ -152,7 +158,6 @@ ul.cplist { /* Mini tabbed menu used in MCP ----------------------------------------*/ #minitabs { - line-height: normal; margin: -20px 7px 0 0; } @@ -162,27 +167,13 @@ ul.cplist { max-width: 50%; } -#minitabs > ul { - list-style: none; - margin:0; - padding: 0; - position: relative; -} - #minitabs .tab { - display: inline; float: right; - font-size: 1em; - font-weight: bold; - line-height: 14px; } #minitabs .tab > a { border-radius: 5px 5px 0 0; - display: block; margin-left: 2px; - padding: 5px 9px; - position: relative; } #minitabs .tab > a:hover { @@ -196,7 +187,7 @@ ul.cplist { } .responsive-tab > a.responsive-tab-link { - display: inline-block; + display: block; font-size: 16px; position: relative; width: 16px; @@ -256,15 +247,15 @@ ul.cplist { } #navigation ul { - list-style:none; + list-style: none; } /* Default list state */ #navigation li { + display: inline; + font-weight: bold; margin: 1px 0; padding: 0; - font-weight: bold; - display: inline; } /* Link styles for the sub-section links */ @@ -273,18 +264,10 @@ ul.cplist { padding: 5px; margin: 1px 0; text-decoration: none; - font-weight: bold; - background: transparent none repeat-y 100% 0; } #navigation a:hover { text-decoration: none; - background-image: none; -} - -#navigation #active-subsection a { - display: block; - background-image: none; } /* Preferences pane layout diff --git a/phpBB/styles/prosilver/theme/images/bg_menu.gif b/phpBB/styles/prosilver/theme/images/bg_menu.gif deleted file mode 100644 index 4a9f5a9174084c4c700274c15a473af5f3cb91b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 354 zcmV-o0iFIwNk%w1VU+*`0K@r+2%Kp*Ivkm(G!x)huUC(DtHpS|hA?AHC$vIEeJ3%Gc^M^IXfCYKS3KrMMp+S2}=-73Qto~RajVDTwh>fWM*h*Yiw_A zaSe2JcNcjDdnJ8;DuIJDG&YD4ii4t8uXA;?c(r}FfV;dg rz5s}djE)$@LdHXsm6yw#&7RPq8`Gp3)*_%%rL9#rZ?eGM2>}2*&P}f% diff --git a/phpBB/styles/prosilver/theme/images/bg_tabs1.gif b/phpBB/styles/prosilver/theme/images/bg_tabs1.gif deleted file mode 100644 index 335a72c7116fb0aa27b4fd853d9533526a811497..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1520 zcmVG0w2`|tAh z!qVN!)7{6=+uY{v&DP)P^ZfVw{_XVpfq|}%G~S!|Npwo z+1>5?A^8LV00000EC2ui0A2xU000L6z+P`-Voi?7q;kn@I-k&}bV{vSuh^`1%k6rz zJsfB?qL|O41ejE#(BSV%Upt9x5m@{kM%(=7Y&!9t#9!C>oFt6t4|HHrYRW6PdRySDAy zxO3~?&AYen-@t~;D7`cXyAbeCaBNG7S|l1w(~WRp4|Amx-)R%zvxSZ1l^mRxq}<(FWFDdw1D zmTBghXr_tg3=6dB=9_TFDd(JY)@kRRc;>0+o_zM{=bwNED(Iku4*G!sh$gD&qKr1` z=%bKED(R$@R%+>`m}aW!rkr-_>8GB4aKNafmTKy$sHUpws;su^>Z`EED(kGY)@tjm zxaO*Bt{Cv(>#x8DE9|hu7HjOW$R?}ovdlK??6c5DEA6z@R!eOL)@G~iw%m5>?YH2D zD=x9vj%)6@=%%ax?z-$!yF!3Za; z@WTHx?C`@7Lws<=6jyAqy%S%o@x~m7n{me=hb*$QACGME$td$6#L6tU?DESn$1L;A zG}mnN%{b?*^Ugf??DNk+2QBmv7jWRi(MTt)^wLZ>?ex=7M=kZ#R99{F)mUe(_10W> z?X}iD82$CwWS4FB*=VP&_S$SOeL>rB$1V5Vbk}XS*D&0z_uhQ>?f2h+2QK*Fgcol3 z;fN=$_~MK=?)c-7M=tr~lvi%~<(Ox#`R1H=?)m4Shc5c)q?c~`>8Pi!`s%E=?)vMn z$1eNqwAXI``|Y^ruKVu1_wM`ezy~k<@WdBy{PD;qul(}NH}CxO&_^%*^wd{x{q@*q zul@Gickli8;D;~%_~e&w_|WL5um1Y%x9|S@@WU@c2pTM8|NZ#qumAr1_wWDz_UJ+V z07$?B8t{M!OrQc05`qOf@PQDFpaduAj}}nyf*8!81~TiOrsjt$i_Ch@r`hdqa5c* W$2!^#@s4=RqaOFj$3EUL2mm{Rf3^$& diff --git a/phpBB/styles/prosilver/theme/images/bg_tabs2.gif b/phpBB/styles/prosilver/theme/images/bg_tabs2.gif deleted file mode 100644 index a2142d5432be00a2e6395bed8b503a0eb053de5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 420 zcmV;V0bBk@Nk%w1VFv(d0M!5h-R=9j%-PD^>;M1%;p_6)>G#^|_}1t3)8z8r?)=T( z?a<=z%--$P<@43%^v>Vz%iZkH;qcq+`O@R@&fxFM-Rt1+{o(Qc#?RT|@B7^5?%(eF z$I#ot(%s+b@Y>|;@ACHY`Tyeb|LODm%G2Gz$<_D!{?gv&)7s+H-sjQVBe^A^8LV00000EC2ui00#hR000KTz)}f=0u2VC5byV*4MZZCP8OS8uGd`8!sRA7 ziLe+0D4Q{ow3=gRyGez(oOGz$Z;rfv)#&?i2!Vnu6NQE<3yF$85si*16p@lU50#cR z3YnTU44s}I5TT+P6{V&c0;#Gws;VBXsjsjuumS|Nx3IabyQ;mZzqYtX#769z?d||0@&Ft4`1$(#{Qds_ O00RmfNU$KlAOJh7n-8b} diff --git a/phpBB/styles/prosilver/theme/images/corners_left2.gif b/phpBB/styles/prosilver/theme/images/corners_left2.gif deleted file mode 100644 index fa27ce3ba26944b46c7de2263497d47041335784..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 112 zcmZ?wbhEHbWMklA*v!rF`TOtB-+z7m@%z)aUl$&{eenA8!`EN_{rmsz=kL>ZU!S`3 z`v3p`3`junCkrD312=;XNDO2K1B-0H%8+A$E^FpqxOa3r>!YG6%Q>dF-RzvP-LunB IN07l902eVda{vGU diff --git a/phpBB/styles/prosilver/theme/images/corners_right2.gif b/phpBB/styles/prosilver/theme/images/corners_right2.gif deleted file mode 100644 index 2d689446ee075a2fb60d93652f567977ae918952..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 111 zcmZ?wbhEHbWMklA*v!N5`TOs$KYsuH`|s1YU;qC7|NQ;egV&!QzW#FI!P{>?f1kel z`qZ7*|NsAIfC0syEQ}05tvVn9kQodtG81?fUrVxB&>a~ho7UpvD73_Z>4{)n?53&i ITU{8e0cGbjQUCw|