Commit d2f3e353 authored by alexpott's avatar alexpott

Revert "Issue"

This reverts commit fb07e7bb.
parent fb07e7bb
......@@ -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/components/action-links.css');
$this->assertRaw('classy/css/layout.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/components/action-links.css');
$this->assertRaw('classy/css/layout.css');
}
}
......@@ -71,16 +71,16 @@ function testStylesheets() {
// should work nevertheless.
$this->drupalGet('theme-test/info/stylesheets');
$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' => "$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' => "$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");
$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");
// Verify that CSS files with the same name are loaded from both the base theme and subtheme.
$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");
$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");
}
......
......@@ -19,6 +19,28 @@ 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 }}>
<ul{{ attributes.addClass('menu') }}>
{% else %}
<ul>
<ul class="menu">
{% endif %}
{% for item in items %}
<li{{ item.attributes }}>
......
......@@ -5,6 +5,8 @@ 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,46 +2,23 @@ base:
version: VERSION
css:
component:
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 }
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 }
css/components/more-link.css: { weight: -10 }
css/components/exposed-filters.css: { weight: -10 }
theme:
css/layout.css: {}
book-navigation:
version: VERSION
css:
component:
css/components/book-navigation.css: {}
theme:
css/navigation/book.theme.css: {}
indented:
drupal.comment.threaded:
version: VERSION
css:
component:
css/components/indented.css: {}
messages:
version: VERSION
css:
component:
css/components/messages.css: { weight: -10 }
theme:
css/comment/comment.theme.css: {}
node:
version: VERSION
......@@ -49,14 +26,8 @@ node:
component:
css/components/node.css: { weight: -10 }
progress:
search.results:
version: VERSION
css:
component:
css/components/progress.css: { weight: -10 }
search-results:
version: VERSION
css:
component:
css/components/search-results.css: {}
theme:
css/search/search.theme.css: {}
/**
* @file
* Classy layout file. Do NOT delete. Needed for testing.
*
* @see \Drupal\system\Tests\Installer\InstallerTranslationTest::testInstaller()
*/
......@@ -2,7 +2,6 @@
* @file
* Stylesheet for results generated by the Search module.
*/
.search-results {
ol.search-results {
list-style: none;
}
......@@ -65,7 +65,7 @@
*/
#}
{% if threaded %}
{{ attach_library('classy/indented') }}
{{ attach_library('classy/drupal.comment.threaded') }}
{% endif %}
{%
set classes = [
......
......@@ -56,7 +56,7 @@
* @see template_preprocess_search_result()
*/
#}
{{ attach_library('classy/search-results') }}
{{ attach_library('classy/search.results') }}
{{ title_prefix }}
<h3{{ title_attributes.addClass('search-result__title') }}>
<a href="{{ url }}">{{ title }}</a>
......
......@@ -11,7 +11,6 @@
* - message: A string containing information to be displayed.
*/
#}
{{ attach_library('classy/progress') }}
<div class="progress" data-drupal-progress>
{% if label %}
<div class="progress__label">{{ label }}</div>
......
......@@ -23,7 +23,6 @@
* @see template_preprocess_status_messages()
*/
#}
{{ attach_library('classy/messages') }}
{% block messages %}
{% for type, messages in message_list %}
{%
......
......@@ -10,6 +10,7 @@ libraries:
- seven/global-styling
stylesheets-remove:
- core/assets/vendor/jquery.ui/themes/base/dialog.css
- '@classy/css/layout.css'
quickedit_stylesheets:
- css/components/quickedit.css
regions:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment