diff --git a/core/profiles/standard/config/block.block.bartik.slogan.yml b/core/profiles/standard/config/block.block.bartik.slogan.yml index dd4c2b7..6034316 100644 --- a/core/profiles/standard/config/block.block.bartik.slogan.yml +++ b/core/profiles/standard/config/block.block.bartik.slogan.yml @@ -1,6 +1,6 @@ id: bartik.page_site_slogan weight: '2' -status: '3' +status: '1' langcode: en region: header_first plugin: page_site_slogan diff --git a/core/themes/bartik/css/colors.css b/core/themes/bartik/css/colors.css index 85b2cfe..f55c3c4 100644 --- a/core/themes/bartik/css/colors.css +++ b/core/themes/bartik/css/colors.css @@ -57,10 +57,10 @@ 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, +#block-page-site-name, +#block-page-site-slogan, +#block-page-site-name a, +#block-page-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 170a689..57e9bb1 100644 --- a/core/themes/bartik/css/layout-rtl.css +++ b/core/themes/bartik/css/layout-rtl.css @@ -1,19 +1,20 @@ /* ---------- Basic Layout RTL Styles ----------- */ -.region-header-first { - float: right; -} +.region-header-first, .region-header-second { - float:left; + float: right; } #secondary-menu { left: 0; right: auto; } -@media all and (min-width: 560px) and (max-width: 850px) { +@media all and (min-width: 461px) and (max-width: 900px) { + .region-header-second { + float: left; + } #sidebar-first, .region-triptych-first, .region-triptych-middle, @@ -32,8 +33,11 @@ } } -@media all and (min-width: 851px) { +@media all and (min-width: 901px) { + .region-header-second { + float: left; + } #content, #sidebar-first, #sidebar-second, diff --git a/core/themes/bartik/css/layout.css b/core/themes/bartik/css/layout.css index b11b1b8..fb2d0cb 100644 --- a/core/themes/bartik/css/layout.css +++ b/core/themes/bartik/css/layout.css @@ -29,7 +29,7 @@ body, margin: .5em 5px .75em; } .region-header-second { - float: right; /* LTR */ + float: left; /* LTR */ margin: .5em 5px .75em; } #secondary-menu { @@ -74,8 +74,15 @@ body, padding: 0 10px; } -@media all and (min-width: 560px) and (max-width: 850px) { +@media all and (min-width: 561px) and (max-width: 850px) { + .region-header-first { + max-width: 50%; + } + .region-header-second { + float: right; /* LTR */ + max-width: 50%; + } #sidebar-first, .region-triptych-first, .region-triptych-middle, @@ -137,6 +144,13 @@ body, @media all and (min-width: 851px) { + .region-header-first { + max-width: 48%; + } + .region-header-second { + float: right; /* LTR */ + max-width: 48%; + } #header div.section, #featured div.section, #messages div.section, diff --git a/core/themes/bartik/css/style-rtl.css b/core/themes/bartik/css/style-rtl.css index f321f1c..e0d8233 100644 --- a/core/themes/bartik/css/style-rtl.css +++ b/core/themes/bartik/css/style-rtl.css @@ -37,15 +37,15 @@ ul.tips { /* ------------------ Header ------------------ */ -#block-site-logo { +#block-page-site-logo { padding: 15px 10px 15px 15px; } -#block-site-slogan { +#block-page-site-slogan { margin: 0 15px 30px 0; } -#block-site-logo, -#block-site-name, -#block-site-slogan, +#block-page-site-logo, +#block-page-site-name, +#block-page-site-slogan, .region-header-first .block, .region-header-first #block-user-login .form-item, .region-header-first #block-user-login .item-list li { diff --git a/core/themes/bartik/css/style.css b/core/themes/bartik/css/style.css index d2f60e6..53e1121 100644 --- a/core/themes/bartik/css/style.css +++ b/core/themes/bartik/css/style.css @@ -108,7 +108,7 @@ pre { /* ------------------ Fonts ------------------ */ body, -#block-site-slogan, +#block-page-site-slogan, .ui-widget, .comment-form label { font-family: Georgia, "Times New Roman", Times, serif; @@ -310,42 +310,35 @@ ul.tips { #skip-link a:focus { outline: 0; } -#block-site-logo { +#block-page-site-logo { float: left; /* LTR */ padding-left: 5px; /* LTR */ } -#block-site-name { +#block-page-site-name { + font-size: 1.821em; width: 60%; - font-size: 1.6em; line-height: 1; } -h1#block-site-name { - margin: 0; -} -#block-site-name a { - font-weight: normal; +#block-page-site-name a { + text-decoration: underline; } -#block-site-slogan { +#block-page-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; + padding: 5px 10px 0; + word-wrap: normal; } /* Region header blocks. */ .region-header-first .block { font-size: 0.857em; float: left; /* LTR */ margin: 0 10px; - padding: 0; } .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 { @@ -1579,17 +1572,26 @@ div.admin-panel .description { /* ----------- media queries ------------------------------- */ -@media all and (min-width: 461px) and (max-width: 900px) { +@media all and (min-width: 561px) and (max-width: 850px) { /* ------------ Header and Menus -------------------------- */ - .region-header { + .region-header-first { + width: auto; + margin: .5em 5px .75em; + } + .region-header-second { + width: auto; margin: .5em 5px .75em; } - #block-site-logo { + #block-page-site-logo { padding: 5px 0 0 5px; /* LTR */ } - #block-site-name { + #block-page-site-name { padding: 10px 10px 8px; + width: 50%; + } + #block-page-site-slogan { + padding: 10px 10px 0; } #main-menu-links { margin: 0 5px; @@ -1615,22 +1617,22 @@ div.admin-panel .description { } } -@media all and (min-width: 901px) { +@media all and (min-width: 851px) { - .region-header { + .region-header-first, + .region-header-second { margin: 1em 5px 1.5em; } - #block-site-logo { + #block-page-site-logo { padding: 15px 15px 15px 10px; /* LTR */ } - #block-site-name { + #block-page-site-name { + width: 60%; + padding: 10px 10px 8px; font-size: 1.821em; - padding: 26px 0 0; - margin: 0 0 0 15px; /* LTR */ } - #block-site-slogan { - padding: 10px 0 0; - margin: 0 0 30px 15px; /* LTR */ + #block-page-site-slogan { + padding: 10px 10px 10px 15px ; } #main-menu-links { font-size: 0.929em;