diff --git a/core/modules/shortcut/css/shortcut.module.css b/core/modules/shortcut/css/shortcut.module.css index 8575904..52b160d 100644 --- a/core/modules/shortcut/css/shortcut.module.css +++ b/core/modules/shortcut/css/shortcut.module.css @@ -7,13 +7,11 @@ * Add/remove links. */ .add-or-remove-shortcuts .icon { - display: block; - float: left; /* LTR */ + display: inline-block; margin-top: 5px; } .add-or-remove-shortcuts .text { display: none; - float: left; /* LTR */ padding-top: 2px; } .add-or-remove-shortcuts a:focus .text, diff --git a/core/modules/shortcut/css/shortcut.theme.css b/core/modules/shortcut/css/shortcut.theme.css index a9525a7..c219ed4 100644 --- a/core/modules/shortcut/css/shortcut.theme.css +++ b/core/modules/shortcut/css/shortcut.theme.css @@ -30,23 +30,25 @@ /** * Add/remove links. */ +.add-or-remove-shortcuts { + display: inline-block; + margin-left: 0.3em; +} .add-or-remove-shortcuts .icon { - background: transparent url(../images/shortcut-add.png) no-repeat; - height: 12px; - margin-left: 8px; /* LTR */ - overflow: hidden; - text-indent: 12px; - width: 12px; + background: transparent url('../images/favstar.svg') no-repeat left top; + width: 20px; + height: 20px; + vertical-align: text-bottom; + text-indent: -999em; } -.add-shortcut a:focus .icon, -.add-shortcut a:hover .icon { - background-position: 0 -12px; /* LTR */ +.add-shortcut a:hover .icon, +.add-shortcut a:focus .icon { + background-position: -20px top; } .remove-shortcut .icon { - margin-top: 4px; - background-position: -12px 0; + background-position: -40px top; } .remove-shortcut a:focus .icon, .remove-shortcut a:hover .icon { - background-position: -12px -12px; /* LTR */ + background-position: -60px top; /* LTR */ } diff --git a/core/modules/shortcut/images/favstar.svg b/core/modules/shortcut/images/favstar.svg new file mode 100644 index 0000000..cb50c24 --- /dev/null +++ b/core/modules/shortcut/images/favstar.svg @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/core/modules/shortcut/images/shortcut-add.png b/core/modules/shortcut/images/shortcut-add.png deleted file mode 100644 index 2924557..0000000 --- a/core/modules/shortcut/images/shortcut-add.png +++ /dev/null @@ -1,5 +0,0 @@ -PNG - - IHDR$ -gAMA|QPLTEإ~~~NNNlllHHHEEExxxɥpql---cd_KKK_`[| tRNSlo6e-IDAT(]Y0DB&vO7vg,>ЃZOdIAs8~/ͱ>`lL0 KfN.)~A3sژFli&8AĭJ*!ub朔{e춦c}T>U4 )EV{T52UfjJJd,U -RtWkpe:v~*s q٢,_B5/2[ddr[̜BҬwyT6VC7B% SV%[d7̹)]w1_M];<<=6a8mڴ[IENDB` \ No newline at end of file diff --git a/core/themes/seven/style.css b/core/themes/seven/style.css index 86ac064..c9f1db1 100644 --- a/core/themes/seven/style.css +++ b/core/themes/seven/style.css @@ -180,9 +180,21 @@ pre { */ #branding { overflow: hidden; - padding: 20px 20px 0 20px; /* LTR */ - position: relative; background-color: #e0e0d8; + padding: 24px 0 12px; +} +/* This layout styling is a copy of #page. + * @TODO: Replace with reuseable layout classes. + **/ +.branding__inner { + margin-left: 1.25em; + margin-right: 1.25em; +} +@media screen and (min-width:45em) { /* 720px */ + .branding__inner { + margin-left: 2.5em; + margin-right: 2.5em; + } } .breadcrumb { font-size: 0.846em; @@ -207,16 +219,16 @@ pre { * Page title. */ #page-title { - background: #333; padding-top: 20px; } -#branding h1.page-title { - color: #000; +#branding .page-title { + color: #333; + display: inline-block; margin: 0; - padding-bottom: 10px; - font-size: 1.385em; - font-weight: normal; - float: left; /* LTR */ + font-size: 1.625em; + line-height: 1.875em; + font-weight: 600; + -webkit-font-smoothing: antialiased; } /** @@ -924,7 +936,7 @@ body.in-maintenance #page { padding-top: 2em; width: 90%; } -body.in-maintenance #branding h1 { +body.in-maintenance .branding__inner { max-width: 770px; margin: 0 auto; float: none; @@ -1030,10 +1042,7 @@ h1#overlay-title { /* Shortcut theming */ .add-or-remove-shortcuts a:focus span.text, .add-or-remove-shortcuts a:hover span.text { - color: #fff; - background-color: #5f605b; - padding: 0 6px; - border-radius: 5px; + display: none; } /* Field UI */ diff --git a/core/themes/seven/templates/maintenance-page.html.twig b/core/themes/seven/templates/maintenance-page.html.twig index ecd7286..28b3e0f 100644 --- a/core/themes/seven/templates/maintenance-page.html.twig +++ b/core/themes/seven/templates/maintenance-page.html.twig @@ -24,7 +24,9 @@ {{ page_top }}
- {% if title %}

{{ title }}

{% endif %} +
+ {% if title %}

{{ title }}

{% endif %} +
diff --git a/core/themes/seven/templates/page.html.twig b/core/themes/seven/templates/page.html.twig index d899393..61c54da 100644 --- a/core/themes/seven/templates/page.html.twig +++ b/core/themes/seven/templates/page.html.twig @@ -68,15 +68,16 @@ */ #}