summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathaniel Catchpole2013-07-18 10:28:54 (GMT)
committerNathaniel Catchpole2013-07-18 10:28:54 (GMT)
commit788cb06d60155575dda548aa3840921ad702d732 (patch)
tree568e0ee7c06972c55639997ef818404bb9f8992f
parent47ff64238f4f7e5d10edd4c0239172bc6be8da58 (diff)
Issue #1938044 by hass, jessebeach, Dragan Eror: Fixed Prefix all toolbar classes to prevent theme clashes.
-rw-r--r--core/modules/contextual/contextual.module2
-rw-r--r--core/modules/contextual/contextual.toolbar.js2
-rw-r--r--core/modules/contextual/css/contextual.toolbar.css18
-rw-r--r--core/modules/shortcut/css/shortcut.theme.css21
-rw-r--r--core/modules/shortcut/shortcut.module2
-rw-r--r--core/modules/toolbar/css/toolbar.icons.css98
-rw-r--r--core/modules/toolbar/css/toolbar.menu.css34
-rw-r--r--core/modules/toolbar/css/toolbar.module.css86
-rw-r--r--core/modules/toolbar/css/toolbar.theme.css90
-rw-r--r--core/modules/toolbar/js/toolbar.js42
-rw-r--r--core/modules/toolbar/js/toolbar.menu.js16
-rw-r--r--core/modules/toolbar/toolbar.api.php8
-rw-r--r--core/modules/toolbar/toolbar.module16
-rw-r--r--core/modules/tour/css/tour.module.css6
-rw-r--r--core/modules/tour/tour.module2
-rw-r--r--core/modules/user/css/user.module.css6
-rw-r--r--core/modules/user/user.module2
17 files changed, 221 insertions, 230 deletions
diff --git a/core/modules/contextual/contextual.module b/core/modules/contextual/contextual.module
index 9280a7b..03cd17e 100644
--- a/core/modules/contextual/contextual.module
+++ b/core/modules/contextual/contextual.module
@@ -34,7 +34,7 @@ function contextual_toolbar() {
'#tag' => 'button',
'#value' => t('Edit'),
'#attributes' => array(
- 'class' => array('icon', 'icon-edit'),
+ 'class' => array('toolbar-icon', 'toolbar-icon-edit'),
'role' => 'button',
'aria-pressed' => 'false',
),
diff --git a/core/modules/contextual/contextual.toolbar.js b/core/modules/contextual/contextual.toolbar.js
index 8a1ece7..f4a37f5 100644
--- a/core/modules/contextual/contextual.toolbar.js
+++ b/core/modules/contextual/contextual.toolbar.js
@@ -26,7 +26,7 @@ function initContextualToolbar (context) {
var model = contextualToolbar.model = new contextualToolbar.Model();
var viewOptions = $.extend({
- el: $('.toolbar .bar .contextual-toolbar-tab'),
+ el: $('.toolbar .toolbar-bar .contextual-toolbar-tab'),
model: model
}, options);
new contextualToolbar.VisualView(viewOptions);
diff --git a/core/modules/contextual/css/contextual.toolbar.css b/core/modules/contextual/css/contextual.toolbar.css
index c6fc64e..f540349 100644
--- a/core/modules/contextual/css/contextual.toolbar.css
+++ b/core/modules/contextual/css/contextual.toolbar.css
@@ -4,22 +4,22 @@
*/
/* Tab icon. */
-.icon-edit:before {
+.toolbar-icon-edit:before {
background-image: url(../../../misc/edit.png);
}
-.icon-edit:active:before,
-.active.icon-edit:before {
+.toolbar-icon-edit:active:before,
+.active.toolbar-icon-edit:before {
background-image: url(../../../misc/edit-active.png);
}
/* Tab appearance. */
-.toolbar .bar .contextual-toolbar-tab.tab {
+.toolbar .toolbar-bar .contextual-toolbar-tab.toolbar-tab {
float: right; /* LTR */
}
-[dir="rtl"] .toolbar .bar .contextual-toolbar-tab.tab {
+[dir="rtl"] .toolbar .toolbar-bar .contextual-toolbar-tab.toolbar-tab {
float: left;
}
-.toolbar .bar .contextual-toolbar-tab button {
+.toolbar .toolbar-bar .contextual-toolbar-tab button {
padding-bottom: 1em;
padding-top: 1em;
/* Hide tab text. */
@@ -27,10 +27,10 @@
text-indent: -9999px;
line-height: 1em;
}
-[dir="rtl"] .toolbar .bar .contextual-toolbar-tab button {
+[dir="rtl"] .toolbar .toolbar-bar .contextual-toolbar-tab button {
padding-right: 1.3333em;
}
-.toolbar .bar .contextual-toolbar-tab button.active {
+.toolbar .toolbar-bar .contextual-toolbar-tab button.active {
background-image:-moz-linear-gradient(rgb(78,159,234) 0%,rgb(69,132,221) 100%);
background-image:-webkit-gradient(linear,color-stop(0, rgb(78,159,234)),color-stop(1, rgb(69,132,221)));
background-image: -webkit-linear-gradient(top, rgb(78,159,234) 0%, rgb(69,132,221) 100%);
@@ -38,6 +38,6 @@
}
/* @todo get rid of this declaration by making toolbar.module's CSS less specific */
-.toolbar .bar .contextual-toolbar-tab.tab.hidden {
+.toolbar .toolbar-bar .contextual-toolbar-tab.toolbar-tab.hidden {
display: none;
}
diff --git a/core/modules/shortcut/css/shortcut.theme.css b/core/modules/shortcut/css/shortcut.theme.css
index f45a375..35ea588 100644
--- a/core/modules/shortcut/css/shortcut.theme.css
+++ b/core/modules/shortcut/css/shortcut.theme.css
@@ -6,34 +6,25 @@
/**
* Toolbar.
*/
-.icon-shortcut:before {
+.toolbar-icon-shortcut:before {
background-image: url(../images/shortcut.png);
}
-.icon-shortcut:active:before,
-.icon-shortcut.active:before {
+.toolbar-icon-shortcut:active:before,
+.toolbar-icon-shortcut.active:before {
background-image: url(../images/shortcut-active.png);
}
-.toolbar .tray.horizontal.shortcuts .menu {
- float: left;
-}
.edit-shortcuts {
display: block;
}
-.toolbar .vertical .edit-shortcuts {
+.toolbar .toolbar-tray-vertical .edit-shortcuts {
text-align: right;
padding: 1em;
}
-.toolbar .horizontal .edit-shortcuts {
+.toolbar .toolbar-tray-horizontal .edit-shortcuts {
float: left; /* LTR */
}
-[dir="rtl"] .toolbar .horizontal .edit-shortcuts {
- border-left: 0 none;
- border-right: 1px solid #d9d9d9;
+[dir="rtl"] .toolbar .toolbar-tray-horizontal .edit-shortcuts {
float: right;
- margin-left: 0;
- margin-right: 0.3333em;
- padding-left: 0.3333em;
- padding-right: 0.6667em;
}
/**
diff --git a/core/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module
index dd094a1..c23577c 100644
--- a/core/modules/shortcut/shortcut.module
+++ b/core/modules/shortcut/shortcut.module
@@ -534,7 +534,7 @@ function shortcut_toolbar() {
'#options' => array(
'attributes' => array(
'title' => t('Shortcuts'),
- 'class' => array('icon', 'icon-shortcut'),
+ 'class' => array('toolbar-icon', 'toolbar-icon-shortcut'),
),
),
),
diff --git a/core/modules/toolbar/css/toolbar.icons.css b/core/modules/toolbar/css/toolbar.icons.css
index 3175b0b..0aee152 100644
--- a/core/modules/toolbar/css/toolbar.icons.css
+++ b/core/modules/toolbar/css/toolbar.icons.css
@@ -1,15 +1,15 @@
/**
* @file toolbar.icons.css
*/
-.toolbar .icon {
+.toolbar .toolbar-icon {
padding-left: 2.75em; /* LTR */
position: relative;
}
-[dir="rtl"] .toolbar .icon {
+[dir="rtl"] .toolbar .toolbar-icon {
padding-left: 1.3333em;
padding-right: 2.75em;
}
-.toolbar .icon:before {
+.toolbar .toolbar-icon:before {
background-attachment: scroll;
background-color: transparent;
background-position: center center;
@@ -22,36 +22,36 @@
top: 0;
width: 20px;
}
-[dir="rtl"] .toolbar .icon:before {
+[dir="rtl"] .toolbar .toolbar-icon:before {
left: auto;
right: 0.6667em;
}
-.toolbar button.icon {
+.toolbar button.toolbar-icon {
background-color: transparent;
border: 0;
font-size: 1em;
}
-.toolbar .menu ul .icon {
+.toolbar .menu ul .toolbar-icon {
padding-left: 1.3333em; /* LTR */
}
-[dir="rtl"] .toolbar .menu ul .icon {
+[dir="rtl"] .toolbar .menu ul .toolbar-icon {
padding-left: 0;
padding-right: 1.3333em;
}
-.toolbar .menu ul a.icon:before {
+.toolbar .menu ul a.toolbar-icon:before {
display: none;
}
-.toolbar .vertical .menu ul {
+.toolbar .toolbar-tray-vertical .menu ul {
margin-left: 1.5em; /* LTR */
}
-[dir="rtl"] .toolbar .vertical .menu ul {
+[dir="rtl"] .toolbar .toolbar-tray-vertical .menu ul {
margin-left: 0;
margin-right: 1.5em;
}
-.toolbar .vertical .menu ul ul {
+.toolbar .toolbar-tray-vertical .menu ul ul {
margin-left: 0.75em; /* LTR */
}
-[dir="rtl"] .toolbar .vertical .menu ul ul {
+[dir="rtl"] .toolbar .toolbar-tray-vertical .menu ul ul {
margin-left: 0;
margin-right: 0.75em;
}
@@ -59,83 +59,83 @@
/**
* Top level icons
*/
-.icon-home:before {
+.toolbar-icon-home:before {
background-image: url("../images/icon-home.png");
}
-.icon-home:active:before,
-.icon-home.active:before {
+.toolbar-icon-home:active:before,
+.toolbar-icon-home.active:before {
background-image: url("../images/icon-home-active.png");
}
-.icon-menu:before {
+.toolbar-icon-menu:before {
background-image: url("../images/icon-menu.png");
}
-.icon-menu:active:before,
-.icon-menu.active:before {
+.toolbar-icon-menu:active:before,
+.toolbar-icon-menu.active:before {
background-image: url("../images/icon-menu-active.png");
}
/**
* Main menu icons.
*/
-.icon-content:before {
+.toolbar-icon-content:before {
background-image: url("../images/icon-content.png");
}
-.icon-content:active:before,
-.icon-content.active:before {
+.toolbar-icon-content:active:before,
+.toolbar-icon-content.active:before {
background-image: url("../images/icon-content-active.png");
}
-.icon-structure:before {
+.toolbar-icon-structure:before {
background-image: url("../images/icon-structure.png");
}
-.icon-structure:active:before,
-.icon-structure.active:before {
+.toolbar-icon-structure:active:before,
+.toolbar-icon-structure.active:before {
background-image: url("../images/icon-structure-active.png");
}
-.icon-appearance:before {
+.toolbar-icon-appearance:before {
background-image: url("../images/icon-appearance.png");
}
-.icon-appearance:active:before,
-.icon-appearance.active:before {
+.toolbar-icon-appearance:active:before,
+.toolbar-icon-appearance.active:before {
background-image: url("../images/icon-appearance-active.png");
}
-.icon-people:before {
+.toolbar-icon-people:before {
background-image: url("../images/icon-people.png");
}
-.icon-people:active:before,
-.icon-people.active:before {
+.toolbar-icon-people:active:before,
+.toolbar-icon-people.active:before {
background-image: url("../images/icon-people-active.png");
}
-.icon-extend:before {
+.toolbar-icon-extend:before {
background-image: url("../images/icon-extend.png");
}
-.icon-extend:active:before,
-.icon-extend.active:before {
+.toolbar-icon-extend:active:before,
+.toolbar-icon-extend.active:before {
background-image: url("../images/icon-extend-active.png");
}
-.icon-configuration:before {
+.toolbar-icon-configuration:before {
background-image: url("../images/icon-configuration.png");
}
-.icon-configuration:active:before,
-.icon-configuration.active:before {
+.toolbar-icon-configuration:active:before,
+.toolbar-icon-configuration.active:before {
background-image: url("../images/icon-configuration-active.png");
}
-.icon-reports:before {
+.toolbar-icon-reports:before {
background-image: url("../images/icon-reports.png");
}
-.icon-reports:active:before,
-.icon-reports.active:before {
+.toolbar-icon-reports:active:before,
+.toolbar-icon-reports.active:before {
background-image: url("../images/icon-reports-active.png");
}
-.icon-help:before {
+.toolbar-icon-help:before {
background-image: url("../images/icon-help.png");
}
-.icon-help:active:before,
-.icon-help.active:before {
+.toolbar-icon-help:active:before,
+.toolbar-icon-help.active:before {
background-image: url("../images/icon-help-active.png");
}
@media only screen and (min-width: 16.5em) {
- .toolbar .bar .icon {
+ .toolbar .toolbar-bar .toolbar-icon {
margin-left: 0;
margin-right: 0;
padding-left: 0;
@@ -143,11 +143,11 @@
text-indent: -9999px;
width: 4em;
}
- .toolbar .bar .icon:before {
+ .toolbar .toolbar-bar .toolbar-icon:before {
left: 0; /* LTR */
width: 100%;
}
- [dir="rtl"] .toolbar .bar .icon:before {
+ [dir="rtl"] .toolbar .toolbar-bar .toolbar-icon:before {
background-size: auto auto;
left: auto;
right: 0;
@@ -155,23 +155,23 @@
}
@media only screen and (min-width: 36em) {
- .toolbar .bar .icon {
+ .toolbar .toolbar-bar .toolbar-icon {
background-position: left center; /* LTR */
padding-left: 2.75em; /* LTR */
padding-right: 1.3333em; /* LTR */
text-indent: 0;
width: auto;
}
- [dir="rtl"] .toolbar .bar .icon {
+ [dir="rtl"] .toolbar .toolbar-bar .toolbar-icon {
background-position: right center;
padding-left: 1.3333em;
padding-right: 2.75em;
}
- .toolbar .bar .icon:before {
+ .toolbar .toolbar-bar .toolbar-icon:before {
left: 0.6667em; /* LTR */
width: 20px;
}
- [dir="rtl"] .toolbar .bar .icon:before {
+ [dir="rtl"] .toolbar .toolbar-bar .toolbar-icon:before {
left: 0;
right: 0.6667em;
}
diff --git a/core/modules/toolbar/css/toolbar.menu.css b/core/modules/toolbar/css/toolbar.menu.css
index 93d81c1..060f102 100644
--- a/core/modules/toolbar/css/toolbar.menu.css
+++ b/core/modules/toolbar/css/toolbar.menu.css
@@ -6,29 +6,29 @@
margin: 0;
padding: 0;
}
-.toolbar .box {
+.toolbar .toolbar-box {
display: block;
line-height: 1em; /* this prevents the value "normal" from being returned as the line-height */
position: relative;
width: auto;
}
-.toolbar .horizontal .menu .handle,
-.toolbar .horizontal .menu ul,
-.toolbar .vertical .menu ul {
+.toolbar .toolbar-tray-horizontal .menu .toolbar-handle,
+.toolbar .toolbar-tray-horizontal .menu ul,
+.toolbar .toolbar-tray-vertical .menu ul {
display: none;
}
-.toolbar .vertical li.open > ul {
+.toolbar .toolbar-tray-vertical li.open > ul {
display: block; /* Show the sub-menus */
}
-.toolbar .vertical .handle + a {
+.toolbar .toolbar-tray-vertical .toolbar-handle + a {
margin-right: 3em; /* LTR */
}
-[dir="rtl"] .toolbar .vertical .handle + a {
+[dir="rtl"] .toolbar .toolbar-tray-vertical .toolbar-handle + a {
margin-left: 3em;
margin-right: 0;
}
-.toolbar .tray .active-trail > .box a,
-.toolbar .tray a.active {
+.toolbar .toolbar-tray .active-trail > .toolbar-box a,
+.toolbar .toolbar-tray a.active {
color: #000;
font-weight: bold;
}
@@ -75,10 +75,10 @@
/**
* Handle.
*/
-.toolbar .handle:hover {
+.toolbar .toolbar-handle:hover {
cursor: pointer;
}
-.toolbar .icon.handle {
+.toolbar .toolbar-icon.toolbar-handle {
bottom: 0;
display: block;
height: 100%;
@@ -90,24 +90,24 @@
width: 3em;
z-index: 1;
}
-[dir="rtl"] .toolbar .icon.handle {
+[dir="rtl"] .toolbar .toolbar-icon.toolbar-handle {
left: 0;
right: auto;
}
-.toolbar .icon.handle:before {
+.toolbar .toolbar-icon.toolbar-handle:before {
background-image: url("../images/icon-open.png");
left: 0; /* LTR */
}
-[dir="rtl"] .toolbar .icon.handle:before {
+[dir="rtl"] .toolbar .toolbar-icon.toolbar-handle:before {
left: auto;
right: 0;
}
-.toolbar .icon.handle.open:before {
+.toolbar .toolbar-icon.toolbar-handle.open:before {
background-image: url("../images/icon-collapse.png");
}
-.toolbar .menu .menu .icon.handle:before {
+.toolbar .menu .menu .toolbar-icon.toolbar-handle:before {
background-image: url("../images/icon-child-open.png");
}
-.toolbar .menu .menu .icon.handle.open:before {
+.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.module.css b/core/modules/toolbar/css/toolbar.module.css
index b139b03..d3e3f9e 100644
--- a/core/modules/toolbar/css/toolbar.module.css
+++ b/core/modules/toolbar/css/toolbar.module.css
@@ -34,7 +34,7 @@
.toolbar .menu li {
padding-top: 0;
}
-.toolbar .bar .tab,
+.toolbar .toolbar-bar .toolbar-tab,
.toolbar .menu li {
display: block;
}
@@ -46,8 +46,8 @@
/**
* Administration menu.
*/
-.toolbar .bar,
-.toolbar .tray {
+.toolbar .toolbar-bar,
+.toolbar .toolbar-tray {
position: relative;
z-index: 1250;
}
@@ -56,20 +56,20 @@
* position absolutely so that it scrolls with the page. Otherwise, on smaller
* screens, the components of the admin toolbar are positioned statically. */
body.toolbar-paneled .toolbar-oriented,
-.toolbar-oriented .bar,
-.toolbar-oriented .tray {
+.toolbar-oriented .toolbar-bar,
+.toolbar-oriented .toolbar-tray {
left: 0;
position: absolute;
right: 0;
top: 0;
}
/* Layer the bar just above the trays and above contextual link triggers. */
-.toolbar-oriented .bar {
+.toolbar-oriented .toolbar-bar {
z-index: 502;
}
/* Position the admin toolbar fixed when the configured standard breakpoint is
* active. */
-body.toolbar-paneled .toolbar-oriented .bar {
+body.toolbar-paneled .toolbar-oriented .toolbar-bar {
position: fixed;
}
/* When the configured narrow breakpoint is active, the toolbar is sized to wrap
@@ -83,23 +83,23 @@ body.toolbar-tray-open.toolbar-paneled.toolbar-vertical .toolbar-oriented {
/* Present the admin toolbar tabs horizontally as a default on user agents that
* do not understand media queries or on user agents where JavaScript is
* disabled. */
-.toolbar .bar .tab,
-.toolbar.horizontal li {
+.toolbar .toolbar-bar .toolbar-tab,
+.toolbar .toolbar-tray-horizontal li {
float: left; /* LTR */
}
-[dir="rtl"] .toolbar .bar .tab,
-[dir="rtl"] .toolbar.horizontal li {
+[dir="rtl"] .toolbar .toolbar-bar .toolbar-tab,
+[dir="rtl"] .toolbar .toolbar-tray-horizontal li {
float: right;
}
/* Present the admin toolbar tabs vertically by default on user agents that
* that understand media queries. This will be the small screen default. */
@media only screen {
- .toolbar .bar .tab,
- .toolbar.horizontal li {
+ .toolbar .toolbar-bar .toolbar-tab,
+ .toolbar .toolbar-tray-horizontal li {
float: none; /* LTR */
}
- [dir="rtl"] .toolbar .bar .tab,
- [dir="rtl"] .toolbar.horizontal li {
+ [dir="rtl"] .toolbar .toolbar-bar .toolbar-tab,
+ [dir="rtl"] .toolbar .toolbar-tray-horizontal li {
float: none;
}
}
@@ -107,53 +107,53 @@ body.toolbar-tray-open.toolbar-paneled.toolbar-vertical .toolbar-oriented {
* the main menu tabs when JavaScript is disabled on user agents that understand
* media queries. */
@media (min-width:16.5em) {
- .toolbar .bar .tab,
- .toolbar.horizontal li {
+ .toolbar .toolbar-bar .toolbar-tab,
+ .toolbar .toolbar-tray-horizontal li {
float: left; /* LTR */
}
- [dir="rtl"] .toolbar .bar .tab,
- [dir="rtl"] .toolbar.horizontal li {
+ [dir="rtl"] .toolbar .toolbar-bar .toolbar-tab,
+ [dir="rtl"] .toolbar .toolbar-tray-horizontal li {
float: right;
}
}
/* Present the admin toolbar tabs horizontally when the configured narrow
* breakpoint is active. */
-.toolbar-oriented .bar .tab,
-.toolbar-oriented .horizontal li {
+.toolbar-oriented .toolbar-bar .toolbar-tab,
+.toolbar-oriented .toolbar-tray-horizontal li {
float: left; /* LTR */
}
-[dir="rtl"] .toolbar-oriented .bar .tab,
-[dir="rtl"] .toolbar-oriented .horizontal li {
+[dir="rtl"] .toolbar-oriented .toolbar-bar .toolbar-tab,
+[dir="rtl"] .toolbar-oriented .toolbar-tray-horizontal li {
float: right;
}
/**
* Toolbar tray.
*/
-.toolbar .tray {
+.toolbar .toolbar-tray {
display: none;
z-index: 501;
}
-.toolar .tray > .lining {
+.toolar .toolbar-tray > .toolbar-lining {
position: relative;
}
-.toolbar-oriented .vertical {
+.toolbar-oriented .toolbar-tray-vertical {
left: -100%; /* LTR */
position: absolute;
width: 240px;
width: 15rem;
}
-[dir="rtl"] .toolbar-oriented .vertical {
+[dir="rtl"] .toolbar-oriented .toolbar-tray-vertical {
left: auto;
right: -100%;
}
-.toolbar .vertical > .lining {
+.toolbar .toolbar-tray-vertical > .toolbar-lining {
min-height: 100%;
}
-.toolbar .vertical > .lining:before {
+.toolbar .toolbar-tray-vertical > .toolbar-lining:before {
width: 100%;
}
-.toolbar-oriented .vertical > .lining:before {
+.toolbar-oriented .toolbar-tray-vertical > .toolbar-lining:before {
bottom: 0;
content: '';
display: block;
@@ -164,37 +164,37 @@ body.toolbar-tray-open.toolbar-paneled.toolbar-vertical .toolbar-oriented {
width: 15rem;
z-index: -1;
}
-[dir="rtl"] .toolbar .vertical > .lining:before {
+[dir="rtl"] .toolbar .toolbar-tray-vertical > .toolbar-lining:before {
left: auto;
right: 0;
}
/* Hide secondary menus when the tray is horizontal. */
-.toolbar-oriented .horizontal .menu li ul {
+.toolbar-oriented .toolbar-tray-horizontal .menu li ul {
display: none;
}
/* When the configured standard breakpoint is active and the tray is in a
* horizontal position, the tray is fixed to the top of the viewport and does
* not scroll with the page contents. */
-body.toolbar-paneled .toolbar .horizontal {
+body.toolbar-paneled .toolbar .toolbar-tray-horizontal {
position: fixed;
}
/* When the configured standard breakpoint is active and the tray is in a
* vertical position, the tray does not scroll with the page. The contents of
* the tray scroll within the confines of the viewport. */
-body.toolbar-paneled .toolbar .vertical {
+body.toolbar-paneled .toolbar .toolbar-tray-vertical {
height: 100%;
overflow-x: hidden;
overflow-y: auto;
position: fixed;
}
-.toolbar .tray.active {
+.toolbar .toolbar-tray.active {
display: block;
}
/* Bring the tray into the viewport. By default it is just off-screen. */
-.toolbar-oriented .vertical.active {
+.toolbar-oriented .toolbar-tray-vertical.active {
left: 0; /* LTR */
}
-[dir="rtl"] .toolbar-oriented .vertical.active {
+[dir="rtl"] .toolbar-oriented .toolbar-tray-vertical.active {
left: auto;
right: 0;
}
@@ -216,28 +216,28 @@ body.toolbar-vertical.toolbar-paneled {
*/
/* Hide the orientation toggle when the configured narrow breakpoint is not
* active. */
-.toolbar .tray .toggle-orientation {
+.toolbar .toolbar-tray .toolbar-toggle-orientation {
display: none;
}
/* Show the orientation toggle when the configured narrow breakpoint is
* active. */
-.toolbar-oriented .tray .toggle-orientation {
+.toolbar-oriented .toolbar-tray .toolbar-toggle-orientation {
display: block;
}
-.toolbar-oriented .horizontal .toggle-orientation {
+.toolbar-oriented .toolbar-tray-horizontal .toolbar-toggle-orientation {
bottom: 0;
position: absolute;
right: 0; /* LTR */
top: auto;
}
-[dir="rtl"] .toolbar-oriented .horizontal .toggle-orientation {
+[dir="rtl"] .toolbar-oriented .toolbar-tray-horizontal .toolbar-toggle-orientation {
left: 0;
right: auto;
}
-.toolbar-oriented .vertical .toggle-orientation {
+.toolbar-oriented .toolbar-tray-vertical .toolbar-toggle-orientation {
float: right; /* LTR */
width: 100%;
}
-[dir="rtl"] .toolbar-oriented .vertical .toggle-orientation {
+[dir="rtl"] .toolbar-oriented .toolbar-tray-vertical .toolbar-toggle-orientation {
float: left;
}
diff --git a/core/modules/toolbar/css/toolbar.theme.css b/core/modules/toolbar/css/toolbar.theme.css
index 1761198..1d64296 100644
--- a/core/modules/toolbar/css/toolbar.theme.css
+++ b/core/modules/toolbar/css/toolbar.theme.css
@@ -26,26 +26,26 @@
/**
* Toolbar bar.
*/
-.toolbar .bar {
+.toolbar .toolbar-bar {
background-color: #0f0f0f;
box-shadow: -1px 0 3px 1px rgba(0, 0, 0, 0.3333); /* LTR */
color: #dddddd;
}
-[dir="rtl"] .toolbar .bar {
+[dir="rtl"] .toolbar .toolbar-bar {
box-shadow: 1px 0 3px 1px rgba(0, 0, 0, 0.3333);
}
-.toolbar .bar a {
+.toolbar .toolbar-bar a {
color: #ffffff;
}
-.toolbar .bar .tab > a {
+.toolbar .toolbar-bar .toolbar-tab > a {
font-weight: bold;
}
-.toolbar .bar .tab > a:hover {
+.toolbar .toolbar-bar .toolbar-tab > a:hover {
background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0.125) 20%, transparent 200%);
background-image: linear-gradient(rgba(255, 255, 255, 0.125) 20%, transparent 200%);
text-decoration: none;
}
-.toolbar .bar .tab > a.active {
+.toolbar .toolbar-bar .toolbar-tab > a.active {
background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0.25) 20%, transparent 200%);
background-image: linear-gradient(rgba(255, 255, 255, 0.25) 20%, transparent 200%);
}
@@ -53,97 +53,97 @@
/**
* Toolbar tray.
*/
-.toolbar .tray {
+.toolbar .toolbar-tray {
background-color: #ffffff;
}
-.toolbar .horizontal > .lining {
+.toolbar .toolbar-tray-horizontal > .toolbar-lining {
padding-right: 5em; /* LTR */
}
-[dir="rtl"] .toolbar .horizontal > .lining {
+[dir="rtl"] .toolbar .toolbar-tray-horizontal > .toolbar-lining {
padding-right: 0;
padding-left: 5em;
}
-.toolbar .vertical > .lining:before {
+.toolbar .toolbar-tray-vertical > .toolbar-lining:before {
background-color: #ffffff;
border-right: 1px solid #aaaaaa; /* LTR */
box-shadow: -1px 0 5px 2px rgba(0, 0, 0, 0.3333); /* LTR */
}
-[dir="rtl"] .toolbar .vertical > .lining:before {
+[dir="rtl"] .toolbar .toolbar-tray-vertical > .toolbar-lining:before {
border-left: 1px solid #aaaaaa;
border-right: 0 none;
box-shadow: 1px 0 5px 2px rgba(0, 0, 0, 0.3333);
}
-.toolbar .horizontal {
+.toolbar .toolbar-tray-horizontal {
border-bottom: 1px solid #aaaaaa;
box-shadow: -2px 1px 3px 1px rgba(0, 0, 0, 0.3333); /* LTR */
}
-[dir="rtl"] .toolbar .horizontal {
+[dir="rtl"] .toolbar .toolbar-tray-horizontal {
box-shadow: 2px 1px 3px 1px rgba(0, 0, 0, 0.3333);
}
-.toolbar .horizontal .tray {
+.toolbar .toolbar-tray-horizontal .toolbar-tray {
background-color: #f5f5f5;
}
-.toolbar .tray a {
+.toolbar .toolbar-tray a {
color: #707070;
}
-.toolbar .tray a:hover,
-.toolbar .tray a:active,
-.toolbar .tray a.active {
+.toolbar .toolbar-tray a:hover,
+.toolbar .toolbar-tray a:active,
+.toolbar .toolbar-tray a.active {
color: #000;
}
-.toolbar .horizontal .menu {
+.toolbar .toolbar-tray-horizontal .menu {
background-color: #ffffff;
}
-.toolbar .horizontal .menu li + li {
+.toolbar .toolbar-tray-horizontal .menu li + li {
border-left: 1px solid #dddddd; /* LTR */
}
-[dir="rtl"] .toolbar .horizontal .menu li + li {
+[dir="rtl"] .toolbar .toolbar-tray-horizontal .menu li + li {
border-left: 0 none ;
border-right: 1px solid #dddddd;
}
-.toolbar .horizontal .menu li:last-child {
+.toolbar .toolbar-tray-horizontal .menu li:last-child {
border-right: 1px solid #dddddd; /* LTR */
}
-[dir="rtl"] .toolbar .horizontal .menu li:last-child {
+[dir="rtl"] .toolbar .toolbar-tray-horizontal .menu li:last-child {
border-left: 1px solid #dddddd;
}
-.toolbar .vertical .menu li + li {
+.toolbar .toolbar-tray-vertical .menu li + li {
border-top: 1px solid #dddddd;
}
-.toolbar .vertical .menu li:last-child {
+.toolbar .toolbar-tray-vertical .menu li:last-child {
border-bottom: 1px solid #dddddd;
}
-.toolbar .vertical .menu .menu li {
+.toolbar .toolbar-tray-vertical .menu .menu li {
border: 0 none;
}
-.toolbar .vertical .menu ul ul {
+.toolbar .toolbar-tray-vertical .menu ul ul {
border-bottom: 1px solid #dddddd;
border-top: 1px solid #dddddd;
}
-.toolbar .vertical .menu li:last-child > ul {
+.toolbar .toolbar-tray-vertical .menu li:last-child > ul {
border-bottom: 0;
}
-.toolbar .vertical .menu .menu .menu {
+.toolbar .toolbar-tray-vertical .menu .menu .menu {
margin-left: 1.3333em; /* LTR */
}
-[dir="rtl"] .toolbar .vertical .menu .menu .menu {
+[dir="rtl"] .toolbar .toolbar-tray-vertical .menu .menu .menu {
margin-left: 0;
margin-right: 1.3333em;
}
-.toolbar .vertical .menu .menu .menu .menu {
+.toolbar .toolbar-tray-vertical .menu .menu .menu .menu {
margin-left: 0.25em; /* LTR */
}
-[dir="rtl"] .toolbar .vertical .menu .menu .menu .menu {
+[dir="rtl"] .toolbar .toolbar-tray-vertical .menu .menu .menu .menu {
margin-left: 0;
margin-right: 0.25em;
}
.toolbar .menu .menu a {
color: #434343;
}
-.toolbar .vertical .menu .menu .menu a {
+.toolbar .toolbar-tray-vertical .menu .menu .menu a {
padding-left: 0.6667em; /* LTR */
}
-[dir="rtl"] .toolbar .vertical .menu .menu .menu a {
+[dir="rtl"] .toolbar .toolbar-tray-vertical .menu .menu .menu a {
padding-left: 0;
padding-right: 0.5em;
}
@@ -151,25 +151,25 @@
/**
* Orientation toggle.
*/
-.toolbar .toggle-orientation {
+.toolbar .toolbar-toggle-orientation {
background-color: #f5f5f5;
padding: 0.6667em;
}
-.toolbar .horizontal .toggle-orientation {
+.toolbar .toolbar-tray-horizontal .toolbar-toggle-orientation {
border-left: 1px solid #c9c9c9; /* LTR */
}
-[dir="rtl"] .toolbar .horizontal .toggle-orientation {
+[dir="rtl"] .toolbar .toolbar-tray-horizontal .toolbar-toggle-orientation {
border-left: 0 none;
border-right: 1px solid #c9c9c9;
}
-.toolbar .toggle-orientation > .lining {
+.toolbar .toolbar-toggle-orientation > .toolbar-lining {
float: right; /* LTR */
padding: 0.1667em;
}
-[dir="rtl"] .toolbar .toggle-orientation > .lining {
+[dir="rtl"] .toolbar .toolbar-toggle-orientation > .toolbar-lining {
float: left;
}
-.toolbar .toggle-orientation button {
+.toolbar .toolbar-toggle-orientation button {
cursor: pointer;
display: inline-block;
height: 16px;
@@ -177,19 +177,19 @@
text-indent: -999em;
width: 20px;
}
-.toolbar .toggle-orientation button:before {
+.toolbar .toolbar-toggle-orientation button:before {
left: 0; /* LTR */
}
-[dir="rtl"] .toolbar .toggle-orientation button:before {
+[dir="rtl"] .toolbar .toolbar-toggle-orientation button:before {
left: auto;
right: 0;
}
-.toolbar .toggle-orientation [value="vertical"]:before {
+.toolbar .toolbar-toggle-orientation [value="vertical"]:before {
background-image: url('../images/icon-toggle-vertical.png'); /* LTR */
}
-[dir="rtl"] .toolbar .toggle-orientation [value="vertical"]:before {
+[dir="rtl"] .toolbar .toolbar-toggle-orientation [value="vertical"]:before {
background-image: url('../images/icon-toggle-vertical-rtl.png');
}
-.toolbar .toggle-orientation [value="horizontal"]:before {
+.toolbar .toolbar-toggle-orientation [value="horizontal"]:before {
background-image: url('../images/icon-toggle-horizontal.png');
}
diff --git a/core/modules/toolbar/js/toolbar.js b/core/modules/toolbar/js/toolbar.js
index 4dfc1c8..dea38b5 100644
--- a/core/modules/toolbar/js/toolbar.js
+++ b/core/modules/toolbar/js/toolbar.js
@@ -72,10 +72,10 @@ Drupal.behaviors.toolbar = {
// readers.
$messages = $(Drupal.theme('toolbarMessageBox')).appendTo($toolbar);
// Store the trays in a scoped variable.
- $trays = $toolbar.find('.tray');
+ $trays = $toolbar.find('.toolbar-tray');
$trays
// Add the tray orientation toggles.
- .find('.lining')
+ .find('.toolbar-lining')
.append(Drupal.theme('toolbarOrientationToggle'));
// Store media queries and attach a handler.
mql.narrow = window.matchMedia(options.breakpoints['module.toolbar.narrow']);
@@ -100,8 +100,8 @@ Drupal.behaviors.toolbar = {
.on('drupalViewportOffsetChange.toolbar', Drupal.toolbar.adjustPlacement);
// Attach behaviors to the toolbar.
$toolbar
- .on('click.toolbar', '.bar a', Drupal.toolbar.toggleTray)
- .on('click.toolbar', '.toggle-orientation button', Drupal.toolbar.orientationChangeHandler);
+ .on('click.toolbar', '.toolbar-bar a', Drupal.toolbar.toggleTray)
+ .on('click.toolbar', '.toolbar-toggle-orientation button', Drupal.toolbar.orientationChangeHandler);
// Restore the open tab. Only open the tab on wide screens.
if (activeTab && window.matchMedia(options.breakpoints['module.toolbar.standard']).matches) {
$toolbar.find('[data-toolbar-tray="' + activeTab + '"]').trigger('click.toolbar');
@@ -145,7 +145,7 @@ Drupal.toolbar.toggleTray = function (event) {
var $tab = $(event.target);
var name = $tab.attr('data-toolbar-tray');
// Activate the selected tab and associated tray.
- var $activateTray = $toolbar.find('[data-toolbar-tray="' + name + '"].tray').toggleClass('active');
+ var $activateTray = $toolbar.find('[data-toolbar-tray="' + name + '"].toolbar-tray').toggleClass('active');
if ($activateTray.length) {
event.preventDefault();
event.stopPropagation();
@@ -166,12 +166,12 @@ Drupal.toolbar.toggleTray = function (event) {
localStorage.removeItem('Drupal.toolbar.activeTab');
}
// Disable non-selected tabs and trays.
- $toolbar.find('.bar .trigger')
+ $toolbar.find('.toolbar-bar .trigger')
.not($tab)
.removeClass('active')
// Set aria-pressed to false.
.prop('aria-pressed', false);
- $toolbar.find('.tray').not($activateTray).removeClass('active');
+ $toolbar.find('.toolbar-tray').not($activateTray).removeClass('active');
}
// Update the page and toolbar dimension indicators.
updatePeripherals();
@@ -190,20 +190,20 @@ Drupal.toolbar.toggleTray = function (event) {
Drupal.toolbar.adjustPlacement = function (event, offsets) {
if (!mql.narrow.matches) {
var $body = $('body');
- var $trays = $toolbar.find('.tray');
+ var $trays = $toolbar.find('.toolbar-tray');
// Alter the padding on the top of the body element.
$body.css('padding-top', 0);
$trays.css('padding-top', 0);
// Remove any orientation classes. Make vertical the default for trays.
$body.removeClass('toolbar-vertical toolbar-horizontal');
- $trays.removeClass('horizontal').addClass('vertical');
+ $trays.removeClass('toolbar-tray-horizontal').addClass('toolbar-tray-vertical');
}
else {
// Alter the padding on the top of the body element.
$('body').css('padding-top', offsets.top);
// The navbar container is invisible. Its placement is used to determine the
// container for the trays.
- $toolbar.find('.tray').css('padding-top', $toolbar.find('.bar').outerHeight());
+ $toolbar.find('.toolbar-tray').css('padding-top', $toolbar.find('.toolbar-bar').outerHeight());
}
};
@@ -217,13 +217,13 @@ Drupal.toolbar.setTrayWidth = function () {
var dir = document.documentElement.dir;
var edge = (dir === 'rtl') ? 'right' : 'left';
// Remove the side offset from the trays.
- $toolbar.find('.tray').removeAttr('data-offset-' + edge + ' data-offset-top');
+ $toolbar.find('.toolbar-tray').removeAttr('data-offset-' + edge + ' data-offset-top');
// If the page is wider than the narrow media query, apply offset attributes.
if (mql.narrow.matches) {
// If an active vertical tray exists, mark it as an offset element.
- $toolbar.find('.tray.vertical.active').attr('data-offset-' + edge, '');
+ $toolbar.find('.toolbar-tray.toolbar-tray-vertical.active').attr('data-offset-' + edge, '');
// If an active horizontal tray exists, mark it as an offset element.
- $toolbar.find('.tray.horizontal.active').attr('data-offset-top', '');
+ $toolbar.find('.toolbar-tray.toolbar-tray-horizontal.active').attr('data-offset-top', '');
}
// Trigger a recalculation of viewport displacing elements.
Drupal.displace();
@@ -233,7 +233,7 @@ Drupal.toolbar.setTrayWidth = function () {
* Respond to configured narrow media query changes.
*/
Drupal.toolbar.narrowMediaQueryChangeHandler = function (mql) {
- var $bar = $toolbar.find('.bar');
+ var $bar = $toolbar.find('.toolbar-bar');
if (mql.matches) {
$bar.attr('data-offset-top', '');
}
@@ -303,8 +303,8 @@ function changeOrientation (newOrientation, isLock) {
}
if ((!locked && newOrientation === 'horizontal') || newOrientation === 'vertical') {
$trays
- .removeClass('horizontal vertical')
- .addClass(newOrientation);
+ .removeClass('toolbar-tray-horizontal toolbar-tray-vertical')
+ .addClass('toolbar-tray-' + newOrientation);
orientation = newOrientation;
toggleOrientationToggle((newOrientation === 'vertical') ? 'horizontal' : 'vertical');
}
@@ -330,14 +330,14 @@ function toggleOrientationToggle (orientation) {
vertical: Drupal.t('Vertical orientation')
};
var antiOrientation = (orientation === 'vertical') ? 'horizontal' : 'vertical';
- var iconClass = 'icon-toggle-' + orientation;
- var iconAntiClass = 'icon-toggle-' + antiOrientation;
+ var iconClass = 'toolbar-icon-toggle-' + orientation;
+ var iconAntiClass = 'toolbar-icon-toggle-' + antiOrientation;
// Append a message that the tray orientation has been changed.
setMessage(Drupal.t('Tray orientation changed to @orientation.', {
'@orientation': antiOrientation
}));
// Change the tray orientation.
- $trays.find('.toggle-orientation button')
+ $trays.find('.toolbar-toggle-orientation button')
.val(orientation)
.text(strings[orientation])
.removeClass(iconAntiClass)
@@ -376,8 +376,8 @@ function setMessage (message) {
* A string representing a DOM fragment.
*/
Drupal.theme.toolbarOrientationToggle = function () {
- return '<div class="toggle-orientation"><div class="lining">' +
- '<button class="icon" type="button"></button>' +
+ return '<div class="toolbar-toggle-orientation"><div class="toolbar-lining">' +
+ '<button class="toolbar-icon" type="button"></button>' +
'</div></div>';
};
diff --git a/core/modules/toolbar/js/toolbar.menu.js b/core/modules/toolbar/js/toolbar.menu.js
index 3c32c50..4671fce 100644
--- a/core/modules/toolbar/js/toolbar.menu.js
+++ b/core/modules/toolbar/js/toolbar.menu.js
@@ -46,7 +46,7 @@ var activeItem = drupalSettings.basePath + drupalSettings.currentPath;
* simply toggling its presence.
*/
function toggleList ($item, switcher) {
- var $toggle = $item.find('> .box > .handle');
+ var $toggle = $item.find('> .toolbar-box > .toolbar-handle');
switcher = (typeof switcher !== 'undefined') ? switcher : !$item.hasClass('open');
// Toggle the item open state.
$item.toggleClass('open', switcher);
@@ -63,27 +63,27 @@ var activeItem = drupalSettings.basePath + drupalSettings.currentPath;
*
* Items with sub-elements have a list toggle attached to them. Menu item
* links and the corresponding list toggle are wrapped with in a div
- * classed with .box. The .box div provides a positioning context for the
- * item list toggle.
+ * classed with .toolbar-box. The .toolbar-box div provides a positioning
+ * context for the item list toggle.
*
* @param {jQuery} $menu
* The root of the menu to be initialized.
*/
function initItems ($menu) {
var options = {
- 'class': 'icon handle',
+ 'class': 'toolbar-icon toolbar-handle',
'action': ui.handleOpen,
'text': ''
};
// Initialize items and their links.
- $menu.find('li > a').wrap('<div class="box">');
+ $menu.find('li > a').wrap('<div class="toolbar-box">');
// Add a handle to each list item if it has a menu.
$menu.find('li').each(function (index, element) {
var $item = $(element);
if ($item.find('> ul.menu').length) {
- var $box = $item.find('> .box');
+ var $box = $item.children('.toolbar-box');
options.text = Drupal.t('@label', {'@label': $box.find('a').text()});
- $item.find('> .box')
+ $item.children('.toolbar-box')
.append(Drupal.theme('toolbarMenuItemToggle', options));
}
});
@@ -130,7 +130,7 @@ var activeItem = drupalSettings.basePath + drupalSettings.currentPath;
}
// Bind event handlers.
$(document)
- .on('click.toolbar', '.handle', toggleClickHandler);
+ .on('click.toolbar', '.toolbar-handle', toggleClickHandler);
// Return the jQuery object.
return this.each(function (selector) {
var $menu = $(this).once('toolbar-menu');
diff --git a/core/modules/toolbar/toolbar.api.php b/core/modules/toolbar/toolbar.api.php
index 9bf59f9..412331f 100644
--- a/core/modules/toolbar/toolbar.api.php
+++ b/core/modules/toolbar/toolbar.api.php
@@ -16,9 +16,9 @@
* The toolbar is a container for adminstrative and site-global interactive
* components.
*
- * The toolbar provides a common styling for items denoted by the .tab class.
- * The theme wrapper toolbar_tab_wrapper is provided to wrap a toolbar item
- * with the appropriate markup to apply the styling.
+ * The toolbar provides a common styling for items denoted by the
+ * .toolbar-tab class. The theme wrapper toolbar_tab_wrapper is provided to wrap
+ * a toolbar item with the appropriate markup to apply the styling.
*
* The toolbar provides a construct called a 'tray'. The tray is a container
* for content. The tray may be associated with a toggle in the adminstration
@@ -77,7 +77,7 @@ function hook_toolbar() {
'#options' => array(
'attributes' => array(
'title' => t('Home page'),
- 'class' => array('icon', 'icon-home'),
+ 'class' => array('toolbar-icon', 'toolbar-icon-home'),
),
),
),
diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module
index f54d715..bae1b07 100644
--- a/core/modules/toolbar/toolbar.module
+++ b/core/modules/toolbar/toolbar.module
@@ -90,7 +90,7 @@ function toolbar_element_info() {
'#heading' => t('Toolbar items'),
'#attributes' => array(
'id' => 'toolbar-bar',
- 'class' => array('bar', 'clearfix',),
+ 'class' => array('toolbar-bar', 'clearfix',),
),
),
);
@@ -283,7 +283,7 @@ function toolbar_pre_render_item($element) {
$element['tray']['#wrapper_attributes'] = array();
}
$element['tray']['#wrapper_attributes'] += $attributes;
- $element['tray']['#wrapper_attributes']['class'][] = 'tray';
+ $element['tray']['#wrapper_attributes']['class'][] = 'toolbar-tray';
if (!isset($element['tray']['#theme_wrappers'])) {
$element['tray']['#theme_wrappers'] = array();
@@ -307,7 +307,7 @@ function template_preprocess_toolbar_tab_wrapper(&$variables) {
if (!isset($variables['element']['#wrapper_attributes'])) {
$variables['element']['#wrapper_attributes'] = array();
}
- $variables['element']['#wrapper_attributes']['class'][] = 'tab';
+ $variables['element']['#wrapper_attributes']['class'][] = 'toolbar-tab';
}
/**
@@ -360,7 +360,7 @@ function theme_toolbar_tab_wrapper(&$variables) {
function theme_toolbar_tray_wrapper(&$variables) {
if (!empty($variables['element']['#children'])) {
$element = $variables['element'];
- return '<div' . new Attribute($element['#wrapper_attributes']) . '><div class="lining clearfix">' . $element['#children'] . '</div></div>';
+ return '<div' . new Attribute($element['#wrapper_attributes']) . '><div class="toolbar-lining clearfix">' . $element['#children'] . '</div></div>';
}
}
@@ -411,7 +411,7 @@ function toolbar_toolbar() {
'#options' => array(
'attributes' => array(
'title' => t('Home page'),
- 'class' => array('icon', 'icon-home'),
+ 'class' => array('toolbar-icon', 'toolbar-icon-home'),
),
),
),
@@ -453,7 +453,7 @@ function toolbar_toolbar() {
'#options' => array(
'attributes' => array(
'title' => t('Admin menu'),
- 'class' => array('icon', 'icon-menu'),
+ 'class' => array('toolbar-icon', 'toolbar-icon-menu'),
),
),
),
@@ -509,8 +509,8 @@ function toolbar_menu_navigation_links(&$tree) {
$tree[$key]['link']['localized_options']['attributes'] = array(
'id' => 'toolbar-link-' . str_replace(array('/', '<', '>'), array('-', '', ''), $item['link']['link_path']),
'class' => array(
- 'icon',
- 'icon-' . strtolower(str_replace(' ', '-', $item['link']['link_title'])),
+ 'toolbar-icon',
+ 'toolbar-icon-' . strtolower(str_replace(' ', '-', $item['link']['link_title'])),
),
'title' => check_plain($item['link']['description']),
);
diff --git a/core/modules/tour/css/tour.module.css b/core/modules/tour/css/tour.module.css
index f8796f3..afb0afd 100644
--- a/core/modules/tour/css/tour.module.css
+++ b/core/modules/tour/css/tour.module.css
@@ -4,10 +4,10 @@
*/
/* Tab appearance. */
-.toolbar .bar .tour-toolbar-tab.tab {
+.toolbar .toolbar-bar .tour-toolbar-tab.toolbar-tab {
float: right; /* LTR */
}
-[dir="rtl"] .toolbar .bar .tour-toolbar-tab.tab {
+[dir="rtl"] .toolbar .toolbar-bar .tour-toolbar-tab.toolbar-tab {
float: left;
}
.toolbar .tour-toolbar-tab button {
@@ -41,6 +41,6 @@
}
/* @todo Remove once http://drupal.org/node/1916690 is resolved. */
-.toolbar .tour-toolbar-tab.tab.hidden {
+.toolbar .tour-toolbar-tab.toolbar-tab.hidden {
display: none;
}
diff --git a/core/modules/tour/tour.module b/core/modules/tour/tour.module
index 48e44f6..4f9ea1b 100644
--- a/core/modules/tour/tour.module
+++ b/core/modules/tour/tour.module
@@ -83,7 +83,7 @@ function tour_toolbar() {
'#tag' => 'button',
'#value' => t('Tour'),
'#attributes' => array(
- 'class' => array('icon', 'icon-help'),
+ 'class' => array('toolbar-icon', 'toolbar-icon-help'),
'role' => 'button',
'aria-pressed' => 'false',
),
diff --git a/core/modules/user/css/user.module.css b/core/modules/user/css/user.module.css
index c8c0317..900a60d 100644
--- a/core/modules/user/css/user.module.css
+++ b/core/modules/user/css/user.module.css
@@ -110,10 +110,10 @@ div.password-suggestions ul {
/**
* Toolbar icon.
*/
-.icon-user:before {
+.toolbar-icon-user:before {
background-image: url(../images/icon-user.png);
}
-.icon-user:active:before,
-.icon-user.active:before {
+.toolbar-icon-user:active:before,
+.toolbar-icon-user.active:before {
background-image: url(../images/icon-user-active.png);
}
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index cb1ab7e..50580ff 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -2129,7 +2129,7 @@ function user_toolbar() {
'#options' => array(
'attributes' => array(
'title' => t('My account'),
- 'class' => array('icon', 'icon-user'),
+ 'class' => array('toolbar-icon', 'toolbar-icon-user'),
),
),
),