diff --git a/core/misc/icons/000000/9964-file.svg b/core/misc/icons/000000/9964-file.svg new file mode 100644 index 0000000..21e8f70 --- /dev/null +++ b/core/misc/icons/000000/9964-file.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/000000/9972-questionmark-disc.svg b/core/misc/icons/000000/9972-questionmark-disc.svg new file mode 100644 index 0000000..e65b2c4 --- /dev/null +++ b/core/misc/icons/000000/9972-questionmark-disc.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/000000/9974-barchart.svg b/core/misc/icons/000000/9974-barchart.svg new file mode 100644 index 0000000..5b6e4cf --- /dev/null +++ b/core/misc/icons/000000/9974-barchart.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/000000/9975-wrench.svg b/core/misc/icons/000000/9975-wrench.svg new file mode 100644 index 0000000..373134a --- /dev/null +++ b/core/misc/icons/000000/9975-wrench.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/000000/9976-puzzlepiece.svg b/core/misc/icons/000000/9976-puzzlepiece.svg new file mode 100644 index 0000000..04cf075 --- /dev/null +++ b/core/misc/icons/000000/9976-puzzlepiece.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/000000/9977-paintbrush.svg b/core/misc/icons/000000/9977-paintbrush.svg new file mode 100644 index 0000000..947436d --- /dev/null +++ b/core/misc/icons/000000/9977-paintbrush.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/000000/9978-orgchart.svg b/core/misc/icons/000000/9978-orgchart.svg new file mode 100644 index 0000000..7010a98 --- /dev/null +++ b/core/misc/icons/000000/9978-orgchart.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/000000/9993-people.svg b/core/misc/icons/000000/9993-people.svg new file mode 100644 index 0000000..c63938c --- /dev/null +++ b/core/misc/icons/000000/9993-people.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/5181c6/9939-chevron-disc-down.svg b/core/misc/icons/5181c6/9939-chevron-disc-down.svg new file mode 100644 index 0000000..6707c30 --- /dev/null +++ b/core/misc/icons/5181c6/9939-chevron-disc-down.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/5181c6/9941-chevron-disc-up.svg b/core/misc/icons/5181c6/9941-chevron-disc-up.svg new file mode 100644 index 0000000..d94365f --- /dev/null +++ b/core/misc/icons/5181c6/9941-chevron-disc-up.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/5181c6/9953-twistie-down.svg b/core/misc/icons/5181c6/9953-twistie-down.svg new file mode 100644 index 0000000..7d04606 --- /dev/null +++ b/core/misc/icons/5181c6/9953-twistie-down.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/5181c6/9955-twistie-up.svg b/core/misc/icons/5181c6/9955-twistie-up.svg new file mode 100644 index 0000000..f25f889 --- /dev/null +++ b/core/misc/icons/5181c6/9955-twistie-up.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/787878/9939-chevron-disc-down.svg b/core/misc/icons/787878/9939-chevron-disc-down.svg new file mode 100644 index 0000000..b308150 --- /dev/null +++ b/core/misc/icons/787878/9939-chevron-disc-down.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/787878/9941-chevron-disc-up.svg b/core/misc/icons/787878/9941-chevron-disc-up.svg new file mode 100644 index 0000000..13d86d9 --- /dev/null +++ b/core/misc/icons/787878/9941-chevron-disc-up.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/787878/9953-twistie-down.svg b/core/misc/icons/787878/9953-twistie-down.svg new file mode 100644 index 0000000..b3692bd --- /dev/null +++ b/core/misc/icons/787878/9953-twistie-down.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/787878/9955-twistie-up.svg b/core/misc/icons/787878/9955-twistie-up.svg new file mode 100644 index 0000000..1fc34ce --- /dev/null +++ b/core/misc/icons/787878/9955-twistie-up.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/787878/9964-file.svg b/core/misc/icons/787878/9964-file.svg new file mode 100644 index 0000000..affde4c --- /dev/null +++ b/core/misc/icons/787878/9964-file.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/787878/9968-push-left.svg b/core/misc/icons/787878/9968-push-left.svg new file mode 100644 index 0000000..dc053ba --- /dev/null +++ b/core/misc/icons/787878/9968-push-left.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/787878/9970-push-right.svg b/core/misc/icons/787878/9970-push-right.svg new file mode 100644 index 0000000..f42f129 --- /dev/null +++ b/core/misc/icons/787878/9970-push-right.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/787878/9971-push-up.svg b/core/misc/icons/787878/9971-push-up.svg new file mode 100644 index 0000000..f929284 --- /dev/null +++ b/core/misc/icons/787878/9971-push-up.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/787878/9972-questionmark-disc.svg b/core/misc/icons/787878/9972-questionmark-disc.svg new file mode 100644 index 0000000..2886d64 --- /dev/null +++ b/core/misc/icons/787878/9972-questionmark-disc.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/787878/9974-barchart.svg b/core/misc/icons/787878/9974-barchart.svg new file mode 100644 index 0000000..1929619 --- /dev/null +++ b/core/misc/icons/787878/9974-barchart.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/787878/9975-wrench.svg b/core/misc/icons/787878/9975-wrench.svg new file mode 100644 index 0000000..0f38bdf --- /dev/null +++ b/core/misc/icons/787878/9975-wrench.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/787878/9976-puzzlepiece.svg b/core/misc/icons/787878/9976-puzzlepiece.svg new file mode 100644 index 0000000..c18c813 --- /dev/null +++ b/core/misc/icons/787878/9976-puzzlepiece.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/787878/9977-paintbrush.svg b/core/misc/icons/787878/9977-paintbrush.svg new file mode 100644 index 0000000..fdbd296 --- /dev/null +++ b/core/misc/icons/787878/9977-paintbrush.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/787878/9978-orgchart.svg b/core/misc/icons/787878/9978-orgchart.svg new file mode 100644 index 0000000..8488894 --- /dev/null +++ b/core/misc/icons/787878/9978-orgchart.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/787878/9992-pencil.svg b/core/misc/icons/787878/9992-pencil.svg new file mode 100644 index 0000000..229e480 --- /dev/null +++ b/core/misc/icons/787878/9992-pencil.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/787878/9993-people.svg b/core/misc/icons/787878/9993-people.svg new file mode 100644 index 0000000..9b9c664 --- /dev/null +++ b/core/misc/icons/787878/9993-people.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/bebebe/9972-questionmark-disc.svg b/core/misc/icons/bebebe/9972-questionmark-disc.svg new file mode 100644 index 0000000..1363940 --- /dev/null +++ b/core/misc/icons/bebebe/9972-questionmark-disc.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/bebebe/9992-pencil.svg b/core/misc/icons/bebebe/9992-pencil.svg new file mode 100644 index 0000000..cdfe4c2 --- /dev/null +++ b/core/misc/icons/bebebe/9992-pencil.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/bebebe/9994-person.svg b/core/misc/icons/bebebe/9994-person.svg new file mode 100644 index 0000000..f44e1fd --- /dev/null +++ b/core/misc/icons/bebebe/9994-person.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/bebebe/9995-star-empty.svg b/core/misc/icons/bebebe/9995-star-empty.svg new file mode 100644 index 0000000..8d95a01 --- /dev/null +++ b/core/misc/icons/bebebe/9995-star-empty.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/bebebe/9996-star.svg b/core/misc/icons/bebebe/9996-star.svg new file mode 100644 index 0000000..66d3313 --- /dev/null +++ b/core/misc/icons/bebebe/9996-star.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/bebebe/9998-hamburger.svg b/core/misc/icons/bebebe/9998-hamburger.svg new file mode 100644 index 0000000..7d984d2 --- /dev/null +++ b/core/misc/icons/bebebe/9998-hamburger.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/bebebe/9999-house.svg b/core/misc/icons/bebebe/9999-house.svg new file mode 100644 index 0000000..c4a8834 --- /dev/null +++ b/core/misc/icons/bebebe/9999-house.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/ffffff/9972-questionmark-disc.svg b/core/misc/icons/ffffff/9972-questionmark-disc.svg new file mode 100644 index 0000000..973af49 --- /dev/null +++ b/core/misc/icons/ffffff/9972-questionmark-disc.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/ffffff/9992-pencil.svg b/core/misc/icons/ffffff/9992-pencil.svg new file mode 100644 index 0000000..229e480 --- /dev/null +++ b/core/misc/icons/ffffff/9992-pencil.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/ffffff/9994-person.svg b/core/misc/icons/ffffff/9994-person.svg new file mode 100644 index 0000000..1cb3548 --- /dev/null +++ b/core/misc/icons/ffffff/9994-person.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/ffffff/9995-star-empty.svg b/core/misc/icons/ffffff/9995-star-empty.svg new file mode 100644 index 0000000..28e6d36 --- /dev/null +++ b/core/misc/icons/ffffff/9995-star-empty.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/ffffff/9996-star.svg b/core/misc/icons/ffffff/9996-star.svg new file mode 100644 index 0000000..66d3313 --- /dev/null +++ b/core/misc/icons/ffffff/9996-star.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/ffffff/9998-hamburger.svg b/core/misc/icons/ffffff/9998-hamburger.svg new file mode 100644 index 0000000..708b09b --- /dev/null +++ b/core/misc/icons/ffffff/9998-hamburger.svg @@ -0,0 +1 @@ + diff --git a/core/misc/icons/ffffff/9999-house.svg b/core/misc/icons/ffffff/9999-house.svg new file mode 100644 index 0000000..a55603f --- /dev/null +++ b/core/misc/icons/ffffff/9999-house.svg @@ -0,0 +1 @@ + diff --git a/core/modules/contextual/contextual.module b/core/modules/contextual/contextual.module index 10d57b1..e81c18f 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'), + 'class' => array('toolbar-icon', 'toolbar-icon-edit', 'toolbar-contrast'), 'role' => 'button', 'aria-pressed' => 'false', ), @@ -115,6 +115,7 @@ function contextual_library_info() { 'css' => array( $path . '/css/contextual.module.css' => array(), $path . '/css/contextual.theme.css' => array(), + $path . '/css/contextual.icons.css' => array(), ), 'dependencies' => array( array('system', 'jquery'), diff --git a/core/modules/contextual/css/contextual.icons.css b/core/modules/contextual/css/contextual.icons.css new file mode 100644 index 0000000..c0c172f --- /dev/null +++ b/core/modules/contextual/css/contextual.icons.css @@ -0,0 +1,20 @@ +/** + * @file + * Styling for contextual module icons. + */ + +/* Tab icon. */ +.toolbar-icon-edit.toolbar-contrast:before { + background-image: url("../../../misc/icons/bebebe/9992-pencil.svg"); +} +.no-svg .toolbar-icon-edit:before { + background-image: url("../../../misc/edit.png"); +} +.toolbar-icon-edit.toolbar-contrast:active:before, +.toolbar-icon-edit.toolbar-contrast.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"); +} diff --git a/core/modules/contextual/css/contextual.toolbar.css b/core/modules/contextual/css/contextual.toolbar.css index 5c37383..88442a4 100644 --- a/core/modules/contextual/css/contextual.toolbar.css +++ b/core/modules/contextual/css/contextual.toolbar.css @@ -3,15 +3,6 @@ * Styling for contextual module's toolbar tab. */ -/* Tab icon. */ -.toolbar-icon-edit:before { - background-image: url(../../../misc/edit.svg); -} -.toolbar-icon-edit:active:before, -.active.toolbar-icon-edit:before { - background-image: url(../../../misc/edit-active.svg); -} - /* Tab appearance. */ .toolbar .toolbar-bar .contextual-toolbar-tab.toolbar-tab { float: right; /* LTR */ @@ -20,6 +11,7 @@ float: left; } .toolbar .toolbar-bar .contextual-toolbar-tab button { + margin: 0; padding-bottom: 1em; padding-top: 1em; /* Hide tab text. */ diff --git a/core/modules/shortcut/css/shortcut.icons.css b/core/modules/shortcut/css/shortcut.icons.css new file mode 100644 index 0000000..b623997 --- /dev/null +++ b/core/modules/shortcut/css/shortcut.icons.css @@ -0,0 +1,65 @@ +/** + * @file + * Styling for the shortcut module icons. + */ + +/** + * Toolbar. + */ +.toolbar-icon-shortcut.toolbar-contrast:before { + background-image: url("../../../misc/icons/bebebe/9995-star-empty.svg"); +} +.no-svg .toolbar-icon-shortcut:before { + background-image: url("../images/shortcut.png"); +} +.toolbar-icon-shortcut.toolbar-contrast:active:before, +.toolbar-icon-shortcut.toolbar-contrast.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"); +} + +/** + * Add/remove links. + */ +.add-or-remove-shortcuts .icon { + background: transparent url("../images/shortcut-add.png") no-repeat; + height: 12px; + margin-left: 8px; /* LTR */ + overflow: hidden; + text-indent: 12px; + width: 12px; +} +[dir="rtl"] .add-or-remove-shortcuts .icon { + margin-left: 0; + margin-right: 8px; +} +[dir="rtl"] .add-or-remove-shortcuts .text { + padding: 0 10px 0 6px; +} +[dir="rtl"] .add-or-remove-shortcuts a:focus .text, +[dir="rtl"] .add-or-remove-shortcuts a:hover .text { + border-radius: 5px 0 0 5px; +} +.add-shortcut a:focus .icon, +.add-shortcut a:hover .icon { + background-position: 0 -12px; /* LTR */ +} +[dir="rtl"] .add-shortcut a:focus .icon, +[dir="rtl"] .add-shortcut a:hover .icon { + background-position: 0 -24px; +} +.remove-shortcut .icon { + margin-top: 4px; + background-position: -12px 0; +} +.remove-shortcut a:focus .icon, +.remove-shortcut a:hover .icon { + background-position: -12px -12px; /* LTR */ +} +[dir="rtl"] .remove-shortcut a:focus .icon, +[dir="rtl"] .remove-shortcut a:hover .icon { + background-position: -12px -24px; +} diff --git a/core/modules/shortcut/css/shortcut.theme.css b/core/modules/shortcut/css/shortcut.theme.css index eda44eb..018f328 100644 --- a/core/modules/shortcut/css/shortcut.theme.css +++ b/core/modules/shortcut/css/shortcut.theme.css @@ -6,20 +6,6 @@ /** * Toolbar. */ -.toolbar-icon-shortcut:before { - background-image: url("../images/shortcut.svg"); -} -.no-svg .toolbar-icon-shortcut:before { - background-image: url("../images/shortcut.png"); -} -.toolbar-icon-shortcut:active:before, -.toolbar-icon-shortcut.active:before { - background-image: url("../images/shortcut-active.svg"); -} -.no-svg .toolbar-icon-shortcut:active:before, -.no-svg .toolbar-icon-shortcut.active:before { - background-image: url("../images/shortcut-active.png"); -} .edit-shortcuts { display: block; } @@ -33,46 +19,3 @@ [dir="rtl"] .toolbar .toolbar-tray-horizontal .edit-shortcuts { float: right; } - -/** - * Add/remove links. - */ -.add-or-remove-shortcuts .icon { - background: transparent url("../images/shortcut-add.png") no-repeat; - height: 12px; - margin-left: 8px; /* LTR */ - overflow: hidden; - text-indent: 12px; - width: 12px; -} -[dir="rtl"] .add-or-remove-shortcuts .icon { - margin-left: 0; - margin-right: 8px; -} -[dir="rtl"] .add-or-remove-shortcuts .text { - padding: 0 10px 0 6px; -} -[dir="rtl"] .add-or-remove-shortcuts a:focus .text, -[dir="rtl"] .add-or-remove-shortcuts a:hover .text { - border-radius: 5px 0 0 5px; -} -.add-shortcut a:focus .icon, -.add-shortcut a:hover .icon { - background-position: 0 -12px; /* LTR */ -} -[dir="rtl"] .add-shortcut a:focus .icon, -[dir="rtl"] .add-shortcut a:hover .icon { - background-position: 0 -24px; -} -.remove-shortcut .icon { - margin-top: 4px; - background-position: -12px 0; -} -.remove-shortcut a:focus .icon, -.remove-shortcut a:hover .icon { - background-position: -12px -12px; /* LTR */ -} -[dir="rtl"] .remove-shortcut a:focus .icon, -[dir="rtl"] .remove-shortcut a:hover .icon { - background-position: -12px -24px; -} diff --git a/core/modules/shortcut/images/shortcut-active.svg b/core/modules/shortcut/images/shortcut-active.svg deleted file mode 100644 index 5b5a9cf..0000000 --- a/core/modules/shortcut/images/shortcut-active.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - diff --git a/core/modules/shortcut/images/shortcut.svg b/core/modules/shortcut/images/shortcut.svg deleted file mode 100644 index c6c5a73..0000000 --- a/core/modules/shortcut/images/shortcut.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - diff --git a/core/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module index 57ff7d7..dfd3c48 100644 --- a/core/modules/shortcut/shortcut.module +++ b/core/modules/shortcut/shortcut.module @@ -514,6 +514,7 @@ function shortcut_preprocess_page(&$variables) { function shortcut_toolbar() { $items = array(); $links = shortcut_renderable_links(); + $path = drupal_get_path('module', 'shortcut'); $shortcut_set = shortcut_current_displayed_set(); $configure_link = NULL; if (shortcut_set_edit_access($shortcut_set)) { @@ -534,7 +535,7 @@ function shortcut_toolbar() { '#options' => array( 'attributes' => array( 'title' => t('Shortcuts'), - 'class' => array('toolbar-icon', 'toolbar-icon-shortcut'), + 'class' => array('toolbar-icon', 'toolbar-icon-shortcut', 'toolbar-contrast'), ), ), ), @@ -546,8 +547,8 @@ function shortcut_toolbar() { '#weight' => -10, '#attached' => array( 'css' => array( - drupal_get_path('module', 'shortcut') . '/css/shortcut.module.css', - drupal_get_path('module', 'shortcut') . '/css/shortcut.theme.css', + $path . '/css/shortcut.theme.css', + $path . '/css/shortcut.icons.css', ), ), ); diff --git a/core/modules/toolbar/css/toolbar.icons.css b/core/modules/toolbar/css/toolbar.icons.css index df06797..9843129 100644 --- a/core/modules/toolbar/css/toolbar.icons.css +++ b/core/modules/toolbar/css/toolbar.icons.css @@ -59,29 +59,29 @@ /** * Top level icons */ -.toolbar-icon-home:before { - background-image: url("../images/icon-home.svg"); +.toolbar-icon-home.toolbar-contrast:before { + background-image: url("../../../misc/icons/bebebe/9999-house.svg"); } .no-svg .toolbar-icon-home:before { background-image: url("../images/icon-home.png"); } -.toolbar-icon-home:active:before, -.toolbar-icon-home.active:before { - background-image: url("../images/icon-home-active.svg"); +.toolbar-icon-home.toolbar-contrast:active:before, +.toolbar-icon-home.toolbar-contrast.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"); } -.toolbar-icon-menu:before { - background-image: url("../images/icon-menu.svg"); +.toolbar-icon-menu.toolbar-contrast:before { + background-image: url("../../../misc/icons/bebebe/9998-hamburger.svg"); } .no-svg .toolbar-icon-menu:before { background-image: url("../images/icon-menu.png"); } -.toolbar-icon-menu:active:before, -.toolbar-icon-menu.active:before { - background-image: url("../images/icon-menu-active.svg"); +.toolbar-icon-menu.toolbar-contrast:active:before, +.toolbar-icon-menu.toolbar-contrast.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 { @@ -92,112 +92,119 @@ * Main menu icons. */ .toolbar-icon-content:before { - background-image: url("../images/icon-content.svg"); + background-image: url("../../../misc/icons/787878/9964-file.svg"); } .no-svg .toolbar-icon-content:before { background-image: url("../images/icon-content.png"); } .toolbar-icon-content:active:before, .toolbar-icon-content.active:before { - background-image: url("../images/icon-content-active.svg"); + background-image: url("../../../misc/icons/000000/9964-file.svg"); } .no-svg .toolbar-icon-content:active:before, .no-svg .toolbar-icon-content.active:before { background-image: url("../images/icon-content-active.png"); } .toolbar-icon-structure:before { - background-image: url("../images/icon-structure.svg"); + background-image: url("../../../misc/icons/787878/9978-orgchart.svg"); } .no-svg .toolbar-icon-structure:before { background-image: url("../images/icon-structure.png"); } .toolbar-icon-structure:active:before, .toolbar-icon-structure.active:before { - background-image: url("../images/icon-structure-active.svg"); + background-image: url("../../../misc/icons/000000/9978-orgchart.svg"); } .no-svg .toolbar-icon-structure:active:before, .no-svg .toolbar-icon-structure.active:before { background-image: url("../images/icon-structure-active.png"); } .toolbar-icon-appearance:before { - background-image: url("../images/icon-appearance.svg"); + background-image: url("../../../misc/icons/787878/9977-paintbrush.svg"); } .no-svg .toolbar-icon-appearance:before { background-image: url("../images/icon-appearance.png"); } .toolbar-icon-appearance:active:before, .toolbar-icon-appearance.active:before { - background-image: url("../images/icon-appearance-active.svg"); + background-image: url("../../../misc/icons/000000/9977-paintbrush.svg"); } .no-svg .toolbar-icon-appearance:active:before, .no-svg .toolbar-icon-appearance.active:before { background-image: url("../images/icon-appearance-active.png"); } .toolbar-icon-people:before { - background-image: url("../images/icon-people.svg"); + background-image: url("../../../misc/icons/787878/9993-people.svg"); } .no-svg .toolbar-icon-people:before { background-image: url("../images/icon-people.png"); } .toolbar-icon-people:active:before, .toolbar-icon-people.active:before { - background-image: url("../images/icon-people-active.svg"); + background-image: url("../../../misc/icons/000000/9993-people.svg"); } .no-svg .toolbar-icon-people:active:before, .no-svg .toolbar-icon-people.active:before { background-image: url("../images/icon-people-active.png"); } .toolbar-icon-extend:before { - background-image: url("../images/icon-extend.svg"); + background-image: url("../../../misc/icons/787878/9976-puzzlepiece.svg"); } .no-svg .toolbar-icon-extend:before { background-image: url("../images/icon-extend.png"); } .toolbar-icon-extend:active:before, .toolbar-icon-extend.active:before { - background-image: url("../images/icon-extend-active.svg"); + background-image: url("../../../misc/icons/000000/9976-puzzlepiece.svg"); } .no-svg .toolbar-icon-extend:active:before, .no-svg .toolbar-icon-extend.active:before { background-image: url("../images/icon-extend-active.png"); } .toolbar-icon-configuration:before { - background-image: url("../images/icon-configuration.svg"); + background-image: url("../../../misc/icons/787878/9975-wrench.svg"); } .no-svg .toolbar-icon-configuration:before { background-image: url("../images/icon-configuration.png"); } .toolbar-icon-configuration:active:before, .toolbar-icon-configuration.active:before { - background-image: url("../images/icon-configuration-active.svg"); + background-image: url("../../../misc/icons/000000/9975-wrench.svg"); } .no-svg .toolbar-icon-configuration:active:before, .no-svg .toolbar-icon-configuration.active:before { background-image: url("../images/icon-configuration-active.png"); } .toolbar-icon-reports:before { - background-image: url("../images/icon-reports.svg"); + background-image: url("../../../misc/icons/787878/9974-barchart.svg"); } .no-svg .toolbar-icon-reports:before { background-image: url("../images/icon-reports.png"); } .toolbar-icon-reports:active:before, .toolbar-icon-reports.active:before { - background-image: url("../images/icon-reports-active.svg"); + background-image: url("../../../misc/icons/000000/9974-barchart.svg"); } .no-svg .toolbar-icon-reports:active:before, .no-svg .toolbar-icon-reports.active:before { background-image: url("../images/icon-reports-active.png"); } .toolbar-icon-help:before { - background-image: url("../images/icon-help.svg"); + 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"); } .toolbar-icon-help:active:before, .toolbar-icon-help.active:before { - background-image: url("../images/icon-help-active.svg"); + 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 { @@ -246,3 +253,84 @@ right: 0.6667em; } } + +/** + * Handle. + */ +.toolbar .toolbar-icon.toolbar-handle { + width: 3em; + text-indent: -9999px; +} +.toolbar .toolbar-icon.toolbar-handle:before { + background-image: url("../../../misc/icons/5181c6/9939-chevron-disc-down.svg"); + left: 0; /* LTR */ +} +.no-svg .toolbar .toolbar-icon.toolbar-handle:before { + background-image: url("../images/icon-open.png"); + left: 0; /* LTR */ +} +[dir="rtl"] .toolbar .toolbar-icon.toolbar-handle:before { + left: auto; + right: 0; +} +[dir="rtl"].no-svg .toolbar .toolbar-icon.toolbar-handle:before { + left: auto; + right: 0; +} +.toolbar .toolbar-icon.toolbar-handle.open:before { + 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"); +} +.toolbar .menu .menu .toolbar-icon.toolbar-handle:before { + background-image: url("../../../misc/icons/5181c6/9953-twistie-down.svg"); +} +.no-svg .toolbar .menu .menu .toolbar-icon.toolbar-handle:before { + background-image: url("../images/icon-child-open.png"); +} +.toolbar .menu .menu .toolbar-icon.toolbar-handle.open:before { + background-image: url("../../../misc/icons/787878/9955-twistie-up.svg"); +} +.no-svg .toolbar .menu .menu .toolbar-icon.toolbar-handle.open:before { + background-image: url("../images/icon-child-collapse.png"); +} + +/** + * Orientation toggle. + */ +.toolbar .toolbar-toggle-orientation button { + height: 16px; + padding: 0; + text-indent: -999em; + width: 20px; +} +.toolbar .toolbar-toggle-orientation button:before { + left: 0; /* LTR */ +} +[dir="rtl"] .toolbar .toolbar-toggle-orientation button:before { + left: auto; + right: 0; +} +[dir="rtl"] .toolbar .toolbar-toggle-orientation .toolbar-icon { + padding-right: 0; +} +.toolbar .toolbar-toggle-orientation [value="vertical"]:before { + background-image: url("../../../misc/icons/787878/9968-push-left.svg"); /* LTR */ +} +.no-svg .toolbar .toolbar-toggle-orientation [value="vertical"]:before { + background-image: url('../images/icon-toggle-vertical.png'); /* LTR */ +} +[dir="rtl"] .toolbar .toolbar-toggle-orientation [value="vertical"]:before { + background-image: url("../../../misc/icons/787878/9970-push-right.svg"); +} +[dir="rtl"].no-svg .toolbar .toolbar-toggle-orientation [value="vertical"]:before { + background-image: url('../images/icon-toggle-vertical-rtl.png'); +} +.toolbar .toolbar-toggle-orientation [value="horizontal"]:before { + background-image: url("../../../misc/icons/787878/9971-push-up.svg"); +} +.no-svg .toolbar .toolbar-toggle-orientation [value="horizontal"]:before { + background-image: url('../images/icon-toggle-horizontal.png'); +} + diff --git a/core/modules/toolbar/css/toolbar.menu.css b/core/modules/toolbar/css/toolbar.menu.css index 060f102..7f67ab7 100644 --- a/core/modules/toolbar/css/toolbar.menu.css +++ b/core/modules/toolbar/css/toolbar.menu.css @@ -85,29 +85,10 @@ padding: 0; position: absolute; right: 0; /* LTR */ - text-indent: -9999px; top: 0; - width: 3em; z-index: 1; } [dir="rtl"] .toolbar .toolbar-icon.toolbar-handle { left: 0; right: auto; } -.toolbar .toolbar-icon.toolbar-handle:before { - background-image: url("../images/icon-open.png"); - left: 0; /* LTR */ -} -[dir="rtl"] .toolbar .toolbar-icon.toolbar-handle:before { - left: auto; - right: 0; -} -.toolbar .toolbar-icon.toolbar-handle.open:before { - background-image: url("../images/icon-collapse.png"); -} -.toolbar .menu .menu .toolbar-icon.toolbar-handle:before { - background-image: url("../images/icon-child-open.png"); -} -.toolbar .menu .menu .toolbar-icon.toolbar-handle.open:before { - background-image: url("../images/icon-child-collapse.png"); -} diff --git a/core/modules/toolbar/css/toolbar.theme.css b/core/modules/toolbar/css/toolbar.theme.css index 1d64296..5e2afe7 100644 --- a/core/modules/toolbar/css/toolbar.theme.css +++ b/core/modules/toolbar/css/toolbar.theme.css @@ -172,24 +172,4 @@ .toolbar .toolbar-toggle-orientation button { cursor: pointer; display: inline-block; - height: 16px; - padding: 0; - text-indent: -999em; - width: 20px; -} -.toolbar .toolbar-toggle-orientation button:before { - left: 0; /* LTR */ -} -[dir="rtl"] .toolbar .toolbar-toggle-orientation button:before { - left: auto; - right: 0; -} -.toolbar .toolbar-toggle-orientation [value="vertical"]:before { - background-image: url('../images/icon-toggle-vertical.png'); /* LTR */ -} -[dir="rtl"] .toolbar .toolbar-toggle-orientation [value="vertical"]:before { - background-image: url('../images/icon-toggle-vertical-rtl.png'); -} -.toolbar .toolbar-toggle-orientation [value="horizontal"]:before { - background-image: url('../images/icon-toggle-horizontal.png'); } diff --git a/core/modules/toolbar/images/icon-appearance-active.svg b/core/modules/toolbar/images/icon-appearance-active.svg deleted file mode 100644 index 1108648..0000000 --- a/core/modules/toolbar/images/icon-appearance-active.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - diff --git a/core/modules/toolbar/images/icon-appearance.svg b/core/modules/toolbar/images/icon-appearance.svg deleted file mode 100644 index 790d017..0000000 --- a/core/modules/toolbar/images/icon-appearance.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - diff --git a/core/modules/toolbar/images/icon-configuration-active.svg b/core/modules/toolbar/images/icon-configuration-active.svg deleted file mode 100644 index 94d867a..0000000 --- a/core/modules/toolbar/images/icon-configuration-active.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/core/modules/toolbar/images/icon-configuration.svg b/core/modules/toolbar/images/icon-configuration.svg deleted file mode 100644 index 51d56d0..0000000 --- a/core/modules/toolbar/images/icon-configuration.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/core/modules/toolbar/images/icon-content-active.svg b/core/modules/toolbar/images/icon-content-active.svg deleted file mode 100644 index 6d16105..0000000 --- a/core/modules/toolbar/images/icon-content-active.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/core/modules/toolbar/images/icon-content.svg b/core/modules/toolbar/images/icon-content.svg deleted file mode 100644 index fe792d7..0000000 --- a/core/modules/toolbar/images/icon-content.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/core/modules/toolbar/images/icon-extend-active.svg b/core/modules/toolbar/images/icon-extend-active.svg deleted file mode 100644 index 3e38331..0000000 --- a/core/modules/toolbar/images/icon-extend-active.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/core/modules/toolbar/images/icon-extend.svg b/core/modules/toolbar/images/icon-extend.svg deleted file mode 100644 index ad0d619..0000000 --- a/core/modules/toolbar/images/icon-extend.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/core/modules/toolbar/images/icon-help-active.svg b/core/modules/toolbar/images/icon-help-active.svg deleted file mode 100644 index 35f6eb0..0000000 --- a/core/modules/toolbar/images/icon-help-active.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/core/modules/toolbar/images/icon-help.svg b/core/modules/toolbar/images/icon-help.svg deleted file mode 100644 index 4c15784..0000000 --- a/core/modules/toolbar/images/icon-help.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/core/modules/toolbar/images/icon-home-active.svg b/core/modules/toolbar/images/icon-home-active.svg deleted file mode 100644 index dbbd9ee..0000000 --- a/core/modules/toolbar/images/icon-home-active.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - diff --git a/core/modules/toolbar/images/icon-home.svg b/core/modules/toolbar/images/icon-home.svg deleted file mode 100644 index 601c7dc..0000000 --- a/core/modules/toolbar/images/icon-home.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - diff --git a/core/modules/toolbar/images/icon-menu-active.svg b/core/modules/toolbar/images/icon-menu-active.svg deleted file mode 100644 index f7b0186..0000000 --- a/core/modules/toolbar/images/icon-menu-active.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - diff --git a/core/modules/toolbar/images/icon-menu.svg b/core/modules/toolbar/images/icon-menu.svg deleted file mode 100644 index 098e229..0000000 --- a/core/modules/toolbar/images/icon-menu.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - diff --git a/core/modules/toolbar/images/icon-people-active.svg b/core/modules/toolbar/images/icon-people-active.svg deleted file mode 100644 index 88a5b88..0000000 --- a/core/modules/toolbar/images/icon-people-active.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/core/modules/toolbar/images/icon-people.svg b/core/modules/toolbar/images/icon-people.svg deleted file mode 100644 index fc6a8e5..0000000 --- a/core/modules/toolbar/images/icon-people.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/core/modules/toolbar/images/icon-reports-active.svg b/core/modules/toolbar/images/icon-reports-active.svg deleted file mode 100644 index 52dd192..0000000 --- a/core/modules/toolbar/images/icon-reports-active.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/core/modules/toolbar/images/icon-reports.svg b/core/modules/toolbar/images/icon-reports.svg deleted file mode 100644 index dd2fb17..0000000 --- a/core/modules/toolbar/images/icon-reports.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/core/modules/toolbar/images/icon-structure-active.svg b/core/modules/toolbar/images/icon-structure-active.svg deleted file mode 100644 index 3d717ff..0000000 --- a/core/modules/toolbar/images/icon-structure-active.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/core/modules/toolbar/images/icon-structure.svg b/core/modules/toolbar/images/icon-structure.svg deleted file mode 100644 index 7d11b0e..0000000 --- a/core/modules/toolbar/images/icon-structure.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module index adcb2aa..4d5183a 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'), + 'class' => array('toolbar-icon', 'toolbar-icon-home' , 'toolbar-contrast'), ), ), ), @@ -454,7 +454,7 @@ function toolbar_toolbar() { '#options' => array( 'attributes' => array( 'title' => t('Admin menu'), - 'class' => array('toolbar-icon', 'toolbar-icon-menu'), + 'class' => array('toolbar-icon', 'toolbar-icon-menu', 'toolbar-contrast'), ), ), ), diff --git a/core/modules/tour/tour.module b/core/modules/tour/tour.module index affdc49..e689094 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'), + 'class' => array('toolbar-icon', 'toolbar-icon-help', 'toolbar-contrast'), 'role' => 'button', 'aria-pressed' => 'false', ), diff --git a/core/modules/user/css/user.icons.css b/core/modules/user/css/user.icons.css new file mode 100644 index 0000000..d4d133d --- /dev/null +++ b/core/modules/user/css/user.icons.css @@ -0,0 +1,22 @@ +/** + * @file + * Styling for the user module icons. + */ + +/** + * Toolbar icon. + */ +.toolbar-icon-user.toolbar-contrast:before { + background-image: url("../../../misc/icons/bebebe/9994-person.svg"); +} +.no-svg .toolbar-icon-user:before { + background-image: url("../images/icon-user.png"); +} +.toolbar-icon-user.toolbar-contrast:active:before, +.toolbar-icon-user.toolbar-contrast.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"); +} diff --git a/core/modules/user/css/user.module.css b/core/modules/user/css/user.module.css index 72144de..08dc3d9 100644 --- a/core/modules/user/css/user.module.css +++ b/core/modules/user/css/user.module.css @@ -106,21 +106,3 @@ div.password-suggestions ul { width: 100%; } } - -/** - * Toolbar icon. - */ -.toolbar-icon-user:before { - background-image: url("../images/icon-user.svg"); -} -.no-svg .toolbar-icon-user:before { - background-image: url("../images/icon-user.png"); -} -.toolbar-icon-user:active:before, -.toolbar-icon-user.active:before { - background-image: url("../images/icon-user-active.svg"); -} -.no-svg .toolbar-icon-user:active:before, -.no-svg .toolbar-icon-user.active:before { - background-image: url("../images/icon-user-active.svg"); -} diff --git a/core/modules/user/images/icon-user-active.svg b/core/modules/user/images/icon-user-active.svg deleted file mode 100644 index 453bc42..0000000 --- a/core/modules/user/images/icon-user-active.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - diff --git a/core/modules/user/images/icon-user.svg b/core/modules/user/images/icon-user.svg deleted file mode 100644 index 14d9ab9..0000000 --- a/core/modules/user/images/icon-user.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - diff --git a/core/modules/user/user.module b/core/modules/user/user.module index 0a8d4ab..6fc79ce 100644 --- a/core/modules/user/user.module +++ b/core/modules/user/user.module @@ -2042,6 +2042,7 @@ function user_file_download_access($field, EntityInterface $entity, File $file) */ function user_toolbar() { global $user; + $path = drupal_get_path('module', 'user'); // Add logout & user account links or login link. if ($user->isAuthenticated()) { @@ -2086,7 +2087,7 @@ function user_toolbar() { '#options' => array( 'attributes' => array( 'title' => t('My account'), - 'class' => array('toolbar-icon', 'toolbar-icon-user'), + 'class' => array('toolbar-icon', 'toolbar-icon-user', 'toolbar-contrast'), ), ), ), @@ -2101,6 +2102,11 @@ function user_toolbar() { ), ), '#weight' => 100, + '#attached' => array( + 'css' => array( + $path . '/css/user.icons.css', + ), + ), ); return $items;