Skip to content
Snippets Groups Projects
Commit 6586221c authored by Alex Pott's avatar Alex Pott
Browse files

Issue #2566597 by Cottser, LewisNyman, mdrummond, pjbaert, jaxxed,...

Issue #2566597 by Cottser, LewisNyman, mdrummond, pjbaert, jaxxed, ManuelGarcia, emma.maria, maked1sky, davidhernandez: [Mega patch] Move system *.theme.css files to Classy
parent c584816a
No related branches found
No related tags found
2 merge requests!7452Issue #1797438. HTML5 validation is preventing form submit and not fully...,!789Issue #3210310: Adjust Database API to remove deprecated Drupal 9 code in Drupal 10
Showing
with 52 additions and 47 deletions
......@@ -96,7 +96,7 @@ public function testInstaller() {
$edit = array('preprocess_css' => FALSE);
$this->drupalPostForm('admin/config/development/performance', $edit, t('Save configuration'));
$this->drupalGet('<front>');
$this->assertRaw('classy/css/layout.css');
$this->assertRaw('classy/css/components/action-links.css');
// Verify the strings from the translation files were imported.
$test_samples = ['Save and continue', 'Anonymous'];
......
......@@ -33,6 +33,6 @@ function testRequestListener() {
$this->assertRaw('Themed output generated in a KernelEvents::REQUEST listener');
// Verify that the default theme's CSS still appears even though the theme
// system was initialized early.
$this->assertRaw('classy/css/layout.css');
$this->assertRaw('classy/css/components/action-links.css');
}
}
......@@ -71,16 +71,16 @@ function testStylesheets() {
// should work nevertheless.
$this->drupalGet('theme-test/info/stylesheets');
$this->assertIdentical(1, count($this->xpath('//style[contains(text(), :text)]', array(':text' => "$base/base-add.css"))), "$base/base-add.css found");
$this->assertIdentical(0, count($this->xpath('//style[contains(text(), :text)]', array(':text' => "base-remove.css"))), "base-remove.css not found");
$this->assertIdentical(1, count($this->xpath('//link[contains(@href, :href)]', array(':href' => "$base/base-add.css"))), "$base/base-add.css found");
$this->assertIdentical(0, count($this->xpath('//link[contains(@href, :href)]', array(':href' => "base-remove.css"))), "base-remove.css not found");
$this->assertIdentical(1, count($this->xpath('//style[contains(text(), :text)]', array(':text' => "$sub/sub-add.css"))), "$sub/sub-add.css found");
$this->assertIdentical(0, count($this->xpath('//style[contains(text(), :text)]', array(':text' => "sub-remove.css"))), "sub-remove.css not found");
$this->assertIdentical(0, count($this->xpath('//style[contains(text(), :text)]', array(':text' => "base-add.sub-remove.css"))), "base-add.sub-remove.css not found");
$this->assertIdentical(1, count($this->xpath('//link[contains(@href, :href)]', array(':href' => "$sub/sub-add.css"))), "$sub/sub-add.css found");
$this->assertIdentical(0, count($this->xpath('//link[contains(@href, :href)]', array(':href' => "sub-remove.css"))), "sub-remove.css not found");
$this->assertIdentical(0, count($this->xpath('//link[contains(@href, :href)]', array(':href' => "base-add.sub-remove.css"))), "base-add.sub-remove.css not found");
// Verify that CSS files with the same name are loaded from both the base theme and subtheme.
$this->assertIdentical(1, count($this->xpath('//style[contains(text(), :text)]', array(':text' => "$base/samename.css"))), "$base/samename.css found");
$this->assertIdentical(1, count($this->xpath('//style[contains(text(), :text)]', array(':text' => "$sub/samename.css"))), "$sub/samename.css found");
$this->assertIdentical(1, count($this->xpath('//link[contains(@href, :href)]', array(':href' => "$base/samename.css"))), "$base/samename.css found");
$this->assertIdentical(1, count($this->xpath('//link[contains(@href, :href)]', array(':href' => "$sub/samename.css"))), "$sub/samename.css found");
}
......
......@@ -19,28 +19,6 @@ base:
css/components/resize.module.css: { weight: -10 }
css/components/sticky-header.module.css: { weight: -10 }
css/components/tabledrag.module.css: { weight: -10 }
theme:
css/components/action-links.theme.css: { weight: -10 }
css/components/breadcrumb.theme.css: { weight: -10 }
css/components/button.theme.css: { weight: -10 }
css/components/collapse-processed.theme.css: { weight: -10 }
css/components/container-inline.theme.css: { weight: -10 }
css/components/details.theme.css: { weight: -10 }
css/components/field.theme.css: { weight: -10 }
css/components/form.theme.css: { weight: -10 }
css/components/icons.theme.css: { weight: -10 }
css/components/inline-form.theme.css: { weight: -10 }
css/components/item-list.theme.css: { weight: -10 }
css/components/link.theme.css: { weight: -10 }
css/components/links.theme.css: { weight: -10 }
css/components/menu.theme.css: { weight: -10 }
css/components/messages.theme.css: { weight: -10 }
css/components/progress.theme.css: { weight: -10 }
css/components/tableselect.theme.css: { weight: -10 }
css/components/tabledrag.theme.css: { weight: -10 }
css/components/tablesort.theme.css: { weight: -10 }
css/components/tabs.theme.css: { weight: -10 }
css/components/textarea.theme.css: { weight: -10 }
css/components/tree-child.module.css: { weight: -10 }
admin:
......
......@@ -27,9 +27,9 @@
{% import _self as menus %}
{% if items %}
{% if menu_level == 0 %}
<ul{{ attributes.addClass('menu') }}>
<ul{{ attributes }}>
{% else %}
<ul class="menu">
<ul>
{% endif %}
{% for item in items %}
<li{{ item.attributes }}>
......
......@@ -5,8 +5,6 @@ description: 'A flexible, recolorable theme with many regions and a responsive,
package: Core
version: VERSION
core: 8.x
stylesheets-remove:
- '@classy/css/layout.css'
libraries:
- bartik/global-styling
ckeditor_stylesheets:
......
......@@ -2,23 +2,46 @@ base:
version: VERSION
css:
component:
css/components/pager.css: { weight: -10 }
css/components/more-link.css: { weight: -10 }
css/components/action-links.css: { weight: -10 }
css/components/breadcrumb.css: { weight: -10 }
css/components/button.css: { weight: -10 }
css/components/collapse-processed.css: { weight: -10 }
css/components/container-inline.css: { weight: -10 }
css/components/details.css: { weight: -10 }
css/components/exposed-filters.css: { weight: -10 }
theme:
css/layout.css: {}
css/components/field.css: { weight: -10 }
css/components/form.css: { weight: -10 }
css/components/icons.css: { weight: -10 }
css/components/inline-form.css: { weight: -10 }
css/components/item-list.css: { weight: -10 }
css/components/link.css: { weight: -10 }
css/components/links.css: { weight: -10 }
css/components/menu.css: { weight: -10 }
css/components/more-link.css: { weight: -10 }
css/components/pager.css: { weight: -10 }
css/components/tabledrag.css: { weight: -10 }
css/components/tableselect.css: { weight: -10 }
css/components/tablesort.css: { weight: -10 }
css/components/tabs.css: { weight: -10 }
css/components/textarea.css: { weight: -10 }
book-navigation:
version: VERSION
css:
theme:
css/navigation/book.theme.css: {}
component:
css/components/book-navigation.css: {}
drupal.comment.threaded:
indented:
version: VERSION
css:
theme:
css/comment/comment.theme.css: {}
component:
css/components/indented.css: {}
messages:
version: VERSION
css:
component:
css/components/messages.css: { weight: -10 }
node:
version: VERSION
......@@ -26,8 +49,14 @@ node:
component:
css/components/node.css: { weight: -10 }
search.results:
progress:
version: VERSION
css:
theme:
css/search/search.theme.css: {}
component:
css/components/progress.css: { weight: -10 }
search-results:
version: VERSION
css:
component:
css/components/search-results.css: {}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment