diff --git a/core/modules/contextual/contextual.toolbar.css b/core/modules/contextual/contextual.toolbar.css index 189a07f72c974ed0bb558a1ba65444c490454da4..1676fa08ddbfdd564ec61cf6eeceef2986e126cb 100644 --- a/core/modules/contextual/contextual.toolbar.css +++ b/core/modules/contextual/contextual.toolbar.css @@ -5,6 +5,7 @@ /* Tab icon. */ .icon-edit:before { + background-position: center center; background-image: url("../../misc/edit.png"); } .icon-edit:active:before, diff --git a/core/modules/shortcut/shortcut.theme.css b/core/modules/shortcut/shortcut.theme.css index 04f7c9f3f5067f72f547a809f9ca9181e926c2a6..f169f95dc581e21038448c9184793544f0d6f900 100644 --- a/core/modules/shortcut/shortcut.theme.css +++ b/core/modules/shortcut/shortcut.theme.css @@ -6,6 +6,11 @@ /** * Toolbar. */ + +.icon-shortcut:before { + background-position:0 8px; +} + .icon-shortcut:before { background-image: url("images/shortcut.png"); } diff --git a/core/modules/toolbar/css/toolbar.icons-rtl.css b/core/modules/toolbar/css/toolbar.icons-rtl.css index aadd3337c704d21d1e998cbd22f7c1db10445151..9f4f98f8c568be469d4c149fb36df55f5e4afae9 100644 --- a/core/modules/toolbar/css/toolbar.icons-rtl.css +++ b/core/modules/toolbar/css/toolbar.icons-rtl.css @@ -26,7 +26,7 @@ .toolbar .bar .icon:before { background-size: auto auto; left: auto; - right: 0; + right: -1.1em; } } diff --git a/core/modules/toolbar/css/toolbar.icons.css b/core/modules/toolbar/css/toolbar.icons.css index 7fc06bfb181cff2127cb92eb52ab718b0d7c6ee6..14fd733488f337973ea58390c17dc023c2ca228e 100644 --- a/core/modules/toolbar/css/toolbar.icons.css +++ b/core/modules/toolbar/css/toolbar.icons.css @@ -8,15 +8,19 @@ .toolbar .icon:before { background-attachment: scroll; background-color: transparent; - background-position: center center; background-repeat: no-repeat; content: ''; display: block; height: 100%; + max-height: 39px; left: 0.6667em; /* LTR */ position: absolute; top: 0; - width: 20px; + width: 21px; +} +.toolbar .icon:active:before, +.toolbar .icon.active:before { + background-repeat: no-repeat; } .toolbar button.icon { background-color: transparent; @@ -39,79 +43,89 @@ /** * Top level icons */ +.toolbar .tray .icon:before, +.icon-home:before, +.icon-menu:before { + background-image: url("../images/toolbar-sprite.png"); +} + .icon-home:before { - background-image: url("../images/icon-home.png"); + background-position: 0px -379px; } .icon-home:active:before, .icon-home.active:before { - background-image: url("../images/icon-home-active.png"); + background-position: 0px -347px; } .icon-menu:before { - background-image: url("../images/icon-menu.png"); + background-position: 0px -443px; } .icon-menu:active:before, .icon-menu.active:before { - background-image: url("../images/icon-menu-active.png"); + background-position: 0px -411px; } /** * Main menu icons. */ .icon-content:before { - background-image: url("../images/icon-content.png"); + background-position: 0px -197px; } .icon-content:active:before, .icon-content.active:before { - background-image: url("../images/icon-content-active.png"); + background-position: 0px -167px; } .icon-structure:before { - background-image: url("../images/icon-structure.png"); + background-position: 0px -683px; } .icon-structure:active:before, .icon-structure.active:before { - background-image: url("../images/icon-structure-active.png"); + background-position: 0px -653px; } .icon-appearance:before { - background-image: url("../images/icon-appearance.png"); + background-position: 0px -21px; } .icon-appearance:active:before, .icon-appearance.active:before { - background-image: url("../images/icon-appearance-active.png"); + background-position: 0px 9px; } .icon-people:before { - background-image: url("../images/icon-people.png"); + background-position: 0px -563px; } .icon-people:active:before, .icon-people.active:before { - background-image: url("../images/icon-people-active.png"); + background-position: 0px -533px; } .icon-extend:before { - background-image: url("../images/icon-extend.png"); + background-position: 0px -257px; } .icon-extend:active:before, .icon-extend.active:before { - background-image: url("../images/icon-extend-active.png"); + background-position: 0px -227px; } .icon-configuration:before { - background-image: url("../images/icon-configuration.png"); + background-position: 0px -137px; } .icon-configuration:active:before, .icon-configuration.active:before { - background-image: url("../images/icon-configuration-active.png"); + background-position: 0px -107px; } .icon-reports:before { - background-image: url("../images/icon-reports.png"); + background-position: 0px -623px; } .icon-reports:active:before, .icon-reports.active:before { - background-image: url("../images/icon-reports-active.png"); + background-position: 0px -593px; } .icon-help:before { - background-image: url("../images/icon-help.png"); + background-position: 0px -317px; } .icon-help:active:before, .icon-help.active:before { - background-image: url("../images/icon-help-active.png"); + background-position: 0px -287px; +} + +.toolbar .icon-help:before { + width: 21px; } @media only screen and (min-width: 16.5em) { @@ -124,7 +138,7 @@ width: 4em; } .toolbar .bar .icon:before { - left: 0; /* LTR */ + left: 1.1em; /* LTR */ width: 100%; } } @@ -139,6 +153,6 @@ } .toolbar .bar .icon:before { left: 0.6667em; /* LTR */ - width: 20px; + width: 21px; } } diff --git a/core/modules/toolbar/css/toolbar.menu.css b/core/modules/toolbar/css/toolbar.menu.css index c77c4c50f61f6869304791c9dfc2a5c7bd815c75..fb2f1ef48855fa472619b9e01cb8d65b031b0441 100644 --- a/core/modules/toolbar/css/toolbar.menu.css +++ b/core/modules/toolbar/css/toolbar.menu.css @@ -87,15 +87,15 @@ z-index: 1; } .toolbar .icon.handle:before { - background-image: url("../images/icon-open.png"); + background: url("../images/toolbar-sprite.png") 0 -503px; left: 0; /* LTR */ } .toolbar .icon.handle.open:before { - background-image: url("../images/icon-collapse.png"); + background: url("../images/toolbar-sprite.png") 0 -474px; } .toolbar .menu .menu .icon.handle:before { - background-image: url("../images/icon-child-open.png"); + background: url("../images/toolbar-sprite.png") 0 -77px; } .toolbar .menu .menu .icon.handle.open:before { - background-image: url("../images/icon-child-collapse.png"); + background: url("../images/toolbar-sprite.png") 0 -50; } diff --git a/core/modules/toolbar/css/toolbar.theme-rtl.css b/core/modules/toolbar/css/toolbar.theme-rtl.css index 031bc60c9db58a3b45c44fe4ffdd949a74384b19..91db336c4e7ddebcdaf39ae0a54acc906ae95fc9 100644 --- a/core/modules/toolbar/css/toolbar.theme-rtl.css +++ b/core/modules/toolbar/css/toolbar.theme-rtl.css @@ -61,5 +61,5 @@ right: 0; } .toolbar .toggle-orientation [value="vertical"]:before { - background-image: url('../images/icon-toggle-vertical-rtl.png'); /* LTR */ + background: url('../images/toolbar-sprite.png') 0 -745px; /* LTR */ } diff --git a/core/modules/toolbar/css/toolbar.theme.css b/core/modules/toolbar/css/toolbar.theme.css index 41201357e29ad9e1379022123030e6283a37bd50..ca985cb1f86f95bfdc84fe081f85fbbd407c1e00 100644 --- a/core/modules/toolbar/css/toolbar.theme.css +++ b/core/modules/toolbar/css/toolbar.theme.css @@ -142,9 +142,13 @@ .toolbar .toggle-orientation button:before { left: 0; /* LTR */ } +.toolbar .toggle-orientation .icon:before { + background-image: url('../images/toolbar-sprite.png'); + background-repeat: no-repeat; +} .toolbar .toggle-orientation [value="vertical"]:before { - background-image: url('../images/icon-toggle-vertical.png'); /* LTR */ + background-position: 0px -769px; /* LTR */ } .toolbar .toggle-orientation [value="horizontal"]:before { - background-image: url('../images/icon-toggle-horizontal.png'); + background-position: 0px -721px; } diff --git a/core/modules/toolbar/images/icon-appearance-active.png b/core/modules/toolbar/images/icon-appearance-active.png deleted file mode 100644 index 2b11761d01db85754340c2e38b77a3038ecc28a5..0000000000000000000000000000000000000000 --- a/core/modules/toolbar/images/icon-appearance-active.png +++ /dev/null @@ -1,4 +0,0 @@ -PNG - - IHDR tEXtSoftwareAdobe ImageReadyqe<IDATxڬ DI$LB%LN0 H@&a$B\/ZP#NIZ-ƎuIŠI؃K"=eT:+*s6ǽy+ {XA`fgdi#GXzP~'Y; -ઊ/A4Տxzs576IENDB` \ No newline at end of file diff --git a/core/modules/toolbar/images/icon-appearance.png b/core/modules/toolbar/images/icon-appearance.png deleted file mode 100644 index fd581f691a1e882641c1e93c9155cedf6679cc5a..0000000000000000000000000000000000000000 --- a/core/modules/toolbar/images/icon-appearance.png +++ /dev/null @@ -1,4 +0,0 @@ -PNG - - IHDR tEXtSoftwareAdobe ImageReadyqe<AIDATxڜ0EZ;Bsv/q|.2BJ/,%gvd+5eY6ư3<ۦi~b֓]Ao=00QF{n?#GDKT-lJV\6#xxf$t?(~KkQ@&\,2oRgBmqj{mA gE%JVh+*՛Ч3>m9 U?$tlPЧK/c_@߹5H\ . -ձcsC 0@^ǀIENDB` \ No newline at end of file diff --git a/core/modules/toolbar/images/icon-collapse.png b/core/modules/toolbar/images/icon-collapse.png deleted file mode 100644 index 8b247b5a2ef30844acab77e4e8519d9025653d75..0000000000000000000000000000000000000000 --- a/core/modules/toolbar/images/icon-collapse.png +++ /dev/null @@ -1,4 +0,0 @@ -PNG - - IHDRrP6tEXtSoftwareAdobe ImageReadyqe<3IDATxڴT 040BF *%eZ(SL6& L@F00wE| A𤓭wϹgDY K㠕5PiZzw"J"`8䆘3?b&ȹ1H'St+)vSḢW1FJXz'lba &Ա:Mh,9Ҫ}@K4#u  Os`jFȄ=߶;ߗE"J!:to.}ق -Vǘ:\f!r-}v-"ytf$^{ƛt~~^JyIENDB` \ No newline at end of file diff --git a/core/modules/toolbar/images/icon-configuration-active.png b/core/modules/toolbar/images/icon-configuration-active.png deleted file mode 100644 index 1eea537c976a781722e6a9085e575e39e84c4b32..0000000000000000000000000000000000000000 --- a/core/modules/toolbar/images/icon-configuration-active.png +++ /dev/null @@ -1,4 +0,0 @@ -PNG - - IHDR tEXtSoftwareAdobe ImageReadyqe<IDATxbd -@`>GBn(7PBH4t=!hC3>+ ?C#^x>ah ( dMx@BCha4GxCq8 e 64k~IENDB` \ No newline at end of file diff --git a/core/modules/toolbar/images/icon-configuration.png b/core/modules/toolbar/images/icon-configuration.png deleted file mode 100644 index a5d46b2268692f295b8a9006807f6c455dcec6e6..0000000000000000000000000000000000000000 --- a/core/modules/toolbar/images/icon-configuration.png +++ /dev/null @@ -1,3 +0,0 @@ -PNG - - IHDR tEXtSoftwareAdobe ImageReadyqe<IDATxڜ-@w[Y#p8[`qp DǛdH6e6o_g^_iʐFS۶O%([PmŀK\Uu:giq'=Pg^ƞ9 #,y0#س1(ʜb eKJ%s\P݂ٞ9%nsW=Gވ‡rfyL38Rhc_P͍ Z7⃵(TKa;qzqB@)4KX O%]PMƠCЯyAIENDB` \ No newline at end of file diff --git a/core/modules/toolbar/images/icon-content-active.png b/core/modules/toolbar/images/icon-content-active.png deleted file mode 100644 index 24b6982dfc9605d5b6c0016f3b8862584b1b07a4..0000000000000000000000000000000000000000 --- a/core/modules/toolbar/images/icon-content-active.png +++ /dev/null @@ -1,4 +0,0 @@ -PNG - - IHDR tEXtSoftwareAdobe ImageReadyqe<IDATxbd@(&\ 5p6CʂC1# - B.0C i  C|ORՅ \ </G<Hur/ zIu!(| @P( O 2U# ?R݅'szPIENDB` \ No newline at end of file diff --git a/core/modules/toolbar/images/icon-content.png b/core/modules/toolbar/images/icon-content.png deleted file mode 100644 index 32081b6d14444b07f3c9f82ed79726ce6d11312a..0000000000000000000000000000000000000000 --- a/core/modules/toolbar/images/icon-content.png +++ /dev/null @@ -1,3 +0,0 @@ -PNG - - IHDR tEXtSoftwareAdobe ImageReadyqe<IDATxbdr @ٹ dX=4t8`>|.͌x\PdRB.0C i  C|=|”.dB@ʀ@.$@ ? Ʌr^O oZHA#GI.F0@bH)$'R蓰ѳӀ 4!IENDB` \ No newline at end of file diff --git a/core/modules/toolbar/images/icon-extend-active.png b/core/modules/toolbar/images/icon-extend-active.png deleted file mode 100644 index faa13c54cedeac5fdc776f13e8644e7b33466db9..0000000000000000000000000000000000000000 --- a/core/modules/toolbar/images/icon-extend-active.png +++ /dev/null @@ -1,3 +0,0 @@ -PNG - - IHDR tEXtSoftwareAdobe ImageReadyqe<IDATxڼ  `#F0JG0 n4#΃K.r$'ZcҸzZOB}O uhsw`6ahQԎ`( a,412*_5I0c5!|P:vMhsf͆`3 ƥ<IENDB` \ No newline at end of file diff --git a/core/modules/toolbar/images/icon-extend.png b/core/modules/toolbar/images/icon-extend.png deleted file mode 100644 index 52219ff8506fbf17e52aec2b3670ce7c9a5ef2a6..0000000000000000000000000000000000000000 --- a/core/modules/toolbar/images/icon-extend.png +++ /dev/null @@ -1,3 +0,0 @@ -PNG - - IHDR tEXtSoftwareAdobe ImageReadyqe<,IDATxڜ10 Evb8B: la8Lt G:d۱DYeYn`6R# N`UUn&o`S)ָV\+ A 5weQi~ķ ?w5cVP*U9r'eisJ#H!L&迖[cR!5m AЏ;b'+d,F"\.uJv*BԘ+B&&'u @H@U\Ax=P ;Oa0|q(~Oa la`` 8" -4:DC l .o34iX08 ##.dA߰@&!ɷd^f ṖЁyXk "aJPCd=KT) 2$JIENDB` \ No newline at end of file diff --git a/core/modules/toolbar/images/icon-help.png b/core/modules/toolbar/images/icon-help.png deleted file mode 100644 index 0a8fe2e98dba8729bb5f267c3e3aefbc34e635ee..0000000000000000000000000000000000000000 --- a/core/modules/toolbar/images/icon-help.png +++ /dev/null @@ -1,4 +0,0 @@ -PNG - - IHDR tEXtSoftwareAdobe ImageReadyqe<>IDATxڴ0!Cv%PT V t;qD,A;0H %?m. ɷ͟M1 gzB{RTah+!|fLN27 '@]y s:TSkWBf~.B ֦$LKV.w%IML&=+'P܏P}*N m\;`8J3h뼙[`%ȣLQґIwR -Դ[Dy:9\.c@w -M#6suF}}#?D9ot:[+WmBQ*/*G.)qz$ UZpNj`۶{.Hk*>LO0{ -0\ lJIENDB` \ No newline at end of file diff --git a/core/modules/toolbar/images/icon-home.png b/core/modules/toolbar/images/icon-home.png deleted file mode 100644 index 5d8d5018b8bdcbd05dc08199975b301038e4fd16..0000000000000000000000000000000000000000 --- a/core/modules/toolbar/images/icon-home.png +++ /dev/null @@ -1,6 +0,0 @@ -PNG - - IHDRĴl;tEXtSoftwareAdobe ImageReadyqe<IDATxԔA -0E xGH;UqJ#. ( GԊ ?1h02*B 8MS -a! J,bN G3/H$s8qUUkIpE -!ɄAuJb}:yh3PEQu]hymEUU8Y' m8ذޘG3M5MC#&/7a],uDS)~o=ʱIENDB` \ No newline at end of file diff --git a/core/modules/toolbar/images/icon-menu-active.png b/core/modules/toolbar/images/icon-menu-active.png deleted file mode 100644 index ab6462e0f1ae96f28eb89ca745ed4e57aec62fab..0000000000000000000000000000000000000000 --- a/core/modules/toolbar/images/icon-menu-active.png +++ /dev/null @@ -1,3 +0,0 @@ -PNG - - IHDRĴl;tEXtSoftwareAdobe ImageReadyqe<IIDATxb``v,Pia0M`_~b߿xW^Ǵ 4Iq2{LIENDB` \ No newline at end of file diff --git a/core/modules/toolbar/images/icon-menu.png b/core/modules/toolbar/images/icon-menu.png deleted file mode 100644 index a02939ffd92ad56edbec657249bb1f9860e18ec4..0000000000000000000000000000000000000000 --- a/core/modules/toolbar/images/icon-menu.png +++ /dev/null @@ -1,3 +0,0 @@ -PNG - - IHDRĴl;tEXtSoftwareAdobe ImageReadyqe<\IDATxbb` $o kDΖD" gJ.| 2ynd$`UI &11; 9dsIENDB` \ No newline at end of file diff --git a/core/modules/toolbar/images/icon-reports-active.png b/core/modules/toolbar/images/icon-reports-active.png deleted file mode 100644 index 96f467357d28928b16e13bb379c9592016eec6f8..0000000000000000000000000000000000000000 --- a/core/modules/toolbar/images/icon-reports-active.png +++ /dev/null @@ -1,4 +0,0 @@ -PNG - - IHDR tEXtSoftwareAdobe ImageReadyqe<IDATxڬ ]Fp6N  :BGTr<.,3w] -#IhT*TD :L0(]'!+%N!g;&}XMQoRy8c67`'R)zX (Sx/Q#%eF?-Nڦ-@4rdL7U O)ouеQtủ+as|47 zIENDB` \ No newline at end of file diff --git a/core/modules/toolbar/images/icon-reports.png b/core/modules/toolbar/images/icon-reports.png deleted file mode 100644 index 49ede88cdb2820de6baaff7dd07c3b40cf7e0e0f..0000000000000000000000000000000000000000 --- a/core/modules/toolbar/images/icon-reports.png +++ /dev/null @@ -1,5 +0,0 @@ -PNG - - IHDR tEXtSoftwareAdobe ImageReadyqe< IDATxڬT 0 LQdF00B_}Ͼ `f26 -2IKX&.ڶR1{Ld"f:@ ih1sAUJd0`S=|`g(!j͒\΅" ۳*5Jr8!DF5:4G] -xt#oQ ϶ K4q:cE&2HO0G^yc,tDHY3 w'^ :3PdVIENDB` \ No newline at end of file diff --git a/core/modules/toolbar/images/icon-structure-active.png b/core/modules/toolbar/images/icon-structure-active.png deleted file mode 100644 index 3ab2375fc5f06ba8efd57fac47917fe3ab643539..0000000000000000000000000000000000000000 --- a/core/modules/toolbar/images/icon-structure-active.png +++ /dev/null @@ -1,3 +0,0 @@ -PNG - - IHDR tEXtSoftwareAdobe ImageReadyqe<IDATxb`q$#r"uHc 0QT7PxAH0쨛H5Dp([#6 #wf t)cb V PB 6ʡB~(|9Wr\Q@^ `c'6CIENDB` \ No newline at end of file diff --git a/core/modules/toolbar/images/icon-structure.png b/core/modules/toolbar/images/icon-structure.png deleted file mode 100644 index 7a8302f8dd48adb129a4312978f7c9e43a757fe9..0000000000000000000000000000000000000000 --- a/core/modules/toolbar/images/icon-structure.png +++ /dev/null @@ -1,3 +0,0 @@ -PNG - - IHDR tEXtSoftwareAdobe ImageReadyqe<IDATxb`qdEEr"u6=,,VCL2 $H^s@b?f`/3%JJ,Xҗ#./q'x b +bz,/ 1jZ`@ArC' "`+@C0nj+Sލu\IENDB` \ No newline at end of file diff --git a/core/modules/toolbar/images/toolbar-sprite.png b/core/modules/toolbar/images/toolbar-sprite.png new file mode 100644 index 0000000000000000000000000000000000000000..4e2d7d0f402657113b7ead7e74ed2b281c0c0935 --- /dev/null +++ b/core/modules/toolbar/images/toolbar-sprite.png @@ -0,0 +1,25 @@ +PNG + + IHDR#IDATxnHNj' o@~]y-Wt!Y'h !gB f"0A\p&МřNu\'g:Iw\'.k2GH$5K(w(hPFPp^Wl#PpR^6*2jJXW|eM5!*;u75dQRa~m`;TKR3|Dua.x3fJhJPhjZ#۶mQcccG3PCnڌ) {B,iGnڴgI Zvz˖-I%V pH=c bOU|&P6oUjȗ6yݒ%.y,uABC,^lU:e.hFFғw)j*^oU=_p?ʦZPyTStp@i䪈'u +B |D9Q}WAc}iՎ^_rP( +B_j4O#ό__~ʆa` + *GvBQ( +A7b;%v!$:Y%O]ֿedi0Nx,+H1z> Se ,j&BsXjxe8|\-b7v Oz*p]9 Nꂓ.8 +MNN63iLxhY:O]c2^mb~['&&FZ8SbՏSiÎhcccvgׁAʇ/ T~Dg'I9n^Ru( +'wjXNw"FXҺ^ WCf],n1N۾ഢC9W$Kpy< OI@pZz]#.NpW7m ՉV›zB I)Wx84&\.(Յ&;FP'Q)Gp,[18<~0:?%&Uq¶C$up]?% zMO屄7+ |BV>Jж^N} ɬUp9Q7apr͂JG\,P%﩯a8a{,޽{GC E8yA e8a_欁|je`U^_R}답6z}GuY/>Zg= +~7^ڃѠׯ_(u>:333rҥލ7(7ϯ]+sqٕ+Wrk Yjcj3gFΝ;Wãf+;4be.._L]}l8q`D} ͱcNJnKC E89zh2K~rԩ |ijgje`CuY/7Tg:|0g:DuYP}k߾}TgP(R_~M6?mH1"X 2c,.ݻw sBb:7odo߾ a,f{ ~X{ɓٳgYl83Ń}6Ń}M=z&">N6¦,Z^}Em?k=P((ċ(:,ggj(dv~O3,(eEZ]:hE!+( +xQ( +MpÜDaJN i ؍NCPVZZ!<;-_$Oj=wO ?S? ܉&X5FCTe %5$7R.pVBVV|rruD`0xbbac + +yU:ڄ 2*m3BFohGYg]r0v "IEt *6"st[p8 ntB Ƌ"BRډU˓#u&) MuKUlM-CNg .4P:1hB `n~W6s8, 9F5K3U31˳8]NGzmؑON-Sq H87uIшs7-dGոƋ`^@]&$ŪX< yZ'H Y+ B_ݼ6 y)ךrvh jyV 5Q(Ԫ'l͚5T6qS),Np--Bt>Ug(s\:G V] gV݆u +>}Em_nVuTS X« wˋ ,wX6IENDB` \ No newline at end of file diff --git a/core/modules/user/user.css b/core/modules/user/user.css index 2c8812163909cf68c4643e91b454ffa8e0e2245f..278fe070c2a5d0de0c7269cb5db27edd95d4f83a 100644 --- a/core/modules/user/user.css +++ b/core/modules/user/user.css @@ -93,8 +93,14 @@ div.password-suggestions ul { /** * Toolbar icon. */ +.toolbar .bar .icon-user:before { + width: 22px; + left: 0.6em; +} + .icon-user:before { background-image: url("images/icon-user.png"); + background-position: 0 8px; } .icon-user:active:before, .icon-user.active:before {