diff -u b/core/themes/bartik/css/components/featured.css b/core/themes/bartik/css/components/featured.css --- b/core/themes/bartik/css/components/featured.css +++ b/core/themes/bartik/css/components/featured.css @@ -15,16 +15,18 @@ +@media all and (min-width: 520px) { + #featured { + font-size: 1.643em; + } +} #featured h2 { font-size: 1.2em; line-height: 1; } -#featured p { - margin: 0; - padding: 0; -} @media all and (min-width: 520px) { - #featured { - font-size: 1.643em; - } #featured h2 { font-size: 1.174em; } } +#featured p { + margin: 0; + padding: 0; +} diff -u b/core/themes/bartik/css/components/header.css b/core/themes/bartik/css/components/header.css --- b/core/themes/bartik/css/components/header.css +++ b/core/themes/bartik/css/components/header.css @@ -8,7 +8,26 @@ [dir="rtl"] .site-logo { padding: 15px 10px 15px 15px; } - +@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: 15px 15px 15px 10px; /* LTR */ + } + [dir="rtl"] #logo, + [dir="rtl"] .site-logo { + padding: 15px 10px 15px 15px; + } +} #name-and-slogan, .site-branding-text { float: left; /* LTR */ @@ -19,13 +38,35 @@ [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; @@ -196,45 +236,0 @@ - -@media all and (min-width: 461px) and (max-width: 900px) { - .region-header { - 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; - } -} - -@media all and (min-width: 901px) { - .region-header { - 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 { - margin: 0 15px 30px 0; - } - #site-name, - .site-name { - font-size: 1.821em; - } -} diff -u b/core/themes/bartik/css/components/triptych.css b/core/themes/bartik/css/components/triptych.css --- b/core/themes/bartik/css/components/triptych.css +++ b/core/themes/bartik/css/components/triptych.css @@ -55,7 +55,6 @@ } @media all and (min-width: 520px) { - /* ------------------ Triptych ----------------- */ #triptych h2 { font-size: 1.714em; margin-bottom: 0.9em; only in patch2: unchanged: --- a/core/themes/bartik/css/layout.css +++ b/core/themes/bartik/css/layout.css @@ -31,6 +31,16 @@ body, [dir="rtl"] .region-header { float: left; } +@media all and (min-width: 461px) and (max-width: 900px) { + .region-header { + margin: .5em 5px .75em; + } +} +@media all and (min-width: 901px) { + .region-header { + margin: 1em 5px 1.5em; + } +} .region-secondary-menu .block-menu { width: 100%; margin: 0 auto;