Update to drupal 8.0.0-rc1. For more information, see https://www.drupal.org/node/2582663
This commit is contained in:
Greg Anderson
parent
eb34d130a8
commit
f32e58e4b1
8476 changed files with 211648 additions and 170042 deletions
|
|
@ -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:
|
||||
|
|
@ -33,4 +31,3 @@ regions:
|
|||
footer_third: 'Footer third'
|
||||
footer_fourth: 'Footer fourth'
|
||||
footer_fifth: 'Footer fifth'
|
||||
|
||||
|
|
|
|||
|
|
@ -20,10 +20,12 @@ global-styling:
|
|||
css/components/forum.css: {}
|
||||
css/components/header.css: {}
|
||||
css/components/help.css: {}
|
||||
css/components/highlighted.css: {}
|
||||
css/components/item-list.css: {}
|
||||
css/components/list-group.css: {}
|
||||
css/components/list.css: {}
|
||||
css/components/main-content.css: {}
|
||||
css/components/menu.css: {}
|
||||
css/components/messages.css: {}
|
||||
css/components/node.css: {}
|
||||
css/components/node-preview.css: {}
|
||||
|
|
@ -31,14 +33,16 @@ global-styling:
|
|||
css/components/pager.css: {}
|
||||
css/components/panel.css: {}
|
||||
css/components/primary-menu.css: {}
|
||||
css/components/search.css: {}
|
||||
css/components/search-form.css: {}
|
||||
css/components/search-results.css: {}
|
||||
css/components/secondary-menu.css: {}
|
||||
css/components/shortcut.css: {}
|
||||
css/components/skip-link.css: {}
|
||||
css/components/sidebar.css: {}
|
||||
css/components/site-branding.css: {}
|
||||
css/components/site-footer.css: {}
|
||||
css/components/table.css: {}
|
||||
css/components/tablesort-indicator.css: {}
|
||||
css/components/tabs.css: {}
|
||||
css/components/toolbar.css: {}
|
||||
css/components/featured-bottom.css: {}
|
||||
|
|
|
|||
|
|
@ -39,10 +39,7 @@ function bartik_preprocess_html(&$variables) {
|
|||
/**
|
||||
* Implements hook_preprocess_HOOK() for page templates.
|
||||
*/
|
||||
function bartik_preprocess_page(&$variables) {
|
||||
// Set the options that apply to both page and maintenance page.
|
||||
_bartik_process_page($variables);
|
||||
|
||||
function bartik_preprocess_page_title(&$variables) {
|
||||
// Since the title and the shortcut link are both block level elements,
|
||||
// positioning them next to each other is much simpler with a wrapper div.
|
||||
if (!empty($variables['title_suffix']['add_or_remove_shortcut']) && $variables['title']) {
|
||||
|
|
@ -75,9 +72,6 @@ function bartik_preprocess_maintenance_page(&$variables) {
|
|||
|
||||
// Bartik has custom styling for the maintenance page.
|
||||
$variables['#attached']['library'][] = 'bartik/maintenance_page';
|
||||
|
||||
// Set the options that apply to both page and maintenance page.
|
||||
_bartik_process_page($variables);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -109,21 +103,23 @@ function bartik_preprocess_menu(&$variables) {
|
|||
}
|
||||
|
||||
/**
|
||||
* Helper function for handling the site name and slogan.
|
||||
* Implements hook_theme_suggestions_HOOK_alter() for form templates.
|
||||
*/
|
||||
function _bartik_process_page(&$variables) {
|
||||
$site_config = \Drupal::config('system.site');
|
||||
// Always print the site name and slogan, but if they are toggled off, we'll
|
||||
// just hide them visually.
|
||||
$variables['hide_site_name'] = theme_get_setting('features.name') ? FALSE : TRUE;
|
||||
$variables['hide_site_slogan'] = theme_get_setting('features.slogan') ? FALSE : TRUE;
|
||||
if ($variables['hide_site_name']) {
|
||||
// If toggle_name is FALSE, the site_name will be empty, so we rebuild it.
|
||||
$variables['site_name'] = $site_config->get('name');
|
||||
}
|
||||
if ($variables['hide_site_slogan']) {
|
||||
// If toggle_site_slogan is FALSE, the site_slogan will be empty, so we
|
||||
// rebuild it.
|
||||
$variables['site_slogan']['#markup'] = $site_config->get('slogan');
|
||||
function bartik_theme_suggestions_form_alter(array &$suggestions, array $variables) {
|
||||
if ($variables['element']['#form_id'] == 'search_block_form') {
|
||||
$suggestions[] = 'form__search_block_form';
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Implements hook_form_alter() to add classes to the search form.
|
||||
*/
|
||||
function bartik_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
|
||||
if (in_array($form_id, ['search_block_form', 'search_form'])) {
|
||||
$key = ($form_id == 'search_block_form') ? 'actions' : 'basic';
|
||||
if (!isset($form[$key]['submit']['#attributes'])) {
|
||||
$form[$key]['submit']['#attributes'] = new Attribute();
|
||||
}
|
||||
$form[$key]['submit']['#attributes']->addClass('search-form__submit');
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,10 +5,6 @@
|
|||
* Lists available colors and color schemes for the Bartik theme.
|
||||
*/
|
||||
|
||||
// Put the logo path into JavaScript for the live preview.
|
||||
$js_attached['#attached']['drupalSettings']['color']['logo'] = theme_get_setting('logo.url', 'bartik');
|
||||
drupal_process_attached($js_attached);
|
||||
|
||||
$info = array(
|
||||
// Available colors and color labels used in theme.
|
||||
'fields' => array(
|
||||
|
|
@ -121,4 +117,14 @@ $info = array(
|
|||
// Preview files.
|
||||
'preview_library' => 'bartik/color.preview',
|
||||
'preview_html' => 'color/preview.html',
|
||||
|
||||
// Attachments.
|
||||
'#attached' => [
|
||||
'drupalSettings' => [
|
||||
'color' => [
|
||||
// Put the logo path into JavaScript for the live preview.
|
||||
'logo' => theme_get_setting('logo.url', 'bartik'),
|
||||
],
|
||||
],
|
||||
],
|
||||
);
|
||||
|
|
|
|||
|
|
@ -132,3 +132,20 @@ img {
|
|||
max-width: 100%;
|
||||
height: auto;
|
||||
}
|
||||
ul, ol {
|
||||
margin: 0;
|
||||
padding: 0 0 0.25em 1em; /* LTR */
|
||||
}
|
||||
[dir="rtl"] ul,
|
||||
[dir="rtl"] ol {
|
||||
padding: 0 1em 0.25em 0;
|
||||
}
|
||||
ol ol,
|
||||
ul ul {
|
||||
margin: 0;
|
||||
padding: 0 0 0.25em 1em; /* LTR */
|
||||
}
|
||||
[dir="rtl"] ol ol,
|
||||
[dir="rtl"] ul ul {
|
||||
padding: 0 1em 0.25em 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,11 +46,12 @@ a:active,
|
|||
.region-header,
|
||||
.region-header a,
|
||||
.region-header li a.is-active,
|
||||
#name-and-slogan,
|
||||
.site-branding-block,
|
||||
#name-and-slogan a,
|
||||
.site-branding-block a,
|
||||
.region-secondary-menu .menu-item a {
|
||||
.site-branding__text,
|
||||
.site-branding,
|
||||
.site-branding__text a,
|
||||
.site-branding a,
|
||||
.region-secondary-menu .menu-item a,
|
||||
.region-secondary-menu .menu-item a.is-active {
|
||||
color: #fffeff;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,16 +7,3 @@
|
|||
.block .content {
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
/* List in block. */
|
||||
.block ol,
|
||||
.block ul {
|
||||
margin: 0;
|
||||
padding: 0 0 0.25em 1em; /* LTR */
|
||||
}
|
||||
[dir="rtl"] .block ol,
|
||||
[dir="rtl"] .block ul {
|
||||
padding: 0 1em 0.25em 0;
|
||||
/* This is required to win over specifity of [dir="rtl"] ul.menu */
|
||||
margin-right: 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,3 +7,6 @@
|
|||
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
font-size: 0.929em;
|
||||
}
|
||||
.region-breadcrumb {
|
||||
padding: 0 15px 0.25em;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,6 +10,9 @@
|
|||
#content .comment-wrapper h2.comment-form__title {
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
.field-node--comment {
|
||||
font-size: 0.934em;
|
||||
}
|
||||
.comment {
|
||||
margin-bottom: 19px;
|
||||
vertical-align: top;
|
||||
|
|
@ -61,6 +64,7 @@
|
|||
border: 1px solid #d3d7d9;
|
||||
font-size: 0.929em;
|
||||
line-height: 1.6;
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
.comment__content:before {
|
||||
|
|
|
|||
|
|
@ -82,7 +82,6 @@
|
|||
.field--name-field-tags ul.links {
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
list-style: none;
|
||||
}
|
||||
.field--name-field-tags ul.links li {
|
||||
float: left; /* LTR */
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ textarea {
|
|||
@media screen and (max-width: 60em) { /* 920px */
|
||||
input,
|
||||
textarea {
|
||||
font-size: 1.142857143em;
|
||||
font-size: 16px;
|
||||
}
|
||||
}
|
||||
textarea {
|
||||
|
|
|
|||
|
|
@ -1,3 +1,8 @@
|
|||
/**
|
||||
* @file
|
||||
* Visual styles for forums in Bartik.
|
||||
*/
|
||||
|
||||
.forum__name {
|
||||
font-size: 1.083em;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,112 +6,38 @@
|
|||
position: relative;
|
||||
}
|
||||
.region-header {
|
||||
float: right; /* LTR */
|
||||
margin: .5em 5px .75em;
|
||||
padding: 0.357em 15px 0;
|
||||
}
|
||||
[dir="rtl"] .region-header {
|
||||
float: left;
|
||||
.region-header .site-branding {
|
||||
margin-top: 0.429em;
|
||||
}
|
||||
@media all and (min-width: 461px) and (max-width: 900px) {
|
||||
.region-header {
|
||||
margin: .5em 5px .75em;
|
||||
@media all and (min-width: 461px) {
|
||||
.region-header .block {
|
||||
float: right; /* LTR */
|
||||
margin-top: 0.357em;
|
||||
}
|
||||
[dir="rtl"] .region-header .block {
|
||||
float: left;
|
||||
}
|
||||
.region-header .site-branding {
|
||||
float: left; /* LTR */
|
||||
/* margin-bottom: 1.857em;*/
|
||||
}
|
||||
[dir="rtl"] .region-header .site-branding {
|
||||
float: right;
|
||||
}
|
||||
}
|
||||
@media all and (min-width: 901px) {
|
||||
.region-header {
|
||||
margin: 1em 5px 1.5em;
|
||||
}
|
||||
}
|
||||
#logo,
|
||||
.site-logo {
|
||||
float: left; /* LTR */
|
||||
padding: 4px 4px 4px 9px; /* LTR */
|
||||
}
|
||||
[dir="rtl"] #logo,
|
||||
[dir="rtl"] .site-logo {
|
||||
padding: 4px 9px 4px 4px;
|
||||
}
|
||||
@media all and (min-width: 461px) and (max-width: 900px) {
|
||||
#logo,
|
||||
.site-logo {
|
||||
padding: 5px 0 0 5px; /* LTR */
|
||||
}
|
||||
[dir="rtl"] #logo,
|
||||
[dir="rtl"] .site-logo {
|
||||
padding: 5px 5px 0 0;
|
||||
}
|
||||
}
|
||||
@media all and (min-width: 901px) {
|
||||
#logo,
|
||||
.site-logo {
|
||||
padding: 9px 4px 4px 9px; /* LTR */
|
||||
}
|
||||
[dir="rtl"] #logo,
|
||||
[dir="rtl"] .site-logo {
|
||||
padding: 9px 9px 4px 4px;
|
||||
}
|
||||
}
|
||||
#name-and-slogan,
|
||||
.site-branding-text {
|
||||
float: left; /* LTR */
|
||||
margin: 0;
|
||||
padding: 5px 10px 8px;
|
||||
}
|
||||
[dir="rtl"] #name-and-slogan,
|
||||
[dir="rtl"] .site-branding-text {
|
||||
margin: 0 15px 30px 0;
|
||||
}
|
||||
@media all and (min-width: 461px) and (max-width: 900px) {
|
||||
#name-and-slogan,
|
||||
.site-branding-text {
|
||||
padding: 10px 10px 8px;
|
||||
}
|
||||
}
|
||||
@media all and (min-width: 901px) {
|
||||
#name-and-slogan,
|
||||
.site-branding-text {
|
||||
padding: 26px 0 0;
|
||||
margin: 0 0 30px 15px; /* LTR */
|
||||
}
|
||||
[dir="rtl"] #name-and-slogan,
|
||||
[dir="rtl"] .site-branding-text {
|
||||
margin: 0 15px 30px 0;
|
||||
}
|
||||
}
|
||||
#site-name,
|
||||
.site-name {
|
||||
font-size: 1.6em;
|
||||
color: #686868;
|
||||
line-height: 1;
|
||||
}
|
||||
@media all and (min-width: 901px) {
|
||||
#site-name,
|
||||
.site-name {
|
||||
font-size: 1.821em;
|
||||
}
|
||||
}
|
||||
h1#site-name,
|
||||
h1.site-name {
|
||||
margin: 0;
|
||||
}
|
||||
#site-name a,
|
||||
.site-name a {
|
||||
font-weight: normal;
|
||||
}
|
||||
#site-slogan,
|
||||
.site-slogan {
|
||||
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
font-size: 0.929em;
|
||||
margin-top: 7px;
|
||||
word-spacing: 0.1em;
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
/* Region header blocks. */
|
||||
.region-header .block {
|
||||
.region-header .block:not(.site-branding) {
|
||||
font-size: 0.857em;
|
||||
float: left; /* LTR */
|
||||
margin: 0 10px;
|
||||
padding: 0;
|
||||
margin: 0 0 1em;
|
||||
clear: right;
|
||||
}
|
||||
@media all and (min-width: 901px) {
|
||||
.region-header .block:not(.site-branding) {
|
||||
margin: 1.167em 0 1em;
|
||||
}
|
||||
}
|
||||
.region-header .block > h2 {
|
||||
/* @extend .visually-hidden */
|
||||
|
|
@ -125,7 +51,6 @@ h1.site-name {
|
|||
padding: 0;
|
||||
}
|
||||
.region-header .block ul {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
.region-header .block li {
|
||||
|
|
@ -133,6 +58,9 @@ h1.site-name {
|
|||
list-style-image: none;
|
||||
padding: 0;
|
||||
}
|
||||
.region-header .branding {
|
||||
font-size: 1em;
|
||||
}
|
||||
.region-header .form-text {
|
||||
background: #fefefe;
|
||||
background: rgba(255, 255, 255, 0.7);
|
||||
|
|
@ -146,8 +74,8 @@ h1.site-name {
|
|||
margin-right: 0;
|
||||
}
|
||||
.region-header .form-text:hover,
|
||||
.region-header .form-text:active,
|
||||
.region-header .form-text:focus {
|
||||
.region-header .form-text:focus,
|
||||
.region-header .form-text:active {
|
||||
background: #fff;
|
||||
background: rgba(255, 255, 255, 0.8);
|
||||
}
|
||||
|
|
@ -170,15 +98,15 @@ h1.site-name {
|
|||
padding: 3px 7px;
|
||||
}
|
||||
.region-header .block-menu li a:hover,
|
||||
.region-header .block-menu li a:active,
|
||||
.region-header .block-menu li a:focus {
|
||||
.region-header .block-menu li a:focus,
|
||||
.region-header .block-menu li a:active {
|
||||
text-decoration: none;
|
||||
background: rgba(255, 255, 255, 0.15);
|
||||
}
|
||||
.region-header .block-menu li:last-child a {
|
||||
border-bottom: 0;
|
||||
}
|
||||
/* User Login block in the header region */
|
||||
/* User Login block in the header region. */
|
||||
.region-header #block-user-login {
|
||||
width: auto;
|
||||
}
|
||||
|
|
@ -236,14 +164,21 @@ h1.site-name {
|
|||
background: #fff;
|
||||
background: rgba(255, 255, 255, 0.9);
|
||||
}
|
||||
/* Search block in region header. */
|
||||
/* Search block in header region. */
|
||||
.region-header #block-search-form {
|
||||
width: 208px;
|
||||
}
|
||||
.region-header #block-search-form .form-text {
|
||||
width: 154px;
|
||||
}
|
||||
/* Language switcher block in region header. */
|
||||
.region-header .search-block-form {
|
||||
float: right; /* LTR */
|
||||
}
|
||||
[dir="rtl"] .region-header .search-block-form {
|
||||
float: left;
|
||||
}
|
||||
|
||||
/* Language switcher block in header region. */
|
||||
.region-header .block-locale ul li {
|
||||
display: inline;
|
||||
padding: 0 0.5em;
|
||||
|
|
@ -252,11 +187,9 @@ h1.site-name {
|
|||
border-bottom: none;
|
||||
}
|
||||
|
||||
[dir="rtl"] #logo,
|
||||
[dir="rtl"] .branding,
|
||||
[dir="rtl"] .site-logo,
|
||||
[dir="rtl"] #name-and-slogan,
|
||||
[dir="rtl"] .site-branding-text,
|
||||
[dir="rtl"] .region-header .block,
|
||||
[dir="rtl"] .region-header #block-user-login .form-item,
|
||||
[dir="rtl"] .region-header #block-user-login .item-list li {
|
||||
float: right;
|
||||
|
|
|
|||
12
core/themes/bartik/css/components/highlighted.css
Normal file
12
core/themes/bartik/css/components/highlighted.css
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
/**
|
||||
* @file
|
||||
* Styles for Bartik's highlighted component.
|
||||
*/
|
||||
|
||||
.has-featured-top .region-highlighted {
|
||||
background: #f0f0f0;
|
||||
background: rgba(30, 50, 10, 0.08);
|
||||
}
|
||||
.region-highlighted {
|
||||
margin: 0 15px;
|
||||
}
|
||||
|
|
@ -3,17 +3,27 @@
|
|||
* Visual styles for Bartik's item list.
|
||||
*/
|
||||
|
||||
.item-list ul {
|
||||
list-style: none;
|
||||
margin: 0 0 0.25em 0;
|
||||
padding: 0; /* LTR */
|
||||
}
|
||||
[dir="rtl"] .item-list ul {
|
||||
padding: 0;
|
||||
}
|
||||
.item-list ul li {
|
||||
/* This is needed to reset styles in item-list.theme.css */
|
||||
margin: 0;
|
||||
padding: 0.2em 0.5em 0 0; /* LTR */
|
||||
}
|
||||
[dir="rtl"] .item-list ul li {
|
||||
/* This is needed to reset [dir="rtl"] styles in item-list.theme.css */
|
||||
margin: 0;
|
||||
padding: 0.2em 0 0 0.5em;
|
||||
}
|
||||
.item-list .item-list__comma-list,
|
||||
.item-list .item-list__comma-list li,
|
||||
[dir="rtl"] .item-list .item-list__comma-list,
|
||||
[dir="rtl"] .item-list .item-list__comma-list li {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,4 +7,7 @@ ul.links {
|
|||
color: #68696b;
|
||||
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
font-size: 0.821em;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
list-style: none;
|
||||
}
|
||||
|
|
|
|||
15
core/themes/bartik/css/components/menu.css
Normal file
15
core/themes/bartik/css/components/menu.css
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
/**
|
||||
* @file
|
||||
* Styles for menus in Bartik.
|
||||
*/
|
||||
|
||||
/* This is needed to override ul.menu styles in menu.theme.css */
|
||||
ul.menu {
|
||||
margin: 0;
|
||||
padding: 0 0 0.25em 0;
|
||||
}
|
||||
|
||||
/* This is needed to override [dir="rtl"] ul.menu styles in menu.theme.css */
|
||||
[dir="rtl"] ul.menu {
|
||||
margin: 0;
|
||||
}
|
||||
|
|
@ -1,18 +1,13 @@
|
|||
/* ---------------- Messages ----------------- */
|
||||
/**
|
||||
* @file
|
||||
* Styles for Bartik's messages.
|
||||
*/
|
||||
|
||||
#messages {
|
||||
padding: 20px 0 5px;
|
||||
margin: 0 auto;
|
||||
.messages__wrapper {
|
||||
padding: 20px 0 5px 8px;
|
||||
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
margin: 8px 0;
|
||||
}
|
||||
.has-featured-top .highlighted {
|
||||
background: #f0f0f0;
|
||||
background: rgba(30, 50, 10, 0.08);
|
||||
}
|
||||
div.messages {
|
||||
margin: 8px 15px 8px 23px; /* LTR */
|
||||
}
|
||||
[dir="rtl"] div.messages {
|
||||
margin-right: 23px;
|
||||
margin-left: 15px;
|
||||
[dir="rtl"] .messages__wrapper {
|
||||
padding: 20px 8px 5px 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -53,6 +53,7 @@
|
|||
/* Node links styles. */
|
||||
.node__links {
|
||||
text-align: right; /* LTR */
|
||||
font-size: 0.93em;
|
||||
}
|
||||
[dir="rtl"] .node__links {
|
||||
text-align: left;
|
||||
|
|
|
|||
40
core/themes/bartik/css/components/search-form.css
Normal file
40
core/themes/bartik/css/components/search-form.css
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
/**
|
||||
* @file
|
||||
* The visual styles for Bartik's search form(s).
|
||||
*/
|
||||
|
||||
.search-form {
|
||||
font-size: 0.875rem;
|
||||
}
|
||||
.search-form .form-search {
|
||||
float: left; /* LTR */
|
||||
margin-right: 5px; /* LTR */
|
||||
padding: 4px;
|
||||
}
|
||||
[dir="rtl"] .search-form .form-search {
|
||||
float: right;
|
||||
margin-left: 5px;
|
||||
margin-right: 0;
|
||||
}
|
||||
.button.search-form__submit,
|
||||
.search-form__submit {
|
||||
background: #f0f0f0 url(../../../../misc/icons/505050/loupe.svg) no-repeat center;
|
||||
cursor: pointer;
|
||||
height: 26px;
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
overflow: hidden;
|
||||
padding: 0;
|
||||
text-indent: -9999px;
|
||||
direction: ltr;
|
||||
width: 34px;
|
||||
}
|
||||
.button.search-form__submit:hover,
|
||||
.search-form__submit:hover,
|
||||
.button.search-form__submit:focus,
|
||||
.search-form__submit:focus {
|
||||
background: #dedede url(../../../../misc/icons/424242/loupe.svg) no-repeat center;
|
||||
}
|
||||
.search-form .form-item-keys label {
|
||||
display: block;
|
||||
}
|
||||
|
|
@ -3,13 +3,10 @@
|
|||
* Visual styles for Bartik's search results.
|
||||
*/
|
||||
|
||||
ol.search-results {
|
||||
padding-left: 0; /* LTR */
|
||||
.search-results {
|
||||
padding: 0;
|
||||
list-style-position: inside;
|
||||
}
|
||||
[dir="rtl"] ol.search-results {
|
||||
padding-right: 0;
|
||||
}
|
||||
.search-results li {
|
||||
border-bottom: 1px solid #d3d7d9;
|
||||
padding-bottom: 0.4285em;
|
||||
|
|
|
|||
|
|
@ -1,52 +0,0 @@
|
|||
/* --------------- Search Form ---------------- */
|
||||
|
||||
#block-search-form {
|
||||
padding-bottom: 7px;
|
||||
}
|
||||
#block-search-form .content {
|
||||
margin-top: 0;
|
||||
}
|
||||
#search-form input[type="search"],
|
||||
#block-search-form input[type="search"] {
|
||||
box-sizing: border-box;
|
||||
padding: 4px;
|
||||
-webkit-appearance: textfield;
|
||||
}
|
||||
#search-form input[type="search"]::-webkit-search-decoration,
|
||||
#block-search-form input[type="search"]::-webkit-search-decoration {
|
||||
display: none;
|
||||
}
|
||||
#search-form input#edit-keys,
|
||||
#block-search-form .form-item-search-block-form input {
|
||||
float: left; /* LTR */
|
||||
font-size: 1em;
|
||||
margin-right: 5px; /* LTR */
|
||||
}
|
||||
[dir="rtl"] #search-form input#edit-keys,
|
||||
[dir="rtl"] #block-search-form .form-item-search-block-form input {
|
||||
float: right;
|
||||
margin-left: 5px;
|
||||
margin-right: 0;
|
||||
}
|
||||
#search-block-form input.form-submit,
|
||||
#search-form input.form-submit {
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
height: 25px;
|
||||
width: 34px;
|
||||
padding: 0;
|
||||
cursor: pointer;
|
||||
text-indent: -9999px;
|
||||
border-color: #e4e4e4 #d2d2d2 #b4b4b4;
|
||||
background: #f0f0f0 url(../../../../misc/icons/505050/loupe.svg) no-repeat center;
|
||||
overflow: hidden;
|
||||
}
|
||||
#search-block-form input.form-submit:hover,
|
||||
#search-block-form input.form-submit:focus,
|
||||
#search-form input.form-submit:hover,
|
||||
#search-form input.form-submit:focus {
|
||||
background: #dedede url(../../../../misc/icons/424242/loupe.svg) no-repeat center;
|
||||
}
|
||||
#search-form .form-item-keys label {
|
||||
display: block;
|
||||
}
|
||||
|
|
@ -1,4 +1,7 @@
|
|||
/* -------------- Shortcut Links -------------- */
|
||||
/**
|
||||
* @file
|
||||
* Visual styles for the Shortcut action link in Bartik.
|
||||
*/
|
||||
|
||||
.shortcut-wrapper {
|
||||
margin: 2.2em 0 1.1em 0; /* Same as usual .page-title margin. */
|
||||
|
|
@ -11,5 +14,16 @@
|
|||
float: right;
|
||||
}
|
||||
.shortcut-action {
|
||||
padding-top: 0.9em;
|
||||
border-bottom: none;
|
||||
margin-left: 0.5em; /* LTR */
|
||||
padding-top: 0.35em;
|
||||
}
|
||||
[dir="rtl"] .shortcut-action {
|
||||
margin-left: 0;
|
||||
margin-right: 0.5em;
|
||||
}
|
||||
.shortcut-action:hover,
|
||||
.shortcut-action:active,
|
||||
.shortcut-action:focus {
|
||||
border-bottom: none;
|
||||
}
|
||||
|
|
|
|||
45
core/themes/bartik/css/components/site-branding.css
Normal file
45
core/themes/bartik/css/components/site-branding.css
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
/**
|
||||
* @file
|
||||
* Visual styles for the site branding block in Bartik.
|
||||
*/
|
||||
|
||||
.site-branding__logo {
|
||||
display: inline-block;
|
||||
margin-right: 1em; /* LTR */
|
||||
margin-bottom: 0.286em;
|
||||
}
|
||||
[dir="rtl"] .site-branding__logo {
|
||||
margin-right: 0;
|
||||
margin-left: 1em;
|
||||
}
|
||||
.site-branding__text {
|
||||
display: inline-block;
|
||||
vertical-align: top;
|
||||
}
|
||||
@media all and (min-width: 461px) {
|
||||
.site-branding__text {
|
||||
margin-bottom: 1.857em;
|
||||
}
|
||||
}
|
||||
@media all and (min-width: 901px) {
|
||||
.site-branding__text {
|
||||
padding: 1.286em 0 0;
|
||||
}
|
||||
}
|
||||
.site-branding__name {
|
||||
font-size: 1.6em;
|
||||
color: #686868;
|
||||
line-height: 1;
|
||||
}
|
||||
@media all and (min-width: 901px) {
|
||||
.site-branding__name {
|
||||
font-size: 1.821em;
|
||||
}
|
||||
}
|
||||
.site-branding__slogan {
|
||||
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
font-size: 0.929em;
|
||||
margin-top: 7px;
|
||||
word-spacing: 0.1em;
|
||||
font-style: italic;
|
||||
}
|
||||
|
|
@ -70,15 +70,3 @@ tr th {
|
|||
display: none;
|
||||
}
|
||||
}
|
||||
table ul.links {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
font-size: 1em;
|
||||
}
|
||||
table ul.links li {
|
||||
padding: 0 1em 0 0; /* LTR */
|
||||
}
|
||||
[dir="rtl"] table ul.links li {
|
||||
padding-left: 1em;
|
||||
padding-right: 0;
|
||||
}
|
||||
|
|
|
|||
17
core/themes/bartik/css/components/tablesort-indicator.css
Normal file
17
core/themes/bartik/css/components/tablesort-indicator.css
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
/**
|
||||
* @file
|
||||
* Tablesort indicator styles.
|
||||
*/
|
||||
|
||||
.tablesort {
|
||||
width: 14px;
|
||||
height: 14px;
|
||||
vertical-align: top;
|
||||
margin: 1px 0 0 5px;
|
||||
}
|
||||
.tablesort--asc {
|
||||
background-image: url(../../../../misc/icons/ffffff/twistie-down.svg);
|
||||
}
|
||||
.tablesort--desc {
|
||||
background-image: url(../../../../misc/icons/ffffff/twistie-up.svg);
|
||||
}
|
||||
|
|
@ -18,7 +18,6 @@ div.tabs {
|
|||
display: block;
|
||||
font-size: 0.929em;
|
||||
padding: 0 10px 3px;
|
||||
margin: 0;
|
||||
text-shadow: 0 1px 0 #fff;
|
||||
}
|
||||
.tabs ul.primary li.is-active a {
|
||||
|
|
|
|||
|
|
@ -1,117 +1,35 @@
|
|||
/* ---------- Views styling ---------- */
|
||||
|
||||
/* @group Lists */
|
||||
|
||||
.views-display-top .secondary .action-list {
|
||||
padding-left: 0; /* LTR */
|
||||
}
|
||||
|
||||
[dir="rtl"] .views-display-top .secondary .action-list {
|
||||
padding-left: inherit;
|
||||
padding-right: 0;
|
||||
}
|
||||
|
||||
/* @end */
|
||||
|
||||
/* @group Attachment details tabs
|
||||
*
|
||||
* The tabs that switch between sections
|
||||
/**
|
||||
* @file
|
||||
* Styling for Views in Bartik.
|
||||
*/
|
||||
|
||||
.views-displays .region-content .secondary,
|
||||
.views-displays .region-content .secondary {
|
||||
padding-bottom: 0;
|
||||
padding-left: 0; /* LTR */
|
||||
/* Tab styles */
|
||||
.views-displays .tabs .open > a {
|
||||
border-radius: 7px 7px 0 0;
|
||||
}
|
||||
[dir="rtl"] .views-displays .region-content .secondary {
|
||||
padding-right: 0;
|
||||
}
|
||||
|
||||
.views-displays .secondary a {
|
||||
font-size: smaller;
|
||||
}
|
||||
|
||||
.views-displays .secondary > li a {
|
||||
border-radius: 5px;
|
||||
}
|
||||
|
||||
.views-displays .secondary > li.open a {
|
||||
border-radius: 5px 5px 0 0;
|
||||
}
|
||||
|
||||
.views-displays .secondary .open > a:hover,
|
||||
.views-displays .secondary .open > a:focus {
|
||||
.views-displays .tabs .open > a:hover,
|
||||
.views-displays .tabs .open > a:focus {
|
||||
color: #0071B3;
|
||||
}
|
||||
|
||||
.views-displays .secondary input.form-submit {
|
||||
font-size: smaller;
|
||||
.views-displays .secondary .form-submit {
|
||||
font-size: 0.846em;
|
||||
}
|
||||
|
||||
/* @end */
|
||||
|
||||
/* @group Modal dialog box
|
||||
*
|
||||
* The contents of the popup dialog on the views edit form.
|
||||
*/
|
||||
/* Tabs action list styles */
|
||||
.views-displays .tabs .action-list {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
/* Contextual filter options styles */
|
||||
.views-filterable-options .filterable-option:nth-of-type(even) .form-type-checkbox {
|
||||
background-color: #F9F9F9;
|
||||
}
|
||||
|
||||
/* @end */
|
||||
|
||||
.views-display-column .details-wrapper {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
.views-display-column details summary {
|
||||
background: none;
|
||||
border: none;
|
||||
font-family: inherit;
|
||||
font-size: 13px;
|
||||
line-height: inherit;
|
||||
position: relative;
|
||||
text-indent: 0;
|
||||
text-shadow: none;
|
||||
top: 3px;
|
||||
}
|
||||
|
||||
.views-display-columns details {
|
||||
position: inherit;
|
||||
}
|
||||
|
||||
.views-display-columns details summary {
|
||||
padding: 0 0 4px 2px; /* LTR */
|
||||
}
|
||||
[dir="rtl"] .views-display-columns details summary {
|
||||
padding: 0 2px 4px 0;
|
||||
}
|
||||
|
||||
.views-display-columns a.fieldset-title {
|
||||
/* Views action dropbutton styles */
|
||||
.views-ui-display-tab-actions .dropbutton .form-submit {
|
||||
color: #0071B3;
|
||||
}
|
||||
|
||||
.views-display-columns a.fieldset-title:hover,
|
||||
.views-display-columns a.fieldset-title:focus {
|
||||
.views-ui-display-tab-actions .dropbutton .form-submit:hover,
|
||||
.views-ui-display-tab-actions .dropbutton .form-submit:focus {
|
||||
color: #018FE2;
|
||||
}
|
||||
|
||||
/* @group Dropbutton */
|
||||
|
||||
.views-ui-display-tab-actions .dropbutton input {
|
||||
color: #0071B3;
|
||||
}
|
||||
|
||||
.views-ui-display-tab-actions .dropbutton input:hover,
|
||||
.views-ui-display-tab-actions .dropbutton input:focus {
|
||||
color: #018FE2;
|
||||
}
|
||||
|
||||
.views-ui-display-tab-actions .dropbutton input.form-submit {
|
||||
margin-right: 0; /* LTR */
|
||||
margin-top: 0;
|
||||
}
|
||||
[dir="rtl"] .views-ui-display-tab-actions .dropbutton input.form-submit {
|
||||
margin-left: 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,8 +17,7 @@ body.maintenance-page {
|
|||
.maintenance-page #main-wrapper {
|
||||
min-height: inherit;
|
||||
}
|
||||
.maintenance-page #header,
|
||||
.maintenance-page #messages {
|
||||
.maintenance-page #header {
|
||||
width: auto;
|
||||
}
|
||||
.maintenance-page #main {
|
||||
|
|
@ -35,32 +34,25 @@ body.maintenance-page {
|
|||
background-color: #fff;
|
||||
background-image: none;
|
||||
}
|
||||
.maintenance-page #name-and-slogan {
|
||||
.maintenance-page .site-branding-text {
|
||||
margin-bottom: 50px;
|
||||
margin-left: 0; /* LTR */
|
||||
padding-top: 20px;
|
||||
font-size: 90%;
|
||||
}
|
||||
[dir="rtl"] .maintenance-page #name-and-slogan {
|
||||
[dir="rtl"] .maintenance-page .site-branding-text {
|
||||
margin-right: 0;
|
||||
}
|
||||
.maintenance-page #name-and-slogan,
|
||||
.maintenance-page #name-and-slogan a,
|
||||
.maintenance-page #name-and-slogan a:hover,
|
||||
.maintenance-page #name-and-slogan a:focus {
|
||||
.maintenance-page .site-branding-text,
|
||||
.maintenance-page .site-branding-text a,
|
||||
.maintenance-page .site-branding-text a:hover,
|
||||
.maintenance-page .site-branding-text a:focus {
|
||||
color: #777;
|
||||
}
|
||||
.maintenance-page .page-title {
|
||||
line-height: 1em;
|
||||
margin-top: 0;
|
||||
}
|
||||
.maintenance-page #messages {
|
||||
padding: 0;
|
||||
margin-top: 30px;
|
||||
}
|
||||
.maintenance-page #messages div.messages {
|
||||
margin: 0;
|
||||
}
|
||||
@media all and (min-width: 800px) {
|
||||
.maintenance-page #page-wrapper {
|
||||
width: 800px;
|
||||
|
|
@ -69,10 +61,6 @@ body.maintenance-page {
|
|||
.maintenance-page #main {
|
||||
width: 700px;
|
||||
}
|
||||
.maintenance-page #messages div.section {
|
||||
padding: 0;
|
||||
width: auto;
|
||||
}
|
||||
}
|
||||
@media all and (min-width: 600px) { /* @TODO find the proper breakpoint */
|
||||
.maintenance-page #page {
|
||||
|
|
|
|||
|
|
@ -13,21 +13,22 @@
|
|||
* - site_slogan: Slogan for site as defined in Site information settings.
|
||||
*/
|
||||
#}
|
||||
{% set attributes = attributes.addClass('site-branding') %}
|
||||
{% block content %}
|
||||
{% if site_logo %}
|
||||
<a href="{{ url('<front>') }}" title="{{ 'Home'|t }}" rel="home" class="site-logo">
|
||||
<a href="{{ path('<front>') }}" title="{{ 'Home'|t }}" rel="home" class="site-branding__logo">
|
||||
<img src="{{ site_logo }}" alt="{{ 'Home'|t }}" />
|
||||
</a>
|
||||
{% endif %}
|
||||
{% if site_name or site_slogan %}
|
||||
<div class="site-branding-text">
|
||||
<div class="site-branding__text">
|
||||
{% if site_name %}
|
||||
<strong class="site-name">
|
||||
<a href="{{ url('<front>') }}" title="{{ 'Home'|t }}" rel="home">{{ site_name }}</a>
|
||||
</strong>
|
||||
<div class="site-branding__name">
|
||||
<a href="{{ path('<front>') }}" title="{{ 'Home'|t }}" rel="home">{{ site_name }}</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if site_slogan %}
|
||||
<div class="site-slogan">{{ site_slogan }}</div>
|
||||
<div class="site-branding__slogan">{{ site_slogan }}</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
{#
|
||||
/**
|
||||
* @file
|
||||
* Default theme implementation for a 'form' element.
|
||||
*
|
||||
* Available variables:
|
||||
* - attributes: A list of HTML attributes for the wrapper element.
|
||||
* - children: The child elements of the form.
|
||||
*
|
||||
* @see template_preprocess_form()
|
||||
*/
|
||||
#}
|
||||
<form{{ attributes.addClass('search-form', 'search-block-form') }}>
|
||||
{{ children }}
|
||||
</form>
|
||||
|
|
@ -93,10 +93,6 @@
|
|||
{% endif %}
|
||||
</header>
|
||||
<div{{ content_attributes.addClass('node__content', 'clearfix') }}>
|
||||
{{ content|without('comment', 'links') }}
|
||||
{{ content }}
|
||||
</div>
|
||||
{% if content.links %}
|
||||
<div class="node__links">{{ content.links }}</div>
|
||||
{% endif %}
|
||||
{{ content.comment }}
|
||||
</article>
|
||||
|
|
|
|||
16
core/themes/bartik/templates/page-title.html.twig
Normal file
16
core/themes/bartik/templates/page-title.html.twig
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
{% extends "@classy/content/page-title.html.twig" %}
|
||||
{#
|
||||
/**
|
||||
* @file
|
||||
* Bartik's theme implementation for a page title.
|
||||
*
|
||||
* Available variables:
|
||||
* - title_attributes: HTML attributes for the page title element.
|
||||
* - title_prefix: Additional output populated by modules, intended to be
|
||||
* displayed in front of the main title tag that appears in the template.
|
||||
* - title: The page title, for use in the actual content.
|
||||
* - title_suffix: Additional output populated by modules, intended to be
|
||||
* displayed after the main title tag that appears in the template.
|
||||
*/
|
||||
#}
|
||||
{% set title_attributes = title_attributes.addClass('title') %}
|
||||
|
|
@ -25,19 +25,8 @@
|
|||
* name has been disabled in the theme settings.
|
||||
* - site_slogan: The slogan of the site. This is empty when displaying the site
|
||||
* slogan has been disabled in theme settings.
|
||||
* - hide_site_name: A flag indicating if the site name has been toggled off on
|
||||
* the theme settings page. If hidden, the "visually-hidden" class is added
|
||||
* to make the site name visually hidden, but still accessible.
|
||||
* - hide_site_slogan: A flag indicating if the site slogan has been toggled off
|
||||
* on the theme settings page. If hidden, the "visually-hidden" class is
|
||||
* added to make the site slogan visually hidden, but still accessible.
|
||||
*
|
||||
|
||||
* Page content (in order of occurrence in the default page.html.twig):
|
||||
* - title_prefix: Additional output populated by modules, intended to be
|
||||
* displayed in front of the main title tag that appears in the template.
|
||||
* - title: The page title, for use in the actual content.
|
||||
* - title_suffix: Additional output populated by modules, intended to be
|
||||
* displayed after the main title tag that appears in the template.
|
||||
* - node: Fully loaded node, if there is an automatically-loaded node
|
||||
* associated with the page and the node ID is the second argument in the
|
||||
* page's path (e.g. node/12345 and node/12345/revisions, but not
|
||||
|
|
@ -72,34 +61,6 @@
|
|||
<header id="header" class="header" role="banner" aria-label="{{ 'Site header'|t}}">
|
||||
<div class="section layout-container clearfix">
|
||||
{{ page.secondary_menu }}
|
||||
{% if logo %}
|
||||
<a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home" id="logo">
|
||||
<img src="{{ logo }}" alt="{{ 'Home'|t }}" />
|
||||
</a>
|
||||
{% endif %}
|
||||
{% if site_name or site_slogan %}
|
||||
<div id="name-and-slogan"{% if hide_site_name and hide_site_slogan %} class="visually-hidden"{% endif %}>
|
||||
{% if site_name %}
|
||||
{% if title %}
|
||||
<div id="site-name"{% if hide_site_name %} class="visually-hidden"{% endif %}>
|
||||
<strong>
|
||||
<a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home"><span>{{ site_name }}</span></a>
|
||||
</strong>
|
||||
</div>
|
||||
{# Use h1 when the content title is empty #}
|
||||
{% else %}
|
||||
<h1 id="site-name"{% if hide_site_name %} class="visually-hidden" {% endif %}>
|
||||
<a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home"><span>{{ site_name }}</span></a>
|
||||
</h1>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% if site_slogan %}
|
||||
<div id="site-slogan"{% if hide_site_slogan %} class="visually-hidden"{% endif %}>
|
||||
{{ site_slogan }}
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
{{ page.header }}
|
||||
{{ page.primary_menu }}
|
||||
</div>
|
||||
|
|
@ -124,13 +85,6 @@
|
|||
<main id="content" class="column main-content" role="main">
|
||||
<section class="section">
|
||||
<a id="main-content" tabindex="-1"></a>
|
||||
{{ title_prefix }}
|
||||
{% if title %}
|
||||
<h1 class="title page-title">
|
||||
{{ title }}
|
||||
</h1>
|
||||
{% endif %}
|
||||
{{ title_suffix }}
|
||||
{{ page.content }}
|
||||
</section>
|
||||
</main>
|
||||
|
|
|
|||
16
core/themes/bartik/templates/region--header.html.twig
Normal file
16
core/themes/bartik/templates/region--header.html.twig
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
{% extends "region.html.twig" %}
|
||||
{#
|
||||
/**
|
||||
* @file
|
||||
* Bartik's theme implementation to display a header region.
|
||||
*
|
||||
* Available variables:
|
||||
* - content: The content for this region, typically blocks.
|
||||
* - attributes: HTML attributes for the region div.
|
||||
* - region: The name of the region variable as defined in the theme's
|
||||
* .info.yml file.
|
||||
*
|
||||
* @see template_preprocess_region()
|
||||
*/
|
||||
#}
|
||||
{% set attributes = attributes.addClass('clearfix') %}
|
||||
|
|
@ -25,10 +25,8 @@
|
|||
{% block messages %}
|
||||
{% if message_list is not empty %}
|
||||
{{ attach_library('bartik/messages') }}
|
||||
<div id="messages">
|
||||
<div class="section clearfix">
|
||||
{{ parent() }}
|
||||
</div>
|
||||
<div class="messages__wrapper layout-container">
|
||||
{{ parent() }}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endblock messages %}
|
||||
|
|
|
|||
Reference in a new issue