diff --git a/core/modules/shortcut/shortcut-rtl.css b/core/modules/shortcut/shortcut-rtl.css deleted file mode 100644 index 5dec957..0000000 --- a/core/modules/shortcut/shortcut-rtl.css +++ /dev/null @@ -1,48 +0,0 @@ - -div#toolbar a#edit-shortcuts { - position: absolute; - left: 0; - top: 0; - padding: 5px 5px 5px 10px; -} -div#toolbar div.toolbar-shortcuts ul { - float: none; - margin-right: 5px; - margin-left: 10em; -} -div#toolbar div.toolbar-shortcuts ul li a { - margin-left: 5px; - margin-right: 0; - padding: 0 5px; -} -div#toolbar div.toolbar-shortcuts span.icon { - float: right; -} -div.add-or-remove-shortcuts a span.icon { - float: right; - margin-right: 8px; - margin-left: 0; -} -div.add-or-remove-shortcuts a span.text { - float: right; - padding-right: 10px; - padding-left: 0; -} -div.add-or-remove-shortcuts a:focus span.text, -div.add-or-remove-shortcuts a:hover span.text { - -moz-border-radius: 5px 0 0 5px; - -webkit-border-top-left-radius: 5px; - -webkit-border-bottom-left-radius: 5px; - border-radius: 5px 0 0 5px; - padding-left: 6px; -} -#shortcut-set-switch .form-item-new { - padding-right: 17px; - padding-left: 0; -} -div.add-shortcut a:hover span.icon { - background-position: 0 -24px; -} -div.remove-shortcut a:hover span.icon { - background-position: -12px -24px; -} diff --git a/core/modules/shortcut/shortcut.admin.css b/core/modules/shortcut/shortcut.admin.css index 8ca03be..435c0e4 100644 --- a/core/modules/shortcut/shortcut.admin.css +++ b/core/modules/shortcut/shortcut.admin.css @@ -1,8 +1,9 @@ +/** + * @file + * Admin styling for the shortcut module. + */ + .shortcut-slot-hidden { display: none; } - -div.form-item-set div.form-item-new { - display: inline; -} diff --git a/core/modules/shortcut/shortcut.base-rtl.css b/core/modules/shortcut/shortcut.base-rtl.css new file mode 100644 index 0000000..f92c74b --- /dev/null +++ b/core/modules/shortcut/shortcut.base-rtl.css @@ -0,0 +1,30 @@ + +/** + * @file + * Generic RTL base styles for shortcut module. + */ + +/** + * Toolbar. + */ +#toolbar #edit-shortcuts { + position: absolute; + left: 0; + top: 0; +} +#shortcut-toolbar ul { + float: none; +} +#shortcut-toolbar .icon { + float: right; +} + +/** + * Add/remove links. + */ +.add-or-remove-shortcuts a .icon { + float: right; +} +.add-or-remove-shortcuts a .text { + float: right; +} diff --git a/core/modules/shortcut/shortcut.base.css b/core/modules/shortcut/shortcut.base.css new file mode 100644 index 0000000..9892808 --- /dev/null +++ b/core/modules/shortcut/shortcut.base.css @@ -0,0 +1,39 @@ + +/** + * @file + * Generic base styles for shortcut module. + */ + +/** + * Toolbar. + */ +#toolbar #edit-shortcuts { + float: right; +} +#shortcut-toolbar ul { + float: left; /* LTR */ +} +#shortcut-toolbar .icon { + float: left; /* LTR */ +} + +/** + * Add/remove links. + */ +.add-or-remove-shortcuts { + display: inline-block; + *zoom: 1; + *display: inline; +} +.add-or-remove-shortcuts a .icon { + display: block; + float: left; +} +.add-or-remove-shortcuts a .text { + float: left; + display: none; +} +.add-or-remove-shortcuts a:focus .text, +.add-or-remove-shortcuts a:hover .text { + display: block; +} diff --git a/core/modules/shortcut/shortcut.css b/core/modules/shortcut/shortcut.css deleted file mode 100644 index 3afcb94..0000000 --- a/core/modules/shortcut/shortcut.css +++ /dev/null @@ -1,106 +0,0 @@ -div#toolbar a#edit-shortcuts { - float: right; - padding: 5px 10px 5px 5px; - line-height: 24px; - color: #fefefe; -} -div#toolbar a#edit-shortcuts:focus, -div#toolbar a#edit-shortcuts:hover, -div#toolbar a#edit-shortcuts.active { - color: #fff; - text-decoration: underline; -} - -div#toolbar div.toolbar-shortcuts ul { - padding: 5px 0 2px 0; - height: 28px; - line-height: 24px; - float: left; /* LTR */ - margin-left:5px; /* LTR */ -} - -div#toolbar div.toolbar-shortcuts ul li a { - padding: 0 5px 0 5px; - margin-right: 5px; /* LTR */ - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - border-radius: 5px; -} - -div#toolbar div.toolbar-shortcuts ul li a:focus, -div#toolbar div.toolbar-shortcuts ul li a:hover, -div#toolbar div.toolbar-shortcuts ul li a.active:focus { - background: #555; -} - -div#toolbar div.toolbar-shortcuts ul li a.active:hover, -div#toolbar div.toolbar-shortcuts ul li a.active { - background: #000; -} - -div#toolbar div.toolbar-shortcuts span.icon { - float: left; /* LTR */ - background: #444; - width: 30px; - height: 30px; - margin-right: 5px; /* LTR */ - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - border-radius: 5px; -} - -div.add-or-remove-shortcuts { - padding-top: 5px; -} - -div.add-or-remove-shortcuts a span.icon { - display: block; - width: 12px; - background: transparent url(shortcut.png) no-repeat scroll 0 0; - height: 12px; - float: left; - margin-left:8px; -} - -div.add-shortcut a:focus span.icon, -div.add-shortcut a:hover span.icon { - background-position: 0 -12px; -} -div.remove-shortcut a span.icon { - background-position: -12px 0; -} -div.remove-shortcut a:focus span.icon, -div.remove-shortcut a:hover span.icon { - background-position: -12px -12px; -} - -div.add-or-remove-shortcuts a span.text { - float: left; - padding-left:10px; - display: none; -} - -div.add-or-remove-shortcuts a:focus span.text, -div.add-or-remove-shortcuts a:hover span.text { - font-size: 10px; - line-height: 12px; - color: #fff; - background-color: #5f605b; - display: block; - padding-right: 6px; /* LTR */ - cursor: pointer; - -moz-border-radius: 0 5px 5px 0; /* LTR */ - -webkit-border-top-right-radius: 5px; /* LTR */ - -webkit-border-bottom-right-radius: 5px; /* LTR */ - border-radius: 0 5px 5px 0; /* LTR */ -} - -#shortcut-set-switch .form-type-radios { - padding-bottom: 0; - margin-bottom: 0; -} - -#shortcut-set-switch .form-item-new { - padding-top: 0; - padding-left: 17px; /* LTR */ -} diff --git a/core/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module index f8ddcc2..695e5bb 100644 --- a/core/modules/shortcut/shortcut.module +++ b/core/modules/shortcut/shortcut.module @@ -683,10 +683,15 @@ 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') . '/shortcut.css')), + '#attached' => array( + 'css' => array( + drupal_get_path('module', 'shortcut') . '/shortcut.base.css', + drupal_get_path('module', 'shortcut') . '/shortcut.theme.css', + ), + ), '#prefix' => '
', '#type' => 'link', - '#title' => '' . $link_text . '', + '#title' => ''. t('Add or remove shortcut') .'' . $link_text . '', '#href' => $link_path, '#options' => array('query' => $query, 'html' => TRUE), '#suffix' => '
', @@ -711,8 +716,13 @@ function shortcut_page_alter(&$page) { */ function shortcut_toolbar_pre_render($toolbar) { $links = shortcut_renderable_links(); - $links['#attached'] = array('css' => array(drupal_get_path('module', 'shortcut') . '/shortcut.css')); - $links['#prefix'] = '
'; + $links['#attached'] = array( + 'css' => array( + drupal_get_path('module', 'shortcut') . '/shortcut.base.css', + drupal_get_path('module', 'shortcut') . '/shortcut.theme.css', + ), + ); + $links['#prefix'] = '
'; $links['#suffix'] = '
'; $shortcut_set = shortcut_current_displayed_set(); $configure_link = NULL; diff --git a/core/modules/shortcut/shortcut.theme-rtl.css b/core/modules/shortcut/shortcut.theme-rtl.css new file mode 100644 index 0000000..37792e4 --- /dev/null +++ b/core/modules/shortcut/shortcut.theme-rtl.css @@ -0,0 +1,48 @@ + +/** + * @file + * RTL styling for the shortcut module. + */ + +/** + * Toolbar. + */ +#toolbar #edit-shortcuts { + padding: 5px 5px 5px 10px; +} +#shortcut-toolbar ul { + margin-right: 5px; + margin-left: 10em; +} +#shortcut-toolbar li a { + margin-left: 5px; + margin-right: 0; + padding: 0 5px; +} + +/** + * Add/remove links. + */ +.add-or-remove-shortcuts a .icon { + margin-right: 8px; + margin-left: 0; + text-indent: -10000px; +} +.add-or-remove-shortcuts a .text { + padding-right: 10px; + padding-left: 0; +} +.add-or-remove-shortcuts a:focus .text, +.add-or-remove-shortcuts a:hover .text { + -moz-border-radius: 5px 0 0 5px; + -webkit-border-top-left-radius: 5px; + -webkit-border-bottom-left-radius: 5px; + border-radius: 5px 0 0 5px; + padding-left: 6px; +} +div.add-shortcut a:hover .icon { + background-position: 0 -24px; +} +div.remove-shortcut a:hover .icon { + background-position: -12px -24px; +} diff --git a/core/modules/shortcut/shortcut.theme.css b/core/modules/shortcut/shortcut.theme.css new file mode 100644 index 0000000..a96c084 --- /dev/null +++ b/core/modules/shortcut/shortcut.theme.css @@ -0,0 +1,90 @@ + +/** + * @file + * Styling for the shortcut module. + */ + +/** + * Toolbar. + */ +#toolbar #edit-shortcuts { + padding: 5px 10px 5px 5px; + line-height: 24px; +} +#toolbar #edit-shortcuts:focus, +#toolbar #edit-shortcuts:hover, +#toolbar #edit-shortcuts.active { + text-decoration: underline; +} +#shortcut-toolbar ul { + padding: 5px 0; + line-height: 24px; + margin-left: 5px; /* LTR */ +} +#shortcut-toolbar li a { + padding: 0 5px 0 5px; + margin-right: 5px; /* LTR */ + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; +} +#shortcut-toolbar li a:focus, +#shortcut-toolbar li a:hover, +#shortcut-toolbar li a.active:focus { + background: #555; +} +#shortcut-toolbar li a.active:hover, +#shortcut-toolbar li a.active { + background-color: #000; +} +#shortcut-toolbar .icon { + background-color: #444; + width: 30px; + height: 30px; + margin-right: 5px; /* LTR */ + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; +} + +/** + * Add/remove links. + */ +.add-or-remove-shortcuts { + padding-top: 5px; +} +.add-or-remove-shortcuts a .icon { + width: 12px; + background: transparent url(shortcut.png) no-repeat scroll 0 0; + height: 12px; + margin-left: 8px; + text-indent: 12px; + overflow: hidden; +} +.add-shortcut a:focus .icon, +.add-shortcut a:hover .icon { + background-position: 0 -12px; +} +.remove-shortcut a .icon { + background-position: -12px 0; +} +.remove-shortcut a:focus .icon, +.remove-shortcut a:hover .icon { + background-position: -12px -12px; +} +.add-or-remove-shortcuts a .text { + padding-left: 10px; +} +.add-or-remove-shortcuts a:focus .text, +.add-or-remove-shortcuts a:hover .text { + font-size: 10px; + line-height: 12px; + color: #fff; + background-color: #5f605b; + padding-right: 6px; /* LTR */ + cursor: pointer; + -moz-border-radius: 0 5px 5px 0; /* LTR */ + -webkit-border-top-right-radius: 5px; /* LTR */ + -webkit-border-bottom-right-radius: 5px; /* LTR */ + border-radius: 0 5px 5px 0; /* LTR */ +}