Issue #2349711 by lauriii, mortendk, sqndr, akalata, yannickoo, Manjit.Singh, Jolidog, b0unty, aliyakhan, LewisNyman: Remove all visual from stark

8.0.x
Alex Pott 2015-06-19 05:51:52 -05:00
parent d579f51362
commit b1ffbb0068
8 changed files with 19 additions and 141 deletions

View File

@ -296,19 +296,19 @@ class MenuRouterTest extends WebTestBase {
*/
protected function doTestThemeCallbackOptionalTheme() {
// Request a theme that is not installed.
$this->drupalGet('menu-test/theme-callback/use-stark-theme');
$this->drupalGet('menu-test/theme-callback/use-test-theme');
$this->assertText('Active theme: bartik. Actual theme: bartik.', 'The theme negotiation system falls back on the default theme when a theme that is not installed is requested.');
$this->assertRaw('bartik/css/base/elements.css', "The default theme's CSS appears on the page.");
// Now install the theme and request it again.
$theme_handler = $this->container->get('theme_handler');
$theme_handler->install(array('stark'));
$theme_handler->install(array('test_theme'));
$this->drupalGet('menu-test/theme-callback/use-stark-theme');
$this->assertText('Active theme: stark. Actual theme: stark.', 'The theme negotiation system uses an optional theme once it has been installed.');
$this->assertRaw('stark/css/layout.css', "The optional theme's CSS appears on the page.");
$this->drupalGet('menu-test/theme-callback/use-test-theme');
$this->assertText('Active theme: test_theme. Actual theme: test_theme.', 'The theme negotiation system uses an optional theme once it has been installed.');
$this->assertRaw('test_theme/kitten.css', "The optional theme's CSS appears on the page.");
$theme_handler->uninstall(array('stark'));
$theme_handler->uninstall(array('test_theme'));
}
/**

View File

@ -94,13 +94,13 @@ class ThemeInfoTest extends WebTestBase {
$active_theme = $this->themeManager->getActiveTheme();
// Make sure we are not testing the wrong theme.
$this->assertEqual('test_theme', $active_theme->getName());
$this->assertEqual(['classy/base'], $active_theme->getLibraries());
$this->assertEqual(['classy/base', 'test_theme/global-styling'], $active_theme->getLibraries());
// @see theme_test_system_info_alter()
$this->state->set('theme_test.modify_info_files', TRUE);
drupal_flush_all_caches();
$active_theme = $this->themeManager->getActiveTheme();
$this->assertEqual(['classy/base', 'core/backbone'], $active_theme->getLibraries());
$this->assertEqual(['classy/base', 'test_theme/global-styling', 'core/backbone'], $active_theme->getLibraries());
}
}

View File

@ -35,8 +35,8 @@ class TestThemeNegotiator implements ThemeNegotiatorInterface {
return \Drupal::config('system.theme')->get('admin');
}
// Test using a theme that exists, but may or may not be installed.
elseif ($argument == 'use-stark-theme') {
return 'stark';
elseif ($argument == 'use-test-theme') {
return 'test_theme';
}
// Test using a theme that does not exist.
elseif ($argument == 'use-fake-theme') {

View File

@ -16,6 +16,8 @@ base theme: classy
core: 8.x
stylesheets-remove:
- '@system/css/system.module.css'
libraries:
- test_theme/global-styling
regions:
content: Content
left: Left

View File

@ -0,0 +1,5 @@
global-styling:
version: VERSION
css:
base:
kitten.css: {}

View File

@ -10,9 +10,7 @@ default markup without the interference of changes commonly made by more
complex themes.
To avoid obscuring CSS added to the page by Drupal or a contrib module, the
Stark theme itself has no styling, except just enough CSS to arrange the page
in a traditional "Header, sidebars, content, and footer" layout. See the
layout.css file for more information.
Stark theme itself has no styling.
ABOUT DRUPAL THEMING

View File

@ -1,123 +0,0 @@
/**
* @file
* Stark layout method
*
* To avoid obscuring CSS added to the page by Drupal or a contrib module, the
* Stark theme itself has no styling, except just enough CSS to arrange the page
* in a traditional "Header, sidebars, content, and footer" layout.
*
* This layout method works reasonably well, but shouldn't be used on a
* production site because it can break. For example, if an over-large image
* (one that is wider than 20% of the viewport) is in the left sidebar, the
* image will overlap with the .layout-content to the right.
*/
img {
height: auto;
max-width: 100%;
}
main:after {
content: "";
display: table;
clear: both;
}
.layout-content,
.layout-sidebar-first,
.layout-sidebar-second {
display: inline;
position: relative;
}
details,
summary {
display: block;
}
@media all and (min-width: 480px) and (max-width: 959px) {
.layout-content {
width: 67%;
float: right; /* LTR */
}
[dir="rtl"] .layout-content {
float: left;
}
.layout-sidebar-first {
width: 33%;
float: left; /* LTR */
}
[dir="rtl"] .layout-sidebar-first {
float: right;
}
.layout-sidebar-second {
float: right; /* LTR */
clear: both;
width: 100%;
}
[dir="rtl"] .layout-sidebar-second {
float: right;
clear: right;
}
.layout-sidebar-second .block {
float: left; /* LTR */
width: 33%;
}
[dir="rtl"] .layout-sidebar-second .block {
float: right;
}
.layout-sidebar-second .block:nth-child(3n+1) {
clear: both;
}
}
@media all and (min-width: 960px) {
.layout-content {
width: 60%;
float: left; /* LTR */
left: 20%; /* LTR */
}
[dir="rtl"] .layout-content {
float: right;
left: 0;
right: 20%;
}
.layout-sidebar-first {
width: 20%;
float: left; /* LTR */
left: -60%; /* LTR */
}
[dir="rtl"] .layout-sidebar-first {
float: right;
left: 0;
right: -60%;
}
.layout-sidebar-second {
float: right; /* LTR */
width: 20%;
}
[dir="rtl"] .layout-sidebar-second {
float: left;
}
}
/**
* Responsive tables.
*/
@media screen and (max-width:28.125em) { /* 450px */
th.priority-low,
td.priority-low,
th.priority-medium,
td.priority-medium {
display: none;
}
}
@media screen and (max-width:45em) { /* 720px */
th.priority-low,
td.priority-low {
display: none;
}
}

View File

@ -1,10 +1,6 @@
name: Stark
type: theme
description: 'An intentionally plain theme with almost no styling to demonstrate default Drupals HTML and CSS. Learn how to build a custom theme from Stark in the <a href="https://www.drupal.org/theme-guide">Theming Guide</a>.'
description: 'An intentionally plain theme with no styling to demonstrate default Drupals HTML and CSS. Learn how to build a custom theme from Stark in the <a href="https://www.drupal.org/theme-guide">Theming Guide</a>.'
package: Core
version: VERSION
core: 8.x
libraries:
- stark/global-styling
stylesheets-remove:
- core/assets/vendor/normalize-css/normalize.css