From 7fdcb29f2894abf1334a0941df1c70cebe3ceddd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"J.=20Rene=CC=81e=20Beach"?= <splendidnoise@gmail.com>
Date: Fri, 22 Feb 2013 01:34:44 -0500
Subject: [PATCH] Issue #1849078 by #bryanbraun
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: J. Renée Beach <splendidnoise@gmail.com>
---
 core/modules/toolbar/css/toolbar.icons-rtl.css |    2 +-
 core/modules/toolbar/css/toolbar.icons.css     |   47 +++++++++++++-----------
 core/modules/toolbar/css/toolbar.menu.css      |    8 ++--
 core/modules/toolbar/css/toolbar.theme-rtl.css |    2 +-
 core/modules/toolbar/css/toolbar.theme.css     |    4 +-
 core/modules/toolbar/images/toolbar-sprite.png |   23 ++++++++++++
 6 files changed, 56 insertions(+), 30 deletions(-)
 create mode 100644 core/modules/toolbar/images/toolbar-sprite.png

diff --git a/core/modules/toolbar/css/toolbar.icons-rtl.css b/core/modules/toolbar/css/toolbar.icons-rtl.css
index aadd333..9f4f98f 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 7fc06bf..ea4b28d 100644
--- a/core/modules/toolbar/css/toolbar.icons.css
+++ b/core/modules/toolbar/css/toolbar.icons.css
@@ -8,7 +8,6 @@
 .toolbar .icon:before {
   background-attachment: scroll;
   background-color: transparent;
-  background-position: center center;
   background-repeat: no-repeat;
   content: '';
   display: block;
@@ -18,6 +17,10 @@
   top: 0;
   width: 20px;
 }
+.toolbar .icon:active:before,
+.toolbar .icon.active:before {
+  background-repeat: no-repeat;
+}
 .toolbar button.icon {
   background-color: transparent;
   border: 0;
@@ -40,78 +43,78 @@
  * Top level icons
  */
 .icon-home:before {
-  background-image: url("../images/icon-home.png");
+  background: url("../images/toolbar-sprite.png") -1px -379px;
 }
 .icon-home:active:before,
 .icon-home.active:before {
-  background-image: url("../images/icon-home-active.png");
+  background: url("../images/toolbar-sprite.png") -1px -347px;
 }
 .icon-menu:before {
-  background-image: url("../images/icon-menu.png");
+  background: url("../images/toolbar-sprite.png") 0px -443px;
 }
 .icon-menu:active:before,
 .icon-menu.active:before {
-  background-image: url("../images/icon-menu-active.png");
+  background: url("../images/toolbar-sprite.png") 0px -411px;
 }
 
 /**
  * Main menu icons.
  */
 .icon-content:before {
-  background-image: url("../images/icon-content.png");
+  background: url("../images/toolbar-sprite.png") 0px -197px;
 }
 .icon-content:active:before,
 .icon-content.active:before {
-  background-image: url("../images/icon-content-active.png");
+  background: url("../images/toolbar-sprite.png") 0px -167px;
 }
 .icon-structure:before {
-  background-image: url("../images/icon-structure.png");
+  background: url("../images/toolbar-sprite.png") 0px -683px;
 }
 .icon-structure:active:before,
 .icon-structure.active:before {
-  background-image: url("../images/icon-structure-active.png");
+  background: url("../images/toolbar-sprite.png") 0px -653px;
 }
 .icon-appearance:before {
-  background-image: url("../images/icon-appearance.png");
+  background: url("../images/toolbar-sprite.png") 0px -21px;
 }
 .icon-appearance:active:before,
 .icon-appearance.active:before {
-  background-image: url("../images/icon-appearance-active.png");
+  background: url("../images/toolbar-sprite.png") 0px 10px;
 }
 .icon-people:before {
-  background-image: url("../images/icon-people.png");
+  background: url("../images/toolbar-sprite.png") 0px -563px;
 }
 .icon-people:active:before,
 .icon-people.active:before {
-  background-image: url("../images/icon-people-active.png");
+  background: url("../images/toolbar-sprite.png") 0px -533px;
 }
 .icon-extend:before {
-  background-image: url("../images/icon-extend.png");
+  background: url("../images/toolbar-sprite.png") 0px -257px;
 }
 .icon-extend:active:before,
 .icon-extend.active:before {
-  background-image: url("../images/icon-extend-active.png");
+  background: url("../images/toolbar-sprite.png") 0px -227px;
 }
 .icon-configuration:before {
-  background-image: url("../images/icon-configuration.png");
+  background: url("../images/toolbar-sprite.png") 0px -137px;
 }
 .icon-configuration:active:before,
 .icon-configuration.active:before {
-  background-image: url("../images/icon-configuration-active.png");
+  background: url("../images/toolbar-sprite.png") 0px -107px;
 }
 .icon-reports:before {
-  background-image: url("../images/icon-reports.png");
+  background: url("../images/toolbar-sprite.png") 0px -623px;
 }
 .icon-reports:active:before,
 .icon-reports.active:before {
-  background-image: url("../images/icon-reports-active.png");
+  background: url("../images/toolbar-sprite.png") 0px -593px;
 }
 .icon-help:before {
-  background-image: url("../images/icon-help.png");
+  background: url("../images/toolbar-sprite.png") 0px -317px;
 }
 .icon-help:active:before,
 .icon-help.active:before {
-  background-image: url("../images/icon-help-active.png");
+  background: url("../images/toolbar-sprite.png") 0px -287px;
 }
 
 @media only screen and (min-width: 16.5em) {
@@ -124,7 +127,7 @@
     width: 4em;
   }
   .toolbar .bar .icon:before {
-    left: 0; /* LTR */
+    left: 1.1em; /* LTR */
     width: 100%;
   }
 }
diff --git a/core/modules/toolbar/css/toolbar.menu.css b/core/modules/toolbar/css/toolbar.menu.css
index c77c4c5..075fe52 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") 0px -503px;
   left: 0; /* LTR */
 }
 .toolbar .icon.handle.open:before {
-  background-image: url("../images/icon-collapse.png");
+  background: url("../images/toolbar-sprite.png") 0px -474px;
 }
 .toolbar .menu .menu .icon.handle:before {
-  background-image: url("../images/icon-child-open.png");
+  background: url("../images/toolbar-sprite.png") 0px -77px;
 }
 .toolbar .menu .menu .icon.handle.open:before {
-  background-image: url("../images/icon-child-collapse.png");
+  background: url("../images/toolbar-sprite.png") 0px -50px;
 }
diff --git a/core/modules/toolbar/css/toolbar.theme-rtl.css b/core/modules/toolbar/css/toolbar.theme-rtl.css
index fa5a1df..cab73af 100644
--- a/core/modules/toolbar/css/toolbar.theme-rtl.css
+++ b/core/modules/toolbar/css/toolbar.theme-rtl.css
@@ -52,5 +52,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 c1317e5..4bbd3c9 100644
--- a/core/modules/toolbar/css/toolbar.theme.css
+++ b/core/modules/toolbar/css/toolbar.theme.css
@@ -143,8 +143,8 @@
   left: 0; /* LTR */
 }
 .toolbar .toggle-orientation [value="vertical"]:before {
-  background-image: url('../images/icon-toggle-vertical.png'); /* LTR */
+  background: url('../images/toolbar-sprite.png') 0px -769px no-repeat; /* LTR */
 }
 .toolbar .toggle-orientation [value="horizontal"]:before {
-  background-image: url('../images/icon-toggle-horizontal.png');
+  background: url('../images/toolbar-sprite.png') 0px -721px;
 }
diff --git a/core/modules/toolbar/images/toolbar-sprite.png b/core/modules/toolbar/images/toolbar-sprite.png
new file mode 100644
index 0000000..b44847b
--- /dev/null
+++ b/core/modules/toolbar/images/toolbar-sprite.png
@@ -0,0 +1,23 @@
+PNG
+
+   IHDR        sI   bKGD	X   	pHYs   H   H Fk>  IDATx=LUA6jڙX,ĘA\HY)T*ʥJ,P
+Qcp5&효QxϜ;׌^s̙yΜwj5'ΜJ)p;^4:;E޺UBCr;PzH}%*J[`ݾB<)}` `䀯PUNBܚZ#*~5qPrYe͍[P]'FnN(Q.7{B]_re2Mqu.]2{t8,9'n{h*#ܴϒ{!5Ti50UHlw|˗ыBVzիWis+HB6a_Z
+-XvB͛bAP:L8
+VV(=yŋz^z#Q*;H==TPU|q48(f25J_tl,ϟ-CC_Hx|m\9mt@ҙrrd?ؾYo%pBJQ9&24joŢ>E&&ː1_OA*Yw!)EJ	uŻV%mw펖mUÁW[h+/p쭡D(8}~JQT\쬮ö.J^hudLs9mO27747:{rZy+000LKxh]7G5\.Nh<6Z_g200006RFFULYZuʕ'}	K#edRWcQN{k9zkvZx000qYT;|&Q.b>*豨bFIo0B%qtPŬBr&[th*E* C@**ߡ!LHn}nL㧹фp4hGUELO&*g၅±^L30VA^K$\,BC)L7\XXXXX}!3vIBWsl' ݣG{'&Qs#K6ȖŋBS20 QW[n
+޵W8SM")fZ(TWFEMr~-Dte57Gzs-?yp^k`q>폿̃O&4bx/<X8.+#-_,ĉ'B:|a(800ER^I5xۇS{FLv_qzg,4:Sԭs$e_e]7QV_Sj?T6Mq9(X^±.wlFyFs}ْ[Ie@q㏢p["?Q00ln2oqb@R`iBaa9K{KĬt/s$e^+,%a59˦e'T(G׾ܜhoDWȽtmByXT.ai89\t.GtH!}WGG%<ZmNve*\4}&s]J?61xŞX?L
+Lʕ[4Xua"J+<;p]8˨n*Nxt۾n00z#z{ioBŹ>HggnQNӈGy	7LRKZCP\4܌`NL9*\m_XPB~^uD˂}G:g/^seW8i٦4Z"
+BQO Ť}r_fkPtuɕ_ӆs/59NM^`nWMc!Jz6$5IzȘGŢŲ/Z:Qa;L#GJZGR߭ShVTʄ2j_	<v aaaʉY~2Pп#:xۮuz9]2r+ƚ؁;EMNrbO/R6^tAl/@{|d[iL+g4OtΦmKi|#uȃH]q{`P)? PME|%0w-UUvY)oBC'ׅsDTkEBhҮSQVe|CfLfEif~pd(aa*Nyk2ogO~f8#$ di/-o?5*;N;Χ'M38CC2(Nv͈5)M'ΙN4^Y=<~<JJ-mCq3ٽ$Pw/#O$dYMjobm޽l
+z>CX9\c̢qVq;&S-jY=3|HyJm33t}}_a$'ҵݣgfzkbe18[	*7`a)߾}[ggh4Ѻ2|ׯyCB/Zgϟ?˗/_)m4ZS뼦̧O>}A'jI$6-Y^[[[[[̚%-vYǏBm/>|x@Yz޿u`յcǎ;vҌw޽{*C9DwgΝ;w\YY۷oߦ9Jo7Ipv)Y]]]]]-|Ss+-Ǧt_~un1޽{E٬6`Ϟ={>^z+.8񔂩Npm	aa-ED?~1FݘwwÇG=&xqqqqqS4``9rȑ#Gr𬂂_)TH9	qd{anرcǎs;:cnS6uXKLJ]~(Ç>s<xPPt߿~QkZ9{{{{{{7ݻw޽çN:uwܹsNY'333333eonߦSFtٳgfᩩ0Syս<9\V00>$4vV|t
+.Z-FB'jӳfI^|Knc.Z>8faƉɓ'O<PzkW{Yy0SY'\vZ	n	\;̾Sq
+ÕWY`naLƍ7nWw"櫦Qz.\P
+&^^kI퇏`?jZ<8H/\,_}}'hzD؅:z}W|2r]]p!PnRXfFw򤨧`JP]˨9PG)WZo+M`m5YQnJG[tBe̅]
+;?#C;,+߱ʚ
+Uĥ##4]I<0oO?z4OCQR<盛Gsx|䰾+P'PdZZ*??`aMle lj(t܎+4[FFa/n]rℜ1huE)Xm$|^?* 0DBC7݄ڞ)X6l,\l
+@sDanBAf 	_Xd3V00LEsF(#M*:96L;y`Y.FC\&.Q"y2,2wlB0]
+azzrW\M7oLJECaZih~C~z-aEek	%NǶ]U;A	9%P%Taa6'0zeU)gYv/UB~-M;?k{i(J\PKlubka;el&~А<t6Ql8@?_/hepԆNU&
+;ʲzZv^»,TGɷBGFL߽T]`Jknr>u15+Е7%KaaoocLA%vO0lo3ݧ6b~B<BjOgXGɣvi\TrF(:0
+36F6@NΨ`ߥ\VgPJF!r)wt»5C=FG&%O6
+ƕ?*kӡ7m߷%
+M;U+:#Ž,?	ұk"$*Aض~k}$a)	w/)^||R
++Ѕx)zkRẏ-ٮJrJ=!ajؽr.^Rs/ET:RYPt26Fǫ{Iӣе2$<{gf^#ށtT,vrt/2eMubY*pv/Eؽaaqn$IssFhl<Fvkx*'سH>~EQ=.&zTHdBN٦qKF$)t@w @9BvrBZ	8xhMVVotA[|AaN<S;?+hhw&00Dٽ8
+bTN0Tٽ\'ӬUQS`zzT͟TőȂ"AiH3zEBX>R^ƦrٽdafK&4(H=\f}O`X]r[tٽ{ݻwkO>}4V;}ӧaz=w._H={3[_(<X|kZY/7001/ 4T_r5kGONNNNN{鼄Wy9~'j:tP|΂ϝ;wܹԧ2\PgEþ0Ô:[TMp,"`_&XVW4/`y9A[=4&#1&4p,rθHŷCҥv    IENDB`
\ No newline at end of file
-- 
1.7.10.4

