diff --git a/core/misc/icons/000000/9964-file.png b/core/misc/icons/000000/9964-file.png new file mode 100644 index 0000000..57b7955 --- /dev/null +++ b/core/misc/icons/000000/9964-file.png @@ -0,0 +1,5 @@ +PNG + + IHDR {IDAT8c`10```؏r g``O&-L d(k(aP& +",$H""c>y$BZaB0j 7=a?q C + NIENDB` \ No newline at end of file diff --git a/core/misc/icons/000000/9972-questionmark-disc.png b/core/misc/icons/000000/9972-questionmark-disc.png new file mode 100644 index 0000000..055e7d1 --- /dev/null +++ b/core/misc/icons/000000/9972-questionmark-disc.png @@ -0,0 +1,3 @@ +PNG + + IHDR IDAT8˽ EnGF`F`Fä$;I~bm{pMؔ!s@~ 詪:`]U6b: P4J/NR12h%:N>:1lTx`N+`e)KO~촦Gm8Ip  ?d DJ =E2=`IqX59pDJ6 Ǒ+$h+ٜG+p#II~?  6%d0d-͚gwIENDB` \ No newline at end of file diff --git a/core/misc/icons/000000/9977-paintbrush.png b/core/misc/icons/000000/9977-paintbrush.png new file mode 100644 index 0000000..1f8d35d --- /dev/null +++ b/core/misc/icons/000000/9977-paintbrush.png @@ -0,0 +1,4 @@ +PNG + + IHDR IDAT8˭Q DO$  2 0I$  5!lz Qk" +b-aRe&ODR-Lx yV[g42f<>#Y͸Cݳt~̅g:uqvxAS'jcf % eLo*IENDB` \ No newline at end of file diff --git a/core/misc/icons/000000/9978-orgchart.png b/core/misc/icons/000000/9978-orgchart.png new file mode 100644 index 0000000..f41d973 --- /dev/null +++ b/core/misc/icons/000000/9978-orgchart.png @@ -0,0 +1,3 @@ +PNG + + IHDR IDAT8Ŕ] 0 $LIIII=ti\Hi!|Uf+l:v 0`|hZ\EF3ZQ͘E\UЫ+֔%DI׋^QCɢ ЫzzЋ^EPKO@R xq_7>yqN@jIENDB` \ No newline at end of file diff --git a/core/misc/icons/000000/9993-people.png b/core/misc/icons/000000/9993-people.png new file mode 100644 index 0000000..256f9b1 --- /dev/null +++ b/core/misc/icons/000000/9993-people.png @@ -0,0 +1,4 @@ +PNG + + IHDR IDAT8˭m @P $ )s$LB%I@HW +"3P h(<{0IENDB` \ No newline at end of file diff --git a/core/misc/icons/787878/9964-file.png b/core/misc/icons/787878/9964-file.png new file mode 100644 index 0000000..3046063 --- /dev/null +++ b/core/misc/icons/787878/9964-file.png @@ -0,0 +1,3 @@ +PNG + + IHDR `IDAT8c`%0h*W@@ ʁm ii ` qh aC ؀ c '@ar ć m`è#@,!!0IKpIENDB` \ No newline at end of file diff --git a/core/misc/icons/787878/9968-push-left.png b/core/misc/icons/787878/9968-push-left.png new file mode 100644 index 0000000..013f1e0 --- /dev/null +++ b/core/misc/icons/787878/9968-push-left.png @@ -0,0 +1,4 @@ +PNG + + IHDR nIDAT8c` 'PHx6(o +5=A_c at@h 5X 5( T5ƂHM6 D%~vèr;lb(WIENDB` \ No newline at end of file diff --git a/core/misc/icons/787878/9970-push-right.png b/core/misc/icons/787878/9970-push-right.png new file mode 100644 index 0000000..a29c525 --- /dev/null +++ b/core/misc/icons/787878/9970-push-right.png @@ -0,0 +1,3 @@ +PNG + + IHDR nIDAT8c`"`0L_1@X DX$ DāJ0CitWRj`^.J #74܄0x@9emIENDB` \ No newline at end of file diff --git a/core/misc/icons/787878/9971-push-up.png b/core/misc/icons/787878/9971-push-up.png new file mode 100644 index 0000000..47cb30b --- /dev/null +++ b/core/misc/icons/787878/9971-push-up.png @@ -0,0 +1,3 @@ +PNG + + IHDR dIDAT8c`@L  (0a02aj 42CqF #P@Ar x$R0j I@ E t?S2oIENDB` \ No newline at end of file diff --git a/core/misc/icons/787878/9972-questionmark-disc.png b/core/misc/icons/787878/9972-questionmark-disc.png new file mode 100644 index 0000000..01a8bc2 --- /dev/null +++ b/core/misc/icons/787878/9972-questionmark-disc.png @@ -0,0 +1,3 @@ +PNG + + IHDR IDAT8˽a 'aI9ALJcII:Biݎi޾mBUP:]5,]քbY+UUyu#`Q>0Iک@>z$P#eāy&MB^:+X#їǧ]Ѓ66k'qp"Q\H"~YߞG==R0IENDB` \ No newline at end of file diff --git a/core/misc/icons/787878/9974-barchart.png b/core/misc/icons/787878/9974-barchart.png new file mode 100644 index 0000000..61fd818 --- /dev/null +++ b/core/misc/icons/787878/9974-barchart.png @@ -0,0 +1,3 @@ +PNG + + IHDR QIDAT8c`***?@.al G)5]T0H(V@5p3hr @v0($~K0IENDB` \ No newline at end of file diff --git a/core/misc/icons/787878/9975-wrench.png b/core/misc/icons/787878/9975-wrench.png new file mode 100644 index 0000000..625f006 --- /dev/null +++ b/core/misc/icons/787878/9975-wrench.png @@ -0,0 +1,3 @@ +PNG + + IHDR IDAT8c`@@C} N` 0@3b5+O@3d1N oa(4B @ aDflH0?QGPlhG瀄 (60:PD OI~JLPC }UIENDB` \ No newline at end of file diff --git a/core/misc/icons/787878/9976-puzzlepiece.png b/core/misc/icons/787878/9976-puzzlepiece.png new file mode 100644 index 0000000..53a6954 --- /dev/null +++ b/core/misc/icons/787878/9976-puzzlepiece.png @@ -0,0 +1,4 @@ +PNG + + IHDR IDAT8ՔA EGB% *a% wJJ@^8:4ҟ ǐH!a# p *0/ Cf5Xzi`a`_3@V3;w%ƥ8= ՚b/T Q +`kOŶb˯*9tlxUTkh0 IENDB` \ No newline at end of file diff --git a/core/misc/icons/787878/9977-paintbrush.png b/core/misc/icons/787878/9977-paintbrush.png new file mode 100644 index 0000000..73db135 --- /dev/null +++ b/core/misc/icons/787878/9977-paintbrush.png @@ -0,0 +1,4 @@ +PNG + + IHDR IDAT8˭A EJ@BXP H@tCBIQvw`Xau Vh?;$_xV٥ gePgKb>'o3N- +41q|@]>"vtAw\4IENDB` \ No newline at end of file diff --git a/core/misc/icons/787878/9978-orgchart.png b/core/misc/icons/787878/9978-orgchart.png new file mode 100644 index 0000000..69a8bcf --- /dev/null +++ b/core/misc/icons/787878/9978-orgchart.png @@ -0,0 +1,3 @@ +PNG + + IHDR IDAT8c`7(P@a@ 'Pb`SJ HU\GP9` \Ca@KAz \Oa0H65adc=1l!2Ȑ&lz0Y^10zBGOlU/4QF?6 %*mSų0IENDB` \ No newline at end of file diff --git a/core/misc/icons/787878/9992-pencil.png b/core/misc/icons/787878/9992-pencil.png new file mode 100644 index 0000000..307f9cd --- /dev/null +++ b/core/misc/icons/787878/9992-pencil.png @@ -0,0 +1,3 @@ +PNG + + IHDR wIDAT8c`," )2Y0 jrB^O700f|J C7Ԁp5 ?jQ9<ÈM"$19.;  JQjhA](M&IENDB` \ No newline at end of file diff --git a/core/misc/icons/787878/9993-people.png b/core/misc/icons/787878/9993-people.png new file mode 100644 index 0000000..c1e5c13 --- /dev/null +++ b/core/misc/icons/787878/9993-people.png @@ -0,0 +1,4 @@ +PNG + + IHDR IDAT8˭A 0 a$  H$ ? Jxq^hXG۵]W`H9"wł% yKc`L'@sj?2VJvuٗl=r +^K]EhlPԘQJM7qeOxX,cw`kvA[lM:V >ONj IENDB` \ No newline at end of file diff --git a/core/misc/icons/bebebe/9968-push-left.png b/core/misc/icons/bebebe/9968-push-left.png new file mode 100644 index 0000000..39610b4 --- /dev/null +++ b/core/misc/icons/bebebe/9968-push-left.png @@ -0,0 +1,3 @@ +PNG + + IHDR nIDAT8c``߾} H8G@yPP@a   D3 /&h @ah@aDOX 4@jI *񓘰4/c?DJIENDB` \ No newline at end of file diff --git a/core/misc/icons/bebebe/9970-push-right.png b/core/misc/icons/bebebe/9970-push-right.png new file mode 100644 index 0000000..098b9ae --- /dev/null +++ b/core/misc/icons/bebebe/9970-push-right.png @@ -0,0 +1,3 @@ +PNG + + IHDR nIDAT8c``߾} @0p?a5  j z"P8 e PJ @MRrTga&@.IENDB` \ No newline at end of file diff --git a/core/misc/icons/bebebe/9971-push-up.png b/core/misc/icons/bebebe/9971-push-up.png new file mode 100644 index 0000000..a8043b5 --- /dev/null +++ b/core/misc/icons/bebebe/9971-push-up.png @@ -0,0 +1,3 @@ +PNG + + IHDR eIDAT8c`}d `HX@ /S˰Oa0 %`B X zK زc?%QI2j(2NkոqIENDB` \ No newline at end of file diff --git a/core/misc/icons/bebebe/9972-questionmark-disc.png b/core/misc/icons/bebebe/9972-questionmark-disc.png new file mode 100644 index 0000000..5829e47 --- /dev/null +++ b/core/misc/icons/bebebe/9972-questionmark-disc.png @@ -0,0 +1,3 @@ +PNG + + IHDR IDAT8˽a 'aIT9 H@B%ܱ$i)F4om{}TNWͯvzm򸙮pքjY+UUY: fʋ "T9j'րWR6:L`$cxld%in4` i`7 f\ܢ(@T2h,o*2)2IENDB` \ No newline at end of file diff --git a/core/misc/icons/bebebe/9992-pencil.png b/core/misc/icons/bebebe/9992-pencil.png new file mode 100644 index 0000000..679e0b1 --- /dev/null +++ b/core/misc/icons/bebebe/9992-pencil.png @@ -0,0 +1,4 @@ +PNG + + IHDR xIDAT8c`,`߾} @ e(~O@ +HQf(Pzr96CSb0 iQÈFl! Ɨqy,'Y5PPC`WIENDB` \ No newline at end of file diff --git a/core/misc/icons/bebebe/9994-person.png b/core/misc/icons/bebebe/9994-person.png new file mode 100644 index 0000000..4302bbb --- /dev/null +++ b/core/misc/icons/bebebe/9994-person.png @@ -0,0 +1,3 @@ +PNG + + IHDR IDAT8c`ۗ? $q 1 H10]ҽ=$ z*aIg?@nnf{rk/àtjE~" FcI|2 B T lJ8K{͸x'IENDB` \ No newline at end of file diff --git a/core/misc/icons/bebebe/9995-star-empty.png b/core/misc/icons/bebebe/9995-star-empty.png new file mode 100644 index 0000000..e20262a --- /dev/null +++ b/core/misc/icons/bebebe/9995-star-empty.png @@ -0,0 +1,4 @@ +PNG + + IHDR IDAT8˵]0 + H@* JW J^L9:LM6bLyz8/"O&!0=!܄)۷doh`pW*7o9GEO m泷ڳo~-A@暓kBLs +cw}&ѩoSleD͓ I-v˗+ gM̮ڄYUE?{jy^:>iIENDB` \ No newline at end of file diff --git a/core/misc/icons/bebebe/9996-star.png b/core/misc/icons/bebebe/9996-star.png new file mode 100644 index 0000000..da87269 --- /dev/null +++ b/core/misc/icons/bebebe/9996-star.png @@ -0,0 +1,3 @@ +PNG + + IHDR IDAT8c` 'XR4$Cq5 k,2 9@ ޏb<,q XG#_X{IRreA T @R.U\OvQ}(Hd7tMPqǛ \C k~V. ͝IENDB` \ No newline at end of file diff --git a/core/misc/icons/bebebe/9998-hamburger.png b/core/misc/icons/bebebe/9998-hamburger.png new file mode 100644 index 0000000..06927cc --- /dev/null +++ b/core/misc/icons/bebebe/9998-hamburger.png @@ -0,0 +1,3 @@ +PNG + + IHDR GIDAT8cطoy O%|1M T # TC#ټA*M + ^AIENDB` \ No newline at end of file diff --git a/core/misc/icons/bebebe/9999-house.png b/core/misc/icons/bebebe/9999-house.png new file mode 100644 index 0000000..f47bba3 --- /dev/null +++ b/core/misc/icons/bebebe/9999-house.png @@ -0,0 +1,4 @@ +PNG + + IHDR zIDAT8c` ۷o>bJ԰PLhQf(3aJaJa %0RhT2 n( zف +a 8χ5t?XeQk`H 6@RcCM?͎1hJYIENDB` \ No newline at end of file diff --git a/core/misc/icons/ffffff/9972-questionmark-disc.png b/core/misc/icons/ffffff/9972-questionmark-disc.png new file mode 100644 index 0000000..c1727d1 --- /dev/null +++ b/core/misc/icons/ffffff/9972-questionmark-disc.png @@ -0,0 +1,6 @@ +PNG + + IHDR IDAT8˽} 'aI9)8P H@8GZZr/yڭ8Zn|IZ3SUm~UZle,@DOPy1JxO:!94| +ڕ +L VL\9~ +qVCp Wh Pbdk܀V`U2ʾ~`? } ز҈IENDB` \ No newline at end of file diff --git a/core/misc/icons/ffffff/9992-pencil.png b/core/misc/icons/ffffff/9992-pencil.png new file mode 100644 index 0000000..4d7d3b6 --- /dev/null +++ b/core/misc/icons/ffffff/9992-pencil.png @@ -0,0 +1,5 @@ +PNG + + IHDR yIDAT8A @Q"D0 +lb#|/ ?`un$ ´ P`PKkY߬JvEL#1`ZG 6ĖT$eDV +N =D + diff --git a/core/misc/icons/ffffff/9998-hamburger.png b/core/misc/icons/ffffff/9998-hamburger.png new file mode 100644 index 0000000..817b7fb --- /dev/null +++ b/core/misc/icons/ffffff/9998-hamburger.png @@ -0,0 +1,3 @@ +PNG + + IHDR EIDAT8cS~ O%0@@%04{*d;P +t8Z| LeBEXIENDB` \ No newline at end of file diff --git a/core/misc/icons/ffffff/9999-house.png b/core/misc/icons/ffffff/9999-house.png new file mode 100644 index 0000000..2cfa77b --- /dev/null +++ b/core/misc/icons/ffffff/9999-house.png @@ -0,0 +1,3 @@ +PNG + + IHDR yIDAT8c` >bJ0P4(3aJ0 %0 %0ivC)4 P*7B@0t@CX[,2Iè50$ 1V߷/6IENDB` \ No newline at end of file diff --git a/core/modules/contextual/contextual.module b/core/modules/contextual/contextual.module index e81c18f..41e9da8 100644 --- a/core/modules/contextual/contextual.module +++ b/core/modules/contextual/contextual.module @@ -33,7 +33,7 @@ function contextual_toolbar() { '#tag' => 'button', '#value' => t('Edit'), '#attributes' => array( - 'class' => array('toolbar-icon', 'toolbar-icon-edit', 'toolbar-contrast'), + 'class' => array('toolbar-icon', 'toolbar-icon-edit',), 'role' => 'button', 'aria-pressed' => 'false', ), diff --git a/core/modules/contextual/css/contextual.icons.css b/core/modules/contextual/css/contextual.icons.css index fa622c0..d0cbd1e 100644 --- a/core/modules/contextual/css/contextual.icons.css +++ b/core/modules/contextual/css/contextual.icons.css @@ -4,19 +4,19 @@ */ /* Tab icon. */ -.toolbar-icon-edit.toolbar-contrast:before { +.toolbar-bar .toolbar-icon-edit:before { background-image: url("../../../misc/icons/bebebe/9992-pencil.svg"); } -.no-svg .toolbar-icon-edit:before { - background-image: url("../../../misc/edit.png"); +.no-svg .toolbar-bar .toolbar-icon-edit:before { + background-image: url("../../../misc/icons/bebebe/9992-pencil.png"); } -.toolbar-icon-edit.toolbar-contrast:active:before, -.toolbar-icon-edit.toolbar-contrast.active:before { +.toolbar-bar .toolbar-icon-edit:active:before, +.toolbar-bar .toolbar-icon-edit.active:before { background-image: url("../../../misc/icons/ffffff/9992-pencil.svg"); } -.no-svg .toolbar-icon-edit:active:before, -.no-svg .toolbar-icon-edit.active:before { - background-image: url("../../../misc/edit-active.png"); +.no-svg .toolbar-bar .toolbar-icon-edit:active:before, +.no-svg .toolbar-bar .toolbar-icon-edit.active:before { + background-image: url("../../../misc/icons/ffffff/9992-pencil.png"); } /** @@ -35,5 +35,5 @@ } .no-svg .contextual .trigger { - background-image: url("../../../misc/edit.png"); + background-image: url("../../../misc/icons/787878/9992-pencil.png"); } diff --git a/core/modules/shortcut/css/shortcut.icons.css b/core/modules/shortcut/css/shortcut.icons.css index b623997..4cb21df 100644 --- a/core/modules/shortcut/css/shortcut.icons.css +++ b/core/modules/shortcut/css/shortcut.icons.css @@ -6,19 +6,19 @@ /** * Toolbar. */ -.toolbar-icon-shortcut.toolbar-contrast:before { +.toolbar-bar .toolbar-icon-shortcut:before { background-image: url("../../../misc/icons/bebebe/9995-star-empty.svg"); } -.no-svg .toolbar-icon-shortcut:before { - background-image: url("../images/shortcut.png"); +.no-svg .toolbar-bar .toolbar-icon-shortcut:before { + background-image: url("../../../misc/icons/bebebe/9995-star-empty.png"); } -.toolbar-icon-shortcut.toolbar-contrast:active:before, -.toolbar-icon-shortcut.toolbar-contrast.active:before { +.toolbar-bar .toolbar-icon-shortcut:active:before, +.toolbar-bar .toolbar-icon-shortcut.active:before { background-image: url("../../../misc/icons/ffffff/9995-star-empty.svg"); } -.no-svg .toolbar-icon-shortcut:active:before, -.no-svg .toolbar-icon-shortcut.active:before { - background-image: url("../images/shortcut-active.png"); +.no-svg .toolbar-bar .toolbar-icon-shortcut:active:before, +.no-svg .toolbar-bar .toolbar-icon-shortcut.active:before { + background-image: url("../../../misc/icons/ffffff/9995-star-empty.png"); } /** @@ -32,6 +32,9 @@ text-indent: 12px; width: 12px; } +.no-svg .add-or-remove-shortcuts .icon { + background: transparent url("../images/shortcut-add.png") no-repeat; +} [dir="rtl"] .add-or-remove-shortcuts .icon { margin-left: 0; margin-right: 8px; diff --git a/core/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module index 27c2a2c..513fb5d 100644 --- a/core/modules/shortcut/shortcut.module +++ b/core/modules/shortcut/shortcut.module @@ -492,9 +492,10 @@ function shortcut_preprocess_page(&$variables) { if (theme_get_setting('shortcut_module_link')) { $variables['title_suffix']['add_or_remove_shortcut'] = array( '#attached' => array( - 'css' => array( - drupal_get_path('module', 'shortcut') . '/css/shortcut.module.css', - drupal_get_path('module', 'shortcut') . '/css/shortcut.theme.css', + 'library' => array( + array('shortcut', 'drupal.shortcut.module'), + array('shortcut', 'drupal.shortcut.theme'), + array('shortcut', 'drupal.shortcut.icons'), ), ), '#prefix' => '
', @@ -535,7 +536,7 @@ function shortcut_toolbar() { '#options' => array( 'attributes' => array( 'title' => t('Shortcuts'), - 'class' => array('toolbar-icon', 'toolbar-icon-shortcut', 'toolbar-contrast'), + 'class' => array('toolbar-icon', 'toolbar-icon-shortcut',), ), ), ), @@ -573,7 +574,13 @@ function shortcut_library_info() { array('system', 'drupal'), ), ); - + $libraries['drupal.shortcut.module'] = array( + 'title' => 'Shortcut module styling', + 'version' => VERSION, + 'css' => array( + $path . '/css/shortcut.module.css' => array(), + ), + ); $libraries['drupal.shortcut.theme'] = array( 'title' => 'Shortcut theme styling', 'version' => VERSION, @@ -581,7 +588,6 @@ function shortcut_library_info() { $path . '/css/shortcut.theme.css' => array(), ), ); - $libraries['drupal.shortcut.icons'] = array( 'title' => 'Shortcut icon styling', 'version' => VERSION, diff --git a/core/modules/toolbar/css/toolbar.icons.css b/core/modules/toolbar/css/toolbar.icons.css index c990b10..876eba8 100644 --- a/core/modules/toolbar/css/toolbar.icons.css +++ b/core/modules/toolbar/css/toolbar.icons.css @@ -63,33 +63,47 @@ /** * Top level icons */ -.toolbar-icon-home.toolbar-contrast:before { +.toolbar-bar .toolbar-icon-home:before { background-image: url("../../../misc/icons/bebebe/9999-house.svg"); } -.no-svg .toolbar-icon-home:before { - background-image: url("../images/icon-home.png"); +.no-svg .toolbar-bar .toolbar-icon-home:before { + background-image: url("../../../misc/icons/bebebe/9999-house.png"); } -.toolbar-icon-home.toolbar-contrast:active:before, -.toolbar-icon-home.toolbar-contrast.active:before { +.toolbar-bar .toolbar-icon-home:active:before, +.toolbar-bar .toolbar-icon-home.active:before { background-image: url("../../../misc/icons/ffffff/9999-house.svg"); } -.no-svg .toolbar-icon-home:active:before, -.no-svg .toolbar-icon-home.active:before { - background-image: url("../images/icon-home-active.png"); +.no-svg .toolbar-bar .toolbar-icon-home:active:before, +.no-svg .toolbar-bar .toolbar-icon-home.active:before { + background-image: url("../../../misc/icons/ffffff/9999-house.png"); } -.toolbar-icon-menu.toolbar-contrast:before { +.toolbar-bar .toolbar-icon-menu:before { background-image: url("../../../misc/icons/bebebe/9998-hamburger.svg"); } -.no-svg .toolbar-icon-menu:before { - background-image: url("../images/icon-menu.png"); +.no-svg .toolbar-bar .toolbar-icon-menu:before { + background-image: url("../../../misc/icons/bebebe/9998-hamburger.png"); } -.toolbar-icon-menu.toolbar-contrast:active:before, -.toolbar-icon-menu.toolbar-contrast.active:before { +.toolbar-bar .toolbar-icon-menu:active:before, +.toolbar-bar .toolbar-icon-menu.active:before { background-image: url("../../../misc/icons/ffffff/9998-hamburger.svg"); } -.no-svg .toolbar-icon-menu:active:before, -.no-svg .toolbar-icon-menu.active:before { - background-image: url("../images/icon-menu-active.png"); +.no-svg .toolbar-bar .toolbar-icon-menu:active:before, +.no-svg .toolbar-bar .toolbar-icon-menu.active:before { + background-image: url("../../../misc/icons/ffffff/9998-hamburger.png"); +} +.toolbar-bar .toolbar-icon-help:before { + background-image: url("../../../misc/icons/bebebe/9972-questionmark-disc.svg"); +} +.no-svg .toolbar-bar .toolbar-icon-help:before { + background-image: url("../../../misc/icons/bebebe/9972-questionmark-disc.png"); +} +.toolbar-bar .toolbar-icon-help:active:before, +.toolbar-bar .toolbar-icon-help.active:before { + background-image: url("../../../misc/icons/ffffff/9972-questionmark-disc.svg"); +} +.no-svg .toolbar-bar .toolbar-icon-help:active:before, +.no-svg .toolbar-bar .toolbar-icon-help.active:before { + background-image: url("../../../misc/icons/ffffff/9972-questionmark-disc.png"); } /** @@ -99,7 +113,7 @@ background-image: url("../../../misc/icons/787878/9964-file.svg"); } .no-svg .toolbar-icon-content:before { - background-image: url("../images/icon-content.png"); + background-image: url("../../../misc/icons/787878/9964-file.png"); } .toolbar-icon-content:active:before, .toolbar-icon-content.active:before { @@ -107,13 +121,13 @@ } .no-svg .toolbar-icon-content:active:before, .no-svg .toolbar-icon-content.active:before { - background-image: url("../images/icon-content-active.png"); + background-image: url("../../../misc/icons/000000/9964-file.png"); } .toolbar-icon-structure:before { background-image: url("../../../misc/icons/787878/9978-orgchart.svg"); } .no-svg .toolbar-icon-structure:before { - background-image: url("../images/icon-structure.png"); + background-image: url("../../../misc/icons/787878/9978-orgchart.png"); } .toolbar-icon-structure:active:before, .toolbar-icon-structure.active:before { @@ -121,13 +135,13 @@ } .no-svg .toolbar-icon-structure:active:before, .no-svg .toolbar-icon-structure.active:before { - background-image: url("../images/icon-structure-active.png"); + background-image: url("../../../misc/icons/000000/9978-orgchart.png"); } .toolbar-icon-appearance:before { background-image: url("../../../misc/icons/787878/9977-paintbrush.svg"); } .no-svg .toolbar-icon-appearance:before { - background-image: url("../images/icon-appearance.png"); + background-image: url("../../../misc/icons/787878/9977-paintbrush.png"); } .toolbar-icon-appearance:active:before, .toolbar-icon-appearance.active:before { @@ -135,13 +149,13 @@ } .no-svg .toolbar-icon-appearance:active:before, .no-svg .toolbar-icon-appearance.active:before { - background-image: url("../images/icon-appearance-active.png"); + background-image: url("../../../misc/icons/000000/9977-paintbrush.png"); } .toolbar-icon-people:before { background-image: url("../../../misc/icons/787878/9993-people.svg"); } .no-svg .toolbar-icon-people:before { - background-image: url("../images/icon-people.png"); + background-image: url("../../../misc/icons/787878/9993-people.png"); } .toolbar-icon-people:active:before, .toolbar-icon-people.active:before { @@ -149,13 +163,13 @@ } .no-svg .toolbar-icon-people:active:before, .no-svg .toolbar-icon-people.active:before { - background-image: url("../images/icon-people-active.png"); + background-image: url("../../../misc/icons/000000/9993-people.png"); } .toolbar-icon-extend:before { background-image: url("../../../misc/icons/787878/9976-puzzlepiece.svg"); } .no-svg .toolbar-icon-extend:before { - background-image: url("../images/icon-extend.png"); + background-image: url("../../../misc/icons/787878/9976-puzzlepiece.png"); } .toolbar-icon-extend:active:before, .toolbar-icon-extend.active:before { @@ -163,13 +177,13 @@ } .no-svg .toolbar-icon-extend:active:before, .no-svg .toolbar-icon-extend.active:before { - background-image: url("../images/icon-extend-active.png"); + background-image: url("../../../misc/icons/000000/9976-puzzlepiece.png"); } .toolbar-icon-configuration:before { background-image: url("../../../misc/icons/787878/9975-wrench.svg"); } .no-svg .toolbar-icon-configuration:before { - background-image: url("../images/icon-configuration.png"); + background-image: url("../../../misc/icons/787878/9975-wrench.png"); } .toolbar-icon-configuration:active:before, .toolbar-icon-configuration.active:before { @@ -177,13 +191,13 @@ } .no-svg .toolbar-icon-configuration:active:before, .no-svg .toolbar-icon-configuration.active:before { - background-image: url("../images/icon-configuration-active.png"); + background-image: url("../../../misc/icons/000000/9975-wrench.png"); } .toolbar-icon-reports:before { background-image: url("../../../misc/icons/787878/9974-barchart.svg"); } .no-svg .toolbar-icon-reports:before { - background-image: url("../images/icon-reports.png"); + background-image: url("../../../misc/icons/787878/9974-barchart.png"); } .toolbar-icon-reports:active:before, .toolbar-icon-reports.active:before { @@ -191,28 +205,21 @@ } .no-svg .toolbar-icon-reports:active:before, .no-svg .toolbar-icon-reports.active:before { - background-image: url("../images/icon-reports-active.png"); + background-image: url("../../../misc/icons/000000/9974-barchart.png"); } .toolbar-icon-help:before { background-image: url("../../../misc/icons/787878/9972-questionmark-disc.svg"); } -.toolbar-icon-help.toolbar-contrast:before { - background-image: url("../../../misc/icons/bebebe/9972-questionmark-disc.svg"); -} .no-svg .toolbar-icon-help:before { - background-image: url("../images/icon-help.png"); + background-image: url("../../../misc/icons/787878/9972-questionmark-disc.png"); } .toolbar-icon-help:active:before, .toolbar-icon-help.active:before { background-image: url("../../../misc/icons/000000/9972-questionmark-disc.svg"); } -.toolbar-icon-help.toolbar-contrast:active:before, -.toolbar-icon-help.toolbar-contrast.active:before { - background-image: url("../../../misc/icons/ffffff/9972-questionmark-disc.svg"); -} .no-svg .toolbar-icon-help:active:before, .no-svg .toolbar-icon-help.active:before { - background-image: url("../images/icon-help-active.png"); + background-image: url("../../../misc/icons/000000/9972-questionmark-disc.png"); } @media only screen and (min-width: 16.5em) { @@ -277,7 +284,7 @@ left: 0; /* LTR */ } .no-svg .toolbar .toolbar-icon.toolbar-handle:before { - background-image: url("../images/icon-open.png"); + background-image: url("../../../misc/icons/5181c6/9939-chevron-disc-down.png"); left: 0; /* LTR */ } [dir="rtl"] .toolbar .toolbar-icon.toolbar-handle:before { @@ -292,19 +299,23 @@ background-image: url("../../../misc/icons/787878/9941-chevron-disc-up.svg"); } .no-svg .toolbar .toolbar-icon.toolbar-handle.open:before { - background-image: url("../images/icon-collapse.png"); + background-image: url("../../../misc/icons/787878/9941-chevron-disc-up.png"); } .toolbar .menu .menu .toolbar-icon.toolbar-handle:before { background-image: url("../../../misc/icons/5181c6/9953-twistie-down.svg"); + background-size: 75% 75%; } .no-svg .toolbar .menu .menu .toolbar-icon.toolbar-handle:before { - background-image: url("../images/icon-child-open.png"); + background-image: url("../../../misc/icons/5181c6/9953-twistie-down.png"); + background-size: auto auto; } .toolbar .menu .menu .toolbar-icon.toolbar-handle.open:before { background-image: url("../../../misc/icons/787878/9955-twistie-up.svg"); + background-size: 75% 75%; } .no-svg .toolbar .menu .menu .toolbar-icon.toolbar-handle.open:before { - background-image: url("../images/icon-child-collapse.png"); + background-image: url("../../../misc/icons/787878/9955-twistie-up.png"); + background-size: auto auto; } /** @@ -337,9 +348,11 @@ .toolbar .toolbar-toggle-orientation [value="vertical"]:hover:before { background-image: url("../../../misc/icons/787878/9968-push-left.svg"); /* LTR */ } -.no-svg .toolbar .toolbar-toggle-orientation [value="vertical"]:before, +.no-svg .toolbar .toolbar-toggle-orientation [value="vertical"]:before { + background-image: url("../../../misc/icons/bebebe/9968-push-left.png"); /* LTR */ +} .no-svg .toolbar .toolbar-toggle-orientation [value="vertical"]:hover:before { - background-image: url('../images/icon-toggle-vertical.png'); /* LTR */ + background-image: url("../../../misc/icons/787878/9968-push-left.png"); /* LTR */ } [dir="rtl"] .toolbar .toolbar-toggle-orientation [value="vertical"]:before { background-image: url("../../../misc/icons/bebebe/9970-push-right.svg"); @@ -347,9 +360,11 @@ [dir="rtl"] .toolbar .toolbar-toggle-orientation [value="vertical"]:hover:before { background-image: url("../../../misc/icons/787878/9970-push-right.svg"); } -[dir="rtl"].no-svg .toolbar .toolbar-toggle-orientation [value="vertical"]:before, +[dir="rtl"].no-svg .toolbar .toolbar-toggle-orientation [value="vertical"]:before { + background-image: url("../../../misc/icons/bebebe/9970-push-right.png"); +} [dir="rtl"].no-svg .toolbar .toolbar-toggle-orientation [value="vertical"]:hover:before { - background-image: url('../images/icon-toggle-vertical-rtl.png'); + background-image: url("../../../misc/icons/787878/9970-push-right.png"); } .toolbar .toolbar-toggle-orientation [value="horizontal"]:before { background-image: url("../../../misc/icons/bebebe/9971-push-up.svg"); @@ -357,8 +372,10 @@ .toolbar .toolbar-toggle-orientation [value="horizontal"]:hover:before { background-image: url("../../../misc/icons/787878/9971-push-up.svg"); } -.no-svg .toolbar .toolbar-toggle-orientation [value="horizontal"]:before, +.no-svg .toolbar .toolbar-toggle-orientation [value="horizontal"]:before { + background-image: url("../../../misc/icons/bebebe/9971-push-up.png"); +} .no-svg .toolbar .toolbar-toggle-orientation [value="horizontal"]:hover:before { - background-image: url('../images/icon-toggle-horizontal.png'); + background-image: url("../../../misc/icons/787878/9971-push-up.png"); } 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 2b11761..0000000 --- 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 fd581f6..0000000 --- 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-child-collapse.png b/core/modules/toolbar/images/icon-child-collapse.png deleted file mode 100644 index b7a744f..0000000 --- a/core/modules/toolbar/images/icon-child-collapse.png +++ /dev/null @@ -1,3 +0,0 @@ -PNG - - IHDRVΎWtEXtSoftwareAdobe ImageReadyqe<OIDATxb`#0RP^^.YA @|qH!00F k 1HG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 a5d46b2..0000000 --- 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 24b6982..0000000 --- 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 32081b6..0000000 --- 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 faa13c5..0000000 --- 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 52219ff..0000000 --- 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 0a8fe2e..0000000 --- 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 5d8d501..0000000 --- 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 ab6462e..0000000 --- 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 a02939f..0000000 --- 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 96f4673..0000000 --- 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 49ede88..0000000 --- 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 3ab2375..0000000 --- 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 7a8302f..0000000 --- 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/icon-toggle-horizontal.png b/core/modules/toolbar/images/icon-toggle-horizontal.png deleted file mode 100644 index 759701c..0000000 --- a/core/modules/toolbar/images/icon-toggle-horizontal.png +++ /dev/null @@ -1,3 +0,0 @@ -PNG - - IHDRtEXtSoftwareAdobe ImageReadyqe<cIDATxb,//g 01諍;::HSQQAmG|7o>{,Km@ G ~ڮ^6 (H,}j0p#mVIENDB` \ No newline at end of file diff --git a/core/modules/toolbar/images/icon-toggle-vertical-rtl.png b/core/modules/toolbar/images/icon-toggle-vertical-rtl.png deleted file mode 100644 index 95e3fba..0000000 --- a/core/modules/toolbar/images/icon-toggle-vertical-rtl.png +++ /dev/null @@ -1,3 +0,0 @@ -PNG - - IHDRtEXtSoftwareAdobe ImageReadyqe<hIDATxb,//g qGGAu\&mW^%GŋϞ=K6 X $kxt$,$}}}IjllLm$$A= Zz#`u8: BIENDB` \ No newline at end of file diff --git a/core/modules/toolbar/images/icon-toggle-vertical.png b/core/modules/toolbar/images/icon-toggle-vertical.png deleted file mode 100644 index dd3240e..0000000 --- a/core/modules/toolbar/images/icon-toggle-vertical.png +++ /dev/null @@ -1,3 +0,0 @@ -PNG - - IHDRtEXtSoftwareAdobe ImageReadyqe<kIDATxb,//g ;::ꩨ`b vU={vń 6o|QV^ |-44ؘB4ABrM aLoh0Z}8IENDB` \ No newline at end of file diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module index 4d5183a..f7cbfa7 100644 --- a/core/modules/toolbar/toolbar.module +++ b/core/modules/toolbar/toolbar.module @@ -412,7 +412,7 @@ function toolbar_toolbar() { '#options' => array( 'attributes' => array( 'title' => t('Home page'), - 'class' => array('toolbar-icon', 'toolbar-icon-home' , 'toolbar-contrast'), + 'class' => array('toolbar-icon', 'toolbar-icon-home',), ), ), ), @@ -454,7 +454,7 @@ function toolbar_toolbar() { '#options' => array( 'attributes' => array( 'title' => t('Admin menu'), - 'class' => array('toolbar-icon', 'toolbar-icon-menu', 'toolbar-contrast'), + 'class' => array('toolbar-icon', 'toolbar-icon-menu',), ), ), ), diff --git a/core/modules/tour/tour.module b/core/modules/tour/tour.module index e689094..aeaece9 100644 --- a/core/modules/tour/tour.module +++ b/core/modules/tour/tour.module @@ -84,7 +84,7 @@ function tour_toolbar() { '#tag' => 'button', '#value' => t('Tour'), '#attributes' => array( - 'class' => array('toolbar-icon', 'toolbar-icon-help', 'toolbar-contrast'), + 'class' => array('toolbar-icon', 'toolbar-icon-help',), 'role' => 'button', 'aria-pressed' => 'false', ), diff --git a/core/modules/user/css/user.icons.css b/core/modules/user/css/user.icons.css index d4d133d..154a12d 100644 --- a/core/modules/user/css/user.icons.css +++ b/core/modules/user/css/user.icons.css @@ -6,17 +6,17 @@ /** * Toolbar icon. */ -.toolbar-icon-user.toolbar-contrast:before { +.toolbar-bar .toolbar-icon-user:before { background-image: url("../../../misc/icons/bebebe/9994-person.svg"); } -.no-svg .toolbar-icon-user:before { - background-image: url("../images/icon-user.png"); +.no-svg .toolbar-bar .toolbar-icon-user:before { + background-image: url("../../../misc/icons/bebebe/9994-person.png"); } -.toolbar-icon-user.toolbar-contrast:active:before, -.toolbar-icon-user.toolbar-contrast.active:before { +.toolbar-bar .toolbar-icon-user:active:before, +.toolbar-bar .toolbar-icon-user.active:before { background-image: url("../../../misc/icons/ffffff/9994-person.svg"); } -.no-svg .toolbar-icon-user:active:before, -.no-svg .toolbar-icon-user.active:before { - background-image: url("../images/icon-user-active.svg"); +.no-svg .toolbar-bar .toolbar-icon-user:active:before, +.no-svg .toolbar-bar .toolbar-icon-user.active:before { + background-image: url("../../../misc/icons/ffffff/9994-person.png"); } diff --git a/core/modules/user/user.module b/core/modules/user/user.module index 63827ba..deee593 100644 --- a/core/modules/user/user.module +++ b/core/modules/user/user.module @@ -2087,7 +2087,7 @@ function user_toolbar() { '#options' => array( 'attributes' => array( 'title' => t('My account'), - 'class' => array('toolbar-icon', 'toolbar-icon-user', 'toolbar-contrast'), + 'class' => array('toolbar-icon', 'toolbar-icon-user',), ), ), ),