Issue #2085673 by Wim Leers: Remove all remaining '-rtl.css' references.
parent
c4dd26c022
commit
79abddbee8
|
@ -1526,14 +1526,7 @@ function drupal_add_html_head_link($attributes, $header = FALSE) {
|
||||||
* example, system-menus.css rather than simply menus.css. Themes can
|
* example, system-menus.css rather than simply menus.css. Themes can
|
||||||
* override module-supplied CSS files based on their filenames, and this
|
* override module-supplied CSS files based on their filenames, and this
|
||||||
* prefixing helps prevent confusing name collisions for theme developers.
|
* prefixing helps prevent confusing name collisions for theme developers.
|
||||||
* See drupal_get_css() where the overrides are performed. Also, if the
|
* See drupal_get_css() where the overrides are performed.
|
||||||
* direction of the current language is right-to-left (Hebrew, Arabic,
|
|
||||||
* etc.), the function will also look for an RTL CSS file and append it to
|
|
||||||
* the list. The name of this file should have an '-rtl.css' suffix. For
|
|
||||||
* example, a CSS file called 'mymodule-name.css' will have a
|
|
||||||
* 'mymodule-name-rtl.css' file added to the list, if exists in the same
|
|
||||||
* directory. This CSS file should contain overrides for properties which
|
|
||||||
* should be reversed or otherwise different in a right-to-left display.
|
|
||||||
* - 'inline': A string of CSS that should be placed in the given scope. Note
|
* - 'inline': A string of CSS that should be placed in the given scope. Note
|
||||||
* that it is better practice to use 'file' stylesheets, rather than
|
* that it is better practice to use 'file' stylesheets, rather than
|
||||||
* 'inline', as the CSS would then be aggregated and cached.
|
* 'inline', as the CSS would then be aggregated and cached.
|
||||||
|
@ -1699,10 +1692,6 @@ function drupal_add_css($data = NULL, $options = NULL) {
|
||||||
* modules/system/system-menus.css. This allows themes to override complete
|
* modules/system/system-menus.css. This allows themes to override complete
|
||||||
* CSS files, rather than specific selectors, when necessary.
|
* CSS files, rather than specific selectors, when necessary.
|
||||||
*
|
*
|
||||||
* If the original CSS file is being overridden by a theme, the theme is
|
|
||||||
* responsible for supplying an accompanying RTL CSS file to replace the
|
|
||||||
* module's.
|
|
||||||
*
|
|
||||||
* @param $css
|
* @param $css
|
||||||
* (optional) An array of CSS files. If no array is provided, the default
|
* (optional) An array of CSS files. If no array is provided, the default
|
||||||
* stylesheets array is used instead.
|
* stylesheets array is used instead.
|
||||||
|
|
|
@ -25,9 +25,6 @@
|
||||||
{{ head }}
|
{{ head }}
|
||||||
<base href="{{ base_url }}" />
|
<base href="{{ base_url }}" />
|
||||||
<link type="text/css" rel="stylesheet" href="misc/print.css" />
|
<link type="text/css" rel="stylesheet" href="misc/print.css" />
|
||||||
{% if language_rtl %}
|
|
||||||
<link type="text/css" rel="stylesheet" href="misc/print-rtl.css" />
|
|
||||||
{% endif %}
|
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
{#
|
{#
|
||||||
|
|
|
@ -369,15 +369,10 @@ function color_scheme_form_submit($form, &$form_state) {
|
||||||
// Rewrite theme stylesheets.
|
// Rewrite theme stylesheets.
|
||||||
$css = array();
|
$css = array();
|
||||||
foreach ($info['css'] as $stylesheet) {
|
foreach ($info['css'] as $stylesheet) {
|
||||||
// Build a temporary array with LTR and RTL files.
|
// Build a temporary array with CSS files.
|
||||||
$files = array();
|
$files = array();
|
||||||
if (file_exists($paths['source'] . $stylesheet)) {
|
if (file_exists($paths['source'] . $stylesheet)) {
|
||||||
$files[] = $stylesheet;
|
$files[] = $stylesheet;
|
||||||
|
|
||||||
$rtl_file = str_replace('.css', '-rtl.css', $stylesheet);
|
|
||||||
if (file_exists($paths['source'] . $rtl_file)) {
|
|
||||||
$files[] = $rtl_file;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach ($files as $file) {
|
foreach ($files as $file) {
|
||||||
|
|
|
@ -9,7 +9,6 @@ stylesheets:
|
||||||
- style.css
|
- style.css
|
||||||
stylesheets-override:
|
stylesheets-override:
|
||||||
- vertical-tabs.css
|
- vertical-tabs.css
|
||||||
- vertical-tabs-rtl.css
|
|
||||||
- jquery.ui.theme.css
|
- jquery.ui.theme.css
|
||||||
settings:
|
settings:
|
||||||
# @todo D8: Remove once themes have to be installed.
|
# @todo D8: Remove once themes have to be installed.
|
||||||
|
|
Loading…
Reference in New Issue