diff --git a/core/themes/bartik/bartik.info.yml b/core/themes/bartik/bartik.info.yml index 6851a12..e6b29b6 100644 --- a/core/themes/bartik/bartik.info.yml +++ b/core/themes/bartik/bartik.info.yml @@ -14,8 +14,9 @@ stylesheets: ckeditor_stylesheets: - css/ckeditor-iframe.css regions: - header: Header - help: Help + header_first: 'Header first' + header_second: 'Header second' + help: 'Help' page_top: 'Page top' page_bottom: 'Page bottom' highlighted: Highlighted diff --git a/core/themes/bartik/config/block.block.bartik.branding.yml b/core/themes/bartik/config/block.block.bartik.branding.yml new file mode 100644 index 0000000..ed77ab8 --- /dev/null +++ b/core/themes/bartik/config/block.block.bartik.branding.yml @@ -0,0 +1,22 @@ +id: bartik.branding +weight: '0' +status: '1' +langcode: en +region: header_first +plugin: system_branding_block +settings: + label: 'Page Site Branding' + module: system + label_display: '0' + cache: '-1' +visibility: + path: + visibility: '0' + pages: '' + role: + roles: { } + node_type: + types: + article: '0' + page: '0' + visibility__active_tab: edit-visibility-path diff --git a/core/themes/bartik/css/colors.css b/core/themes/bartik/css/colors.css index 324215a..c335644 100644 --- a/core/themes/bartik/css/colors.css +++ b/core/themes/bartik/css/colors.css @@ -50,12 +50,15 @@ a:active, #footer-wrapper { background: #292929; } -.region-header, -.region-header a, -.region-header li a.active, -#name-and-slogan, +.region-header-first, +.region-header-second, +.region-header-first a, +.region-header-second a, +.region-header-first li a.active, +.region-header-second li a.active, +.site-branding-text, .site-branding-block, -#name-and-slogan a, +.site-branding-text a, .site-branding-block a, #secondary-menu-links li a { color: #fffeff; diff --git a/core/themes/bartik/css/layout.css b/core/themes/bartik/css/layout.css index 74f015b..86258fe 100644 --- a/core/themes/bartik/css/layout.css +++ b/core/themes/bartik/css/layout.css @@ -24,13 +24,22 @@ body, #header div.section { position: relative; } -.region-header { +.region-header-first, +.region-header-second { + margin: .5em 5px .75em; + border: 1px solid #ccc; +} +.region-header-first { + float: left; /* LTR */ +} +.region-header-second { float: right; /* LTR */ - margin: .5em 5px .75em; - border: 1px solid #ccc; } -[dir="rtl"] .region-header { - float: left; +[dir="rtl"] .region-header-first { + float: right; +} +[dir="rtl"] .region-header-second { + float: left; } #secondary-menu { width: 100%; diff --git a/core/themes/bartik/css/maintenance-page.css b/core/themes/bartik/css/maintenance-page.css index e0c79c6..61771cf 100644 --- a/core/themes/bartik/css/maintenance-page.css +++ b/core/themes/bartik/css/maintenance-page.css @@ -31,16 +31,16 @@ 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; padding-top: 20px; font-size: 90%; } -.maintenance-page #name-and-slogan, -.maintenance-page #name-and-slogan a, -.maintenance-page #name-and-slogan a:hover, -.maintenance-page #name-and-slogan a:hover { +.maintenance-page .site-branding-text, +.maintenance-page .site-branding-text a, +.maintenance-page .site-branding-text a:hover, +.maintenance-page .site-branding-text a:hover { color: #777; } .maintenance-page h1#page-title { diff --git a/core/themes/bartik/css/style.css b/core/themes/bartik/css/style.css index 69a382c..52ca299 100644 --- a/core/themes/bartik/css/style.css +++ b/core/themes/bartik/css/style.css @@ -105,7 +105,6 @@ pre { /* ------------------ Fonts ------------------ */ body, -#site-slogan, .site-slogan, #page .ui-widget, .comment-form label, @@ -343,42 +342,32 @@ ul.tips { .skip-link:focus { outline: 0; } -#logo, .site-logo { float: left; /* LTR */ padding-left: 5px; /* LTR */ } -[dir="rtl"] #logo, [dir="rtl"] .site-logo { padding: 15px 10px 15px 15px; } - -#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; } - -#site-name, .site-name { font-size: 1.6em; color: #686868; line-height: 1; } -h1#site-name, h1.site-name { margin: 0; } -#site-name a, .site-name a { font-weight: normal; } -#site-slogan, .site-slogan { font-size: 0.929em; margin-top: 7px; @@ -386,33 +375,39 @@ h1.site-name { font-style: italic; } /* Region header blocks. */ -.region-header .block { +.region-header-first .block, +.region-header-second .block { font-size: 0.857em; float: left; /* LTR */ margin: 0 10px; padding: 0; } -.region-header .block > h2 { +.region-header-first .block > h2, +.region-header-second .block > h2 { /* @extend .visually-hidden */ position: absolute !important; clip: rect(1px, 1px, 1px, 1px); overflow: hidden; height: 1px; } -.region-header .block .content { +.region-header-first .block .content, +.region-header-second .block .content { margin: 0; padding: 0; } -.region-header .block ul { +.region-header-first .block ul, +.region-header-second .block ul { margin: 0; padding: 0; } -.region-header .block li { +.region-header-first .block li, +.region-header-second .block li { list-style: none; list-style-image: none; padding: 0; } -.region-header .form-text { +.region-header-first .form-text, +.region-header-second .form-text { background: #fefefe; background: rgba(255, 255, 255, 0.7); border-color: #ccc; @@ -420,89 +415,113 @@ h1.site-name { margin-right: 2px; /* LTR */ width: 120px; } -[dir="rtl"] .region-header .form-text { +[dir="rtl"] .region-header-first .form-text, +[dir="rtl"] .region-header-second .form-text { margin-left: 2px; margin-right: 0; } -.region-header .form-text:hover, -.region-header .form-text:focus, -.region-header .form-text:active { +.region-header-first .form-text:hover, +.region-header-second .form-text:hover, +.region-header-first .form-text:focus, +.region-header-second .form-text:focus, +.region-header-first .form-text:active, +.region-header-second .form-text:active { background: #fff; background: rgba(255, 255, 255, 0.8); } -.region-header .form-required { +.region-header-first .form-required, +.region-header-second .form-required { color: #eee; color: rgba(255, 255, 255, 0.7); } -/* Region header block menus. */ -.region-header .block-menu { +/* Block menus in header regions. */ +.region-header-first .block-menu, +.region-header-second .block-menu { border: 1px solid; border-color: #eee; border-color: rgba(255, 255, 255, 0.2); padding: 0; width: 208px; } -.region-header .block-menu li a { +.region-header-first .block-menu li a, +.region-header-second .block-menu li a { display: block; border-bottom: 1px solid; border-bottom-color: #eee; border-bottom-color: rgba(255, 255, 255, 0.2); padding: 3px 7px; } -.region-header .block-menu li a:hover, -.region-header .block-menu li a:focus, -.region-header .block-menu li a:active { +.region-header-first .block-menu li a:hover, +.region-header-second .block-menu li a:hover, +.region-header-first .block-menu li a:focus, +.region-header-second .block-menu li a:focus, +.region-header-first .block-menu li a:active, +.region-header-second .block-menu li a:active { text-decoration: none; background: rgba(255, 255, 255, 0.15); } -.region-header .block-menu li:last-child a { +.region-header-first .block-menu li:last-child a, +.region-header-second .block-menu li:last-child a { border-bottom: 0; } -/* User Login block in the header region */ -.region-header #block-user-login { +/* User Login block in header regions. */ +.region-header-first #block-user-login, +.region-header-second #block-user-login { width: auto; } -.region-header #block-user-login .content { +.region-header-first #block-user-login .content, +.region-header-second #block-user-login .content { margin-top: 2px; } -.region-header #block-user-login .form-item { +.region-header-first #block-user-login .form-item, +.region-header-second #block-user-login .form-item { float: left; /* LTR */ margin: 0; padding: 0; } -.region-header #block-user-login div.item-list, -.region-header #block-user-login div.description { +.region-header-first #block-user-login div.item-list, +.region-header-second #block-user-login div.item-list, +.region-header-first #block-user-login div.description, +.region-header-second #block-user-login div.description { font-size: 0.916em; margin: 0; } -.region-header #block-user-login div.item-list { +.region-header-first #block-user-login div.item-list, +.region-header-second #block-user-login div.item-list { clear: both; } -.region-header #block-user-login div.description { +.region-header-first #block-user-login div.description, +.region-header-second #block-user-login div.description { display: inline; } -.region-header #block-user-login .item-list ul { +.region-header-first #block-user-login .item-list ul, +.region-header-second #block-user-login .item-list ul { padding: 0; line-height: 1; } -.region-header #block-user-login .item-list li { +.region-header-first #block-user-login .item-list li, +.region-header-second #block-user-login .item-list li{ list-style: none; float: left; /* LTR */ padding: 3px 0 1px; } -.region-header #block-user-login .item-list li:last-child { +.region-header-first #block-user-login .item-list li:last-child, +.region-header-second #block-user-login .item-list li:last-child{ padding-left: 0.5em; /* LTR */ } -[dir="rtl"] .region-header #block-user-login .item-list li:last-child { +[dir="rtl"] .region-header-first #block-user-login .item-list li:last-child, +[dir="rtl"] .region-header-second #block-user-login .item-list li:last-child { padding-left: 0; padding-right: 0.5em; } -.region-header #block-user-login .form-actions { +.region-header-first #block-user-login .form-actions, +.region-header-second #block-user-login .form-actions { margin: 4px 0 0; padding: 0; clear: both; } -.region-header #block-user-login input.form-submit { +.region-header-first #block-user-login input.form-submit, +.region-header-second #block-user-login input.form-submit { border: 1px solid; border-color: #ccc; border-color: rgba(255, 255, 255, 0.5); @@ -511,31 +530,36 @@ h1.site-name { margin: 4px 0; padding: 3px 8px; } -.region-header #block-user-login input.form-submit:hover, -.region-header #block-user-login input.form-submit:focus { +.region-header-first #block-user-login input.form-submit:hover, +.region-header-second #block-user-login input.form-submit:hover, +.region-header-first #block-user-login input.form-submit:focus, +.region-header-second #block-user-login input.form-submit:focus { background: #fff; background: rgba(255, 255, 255, 0.9); } -/* Search block in region header. */ -.region-header #block-search-form { +/* Search block in region headers. */ +.region-header-first #block-search-form, +.region-header-second #block-search-form { width: 208px; } -.region-header #block-search-form .form-text { +.region-header-first #block-search-form .form-text, +.region-header-second #block-search-form .form-text { width: 154px; } -/* Language switcher block in region header. */ -.region-header .block-locale ul li { +/* Language switcher block in region headers. */ +.region-header-first .block-locale ul li, +.region-header-second .block-locale ul li { display: inline; padding: 0 0.5em; } - -[dir="rtl"] #logo, [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 { +[dir="rtl"] .region-header-first .block, +[dir="rtl"] .region-header-second .block, +[dir="rtl"] .region-header-first #block-user-login .form-item, +[dir="rtl"] .region-header-second #block-user-login .form-item, +[dir="rtl"] .region-header-first #block-user-login .item-list li, +[dir="rtl"] .region-header-second #block-user-login .item-list li { float: right; } @@ -1765,18 +1789,16 @@ div.admin-panel .description { @media all and (min-width: 461px) and (max-width: 900px) { /* ------------ Header and Menus -------------------------- */ - .region-header { + .region-header-first, + .region-header-second { margin: .5em 5px .75em; } - #logo, .site-logo { padding: 5px 0 0 5px; /* LTR */ } - [dir="rtl"] #logo, [dir="rtl"] .site-logo { padding: 5px 5px 0 0; } - #name-and-slogan, .site-branding-text { padding: 10px 10px 8px; } @@ -1815,27 +1837,23 @@ div.admin-panel .description { @media all and (min-width: 901px) { - .region-header { + .region-header-first, + .region-header-second { margin: 1em 5px 1.5em; } - #logo, .site-logo { padding: 15px 15px 15px 10px; /* LTR */ } - [dir="rtl"] #logo, [dir="rtl"] .site-logo { padding: 15px 10px 15px 15px; } - #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 { + [dir="rtl"] .site-branding-text{ margin: 0 15px 30px 0; } - #site-name, .site-name { font-size: 1.821em; } diff --git a/core/themes/bartik/templates/page.html.twig b/core/themes/bartik/templates/page.html.twig index 5602997..689f918 100644 --- a/core/themes/bartik/templates/page.html.twig +++ b/core/themes/bartik/templates/page.html.twig @@ -56,7 +56,8 @@ * comment/reply/12345). * * Regions: - * - page.header: Items for the header region. + * - page.header_first: Items for the first header region. + * - page.header_second: Items for the second header region. * - page.featured: Items for the featured region. * - page.highlighted: Items for the highlighted content region. * - page.help: Dynamic help text, mostly for admin pages. @@ -82,45 +83,20 @@