diff --git a/core/profiles/standard/config/block.block.bartik.logo.yml b/core/profiles/standard/config/block.block.bartik.logo.yml index 4a5663d..8177725 100644 --- a/core/profiles/standard/config/block.block.bartik.logo.yml +++ b/core/profiles/standard/config/block.block.bartik.logo.yml @@ -2,7 +2,7 @@ id: bartik.page_site_logo weight: '0' status: '1' langcode: en -region: header +region: header_first plugin: page_site_logo settings: label: 'Page Site Logo' diff --git a/core/profiles/standard/config/block.block.bartik.name.yml b/core/profiles/standard/config/block.block.bartik.name.yml index fdf4865..12f5c5d 100644 --- a/core/profiles/standard/config/block.block.bartik.name.yml +++ b/core/profiles/standard/config/block.block.bartik.name.yml @@ -2,7 +2,7 @@ id: bartik.page_site_name weight: '1' status: '1' langcode: en -region: header +region: header_first plugin: page_site_name settings: label: 'Page Site Name' diff --git a/core/profiles/standard/config/block.block.bartik.slogan.yml b/core/profiles/standard/config/block.block.bartik.slogan.yml index c5c9cd4..def5426 100644 --- a/core/profiles/standard/config/block.block.bartik.slogan.yml +++ b/core/profiles/standard/config/block.block.bartik.slogan.yml @@ -1,8 +1,8 @@ id: bartik.page_site_slogan -weight: '0' +weight: '2' status: '3' langcode: en -region: header +region: header_first plugin: page_site_slogan settings: label: 'Page Site Slogan' diff --git a/core/themes/bartik/bartik.info.yml b/core/themes/bartik/bartik.info.yml index 43e3e9c..1387351 100644 --- a/core/themes/bartik/bartik.info.yml +++ b/core/themes/bartik/bartik.info.yml @@ -12,8 +12,9 @@ stylesheets: print: - css/print.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/css/colors.css b/core/themes/bartik/css/colors.css index 96f3877..85b2cfe 100644 --- a/core/themes/bartik/css/colors.css +++ b/core/themes/bartik/css/colors.css @@ -51,11 +51,16 @@ a:active, #footer-wrapper { background: #292929; } -.region-header, -.region-header a, -.region-header li a.active, -#name-and-slogan, -#name-and-slogan a, +.region-header-first, +.region-header-first a, +.region-header-first li a.active, +.region-header-second, +.region-header-second a, +.region-header-second li a.active, +#block-site-name, +#block-site-slogan, +#block-site-name a, +#block-site-slogan a, #secondary-menu-links li a { color: #fffeff; } diff --git a/core/themes/bartik/css/layout-rtl.css b/core/themes/bartik/css/layout-rtl.css index f606cb9..170a689 100644 --- a/core/themes/bartik/css/layout-rtl.css +++ b/core/themes/bartik/css/layout-rtl.css @@ -1,9 +1,12 @@ /* ---------- Basic Layout RTL Styles ----------- */ -.region-header { +.region-header-first { float: right; } +.region-header-second { + float:left; +} #secondary-menu { left: 0; right: auto; diff --git a/core/themes/bartik/css/layout.css b/core/themes/bartik/css/layout.css index c60adb3..b11b1b8 100644 --- a/core/themes/bartik/css/layout.css +++ b/core/themes/bartik/css/layout.css @@ -24,10 +24,13 @@ body, #header div.section { position: relative; } -.region-header { +.region-header-first { float: left; /* LTR */ margin: .5em 5px .75em; - border: 1px solid #ccc; +} +.region-header-second { + float: right; /* LTR */ + margin: .5em 5px .75em; } #secondary-menu { width: 100%; diff --git a/core/themes/bartik/css/style-rtl.css b/core/themes/bartik/css/style-rtl.css index dc7c2a4..f321f1c 100644 --- a/core/themes/bartik/css/style-rtl.css +++ b/core/themes/bartik/css/style-rtl.css @@ -37,32 +37,43 @@ ul.tips { /* ------------------ Header ------------------ */ -#logo { +#block-site-logo { padding: 15px 10px 15px 15px; } -#logo, -#name-and-slogan, -.region-header .block, -.region-header #block-user-login .form-item, -.region-header #block-user-login .item-list li { +#block-site-slogan { + margin: 0 15px 30px 0; +} +#block-site-logo, +#block-site-name, +#block-site-slogan, +.region-header-first .block, +.region-header-first #block-user-login .form-item, +.region-header-first #block-user-login .item-list li { float: right; } -#name-and-slogan { - margin: 0 15px 30px 0; +.region-header-second .block, +.region-header-second #block-user-login .form-item, +.region-header-second #block-user-login .item-list li { + float: left; } -.region-header .form-text { +.region-header-first .form-text, +.region-header-second .form-text { margin-left: 2px; margin-right: 0; } -.region-header #block-user-login .item-list li.last { +.region-header-first #block-user-login .item-list li.last, +.region-header-second #block-user-login .item-list li.last { padding-left: 0; padding-right: 0.5em; } -.region-header #block-user-login ul.openid-links li.last { +.region-header-first #block-user-login ul.openid-links li.last, +.region-header-second #block-user-login ul.openid-links li.last { padding-right: 0; } -.region-header #user-login-form li.openid-link a, -.region-header #user-login li.openid-link a { +.region-header-first #user-login-form li.openid-link a, +.region-header-first #user-login li.openid-link a, +.region-header-second #user-login-form li.openid-link a, +.region-header-second #user-login li.openid-link a { background-position: right -3px; padding-left: 0; padding-right: 20px; diff --git a/core/themes/bartik/css/style.css b/core/themes/bartik/css/style.css index 89e4fd4..d2f60e6 100644 --- a/core/themes/bartik/css/style.css +++ b/core/themes/bartik/css/style.css @@ -108,7 +108,7 @@ pre { /* ------------------ Fonts ------------------ */ body, -#site-slogan, +#block-site-slogan, .ui-widget, .comment-form label { font-family: Georgia, "Times New Roman", Times, serif; @@ -310,61 +310,69 @@ ul.tips { #skip-link a:focus { outline: 0; } -#logo { +#block-site-logo { float: left; /* LTR */ padding-left: 5px; /* LTR */ } - -#name-and-slogan { - float: left; /* LTR */ - margin: 0; - padding: 5px 10px 8px; -} -#site-name { +#block-site-name { + width: 60%; font-size: 1.6em; - color: #686868; line-height: 1; } -h1#site-name { +h1#block-site-name { margin: 0; } -#site-name a { +#block-site-name a { font-weight: normal; } -#site-slogan { +#block-site-slogan { font-size: 0.929em; margin-top: 7px; word-spacing: 0.1em; font-style: italic; + float: left; /* LTR */ + margin: 0; + padding: 5px 10px 8px; } /* Region header blocks. */ -.region-header .block { +.region-header-first .block { font-size: 0.857em; float: left; /* LTR */ margin: 0 10px; padding: 0; } -.region-header .block > h2 { +.region-header-second .block { + font-size: 0.857em; + float: right; /* LTR */ + margin: 0 10px; + padding: 0; +} +.region-header-first .block > h2, +.region-header-second .block > h2 { /* @extend .element-invisible */ 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; @@ -372,88 +380,113 @@ h1#site-name { margin-right: 2px; /* LTR */ width: 120px; } -.region-header .form-text:hover, -.region-header .form-text:focus, -.region-header .form-text:active { +.region-header-first .form-text:hover, +.region-header-first .form-text:focus, +.region-header-first .form-text:active, +.region-header-second .form-text:hover, +.region-header-second .form-text:focus, +.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 { +.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-first .block-menu li a:focus, +.region-header-first .block-menu li a:active, +.region-header-second .block-menu li a:hover, +.region-header-second .block-menu li a:focus, +.region-header-second .block-menu li a:active { text-decoration: none; background: rgba(255, 255, 255, 0.15); } -.region-header .block-menu li.last a { +.region-header-first .block-menu li.last a, +.region-header-second .block-menu li.last a { border-bottom: 0; } /* User Login block in the header region */ -.region-header #block-user-login { +.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-first #block-user-login div.description, +.region-header-second #block-user-login div.item-list, +.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 { +.region-header-first #block-user-login .item-list li.last, +.region-header-second #block-user-login .item-list li.last { padding-left: 0.5em; /* LTR */ } -.region-header #block-user-login ul.openid-links li.last { +.region-header-first #block-user-login ul.openid-links li.last, +.region-header-second #block-user-login ul.openid-links li.last { padding-left: 0; /* LTR */ } -.region-header #user-login-form li.openid-link a, -.region-header #user-login li.openid-link a { +.region-header-first #user-login-form li.openid-link a, +.region-header-first #user-login li.openid-link a, +.region-header-second #user-login-form li.openid-link a, +.region-header-second #user-login li.openid-link a { padding-left: 20px; /* LTR */ } -.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); @@ -462,20 +495,25 @@ 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-first #block-user-login input.form-submit:focus, +.region-header-second #block-user-login input.form-submit:hover, +.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 { +.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 { +.region-header-first .block-locale ul li, +.region-header-second .block-locale ul li { display: inline; padding: 0 0.5em; } @@ -1547,10 +1585,10 @@ div.admin-panel .description { .region-header { margin: .5em 5px .75em; } - #logo { + #block-site-logo { padding: 5px 0 0 5px; /* LTR */ } - #name-and-slogan { + #block-site-name { padding: 10px 10px 8px; } #main-menu-links { @@ -1582,15 +1620,17 @@ div.admin-panel .description { .region-header { margin: 1em 5px 1.5em; } - #logo { + #block-site-logo { padding: 15px 15px 15px 10px; /* LTR */ } - #name-and-slogan { + #block-site-name { + font-size: 1.821em; padding: 26px 0 0; - margin: 0 0 30px 15px; /* LTR */ + margin: 0 0 0 15px; /* LTR */ } - #site-name { - font-size: 1.821em; + #block-site-slogan { + padding: 10px 0 0; + margin: 0 0 30px 15px; /* LTR */ } #main-menu-links { font-size: 0.929em; diff --git a/core/themes/bartik/templates/page.html.twig b/core/themes/bartik/templates/page.html.twig index 1df1cd2..76bd8cc 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. @@ -92,7 +93,13 @@ {% endif %} - {{ page.header }} + {% if page.header_first %} + {{ page.header_first }} + {% endif %} + + {% if page.header_first %} + {{ page.header_second }} + {% endif %} {% if main_menu %}