summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Pott2014-07-23 09:02:18 (GMT)
committerAlex Pott2014-07-23 09:02:18 (GMT)
commit8b9d600b1a3f96ed3016ea06cac71fd8e339de8d (patch)
treec03518615d22b6e5f5505beba4162703b0139285
parentb38632b5ab722c118231b6e564d94a39a11ab97e (diff)
Issue #2230997 by dinarcon, jiv_e, StevenPatz, jstoller, cs_shadow, LewisNyman, lauriii | penyaskito: Fixed Remove the slogan in install.php and update.php.
-rw-r--r--core/themes/seven/maintenance-page.css28
-rw-r--r--core/themes/seven/templates/install-page.html.twig11
-rw-r--r--core/themes/seven/templates/maintenance-page.html.twig11
3 files changed, 19 insertions, 31 deletions
diff --git a/core/themes/seven/maintenance-page.css b/core/themes/seven/maintenance-page.css
index 8c6cc83..213c134 100644
--- a/core/themes/seven/maintenance-page.css
+++ b/core/themes/seven/maintenance-page.css
@@ -18,10 +18,11 @@
.in-maintenance {
background: none;
}
-.name-and-slogan h1 {
+.page-title {
font-size: 2em;
line-height: 1.2em;
color: #0074bd;
+ word-wrap: break-word;
}
/**
@@ -36,10 +37,10 @@
font-size: 1.385em;
position: absolute;
top: 0.2em;
- right: 0.5em;
+ right: 0.5em; /* LTR */
}
[dir="rtl"] .step-indicator {
- left: 2em;
+ left: 0.5em;
right: auto;
}
.task-list {
@@ -118,8 +119,13 @@
margin: 1.25em;
padding: 10px 20px;
}
- .name-and-slogan {
- margin: 0 0 1.45em 0;
+ .page-title {
+ margin-right: 2em; /* LTR */
+ margin-bottom: 0.725em;
+ }
+ [dir="rtl"] .page-title {
+ margin-right: 0;
+ margin-left: 2em;
}
}
@@ -153,7 +159,7 @@
-moz-box-sizing: border-box;
box-sizing: border-box;
clear: none;
- float: left;
+ float: left; /* LTR */
padding-left: 3.85em;
padding-right: 3.85em;
width: 65%;
@@ -166,7 +172,7 @@
margin: 0.25em 0;
}
.layout-sidebar-first {
- float: left;
+ float: left; /* LTR */
width: 35%;
}
[dir="rtl"] .layout-sidebar-first {
@@ -174,11 +180,7 @@
}
/* Margins for sitename */
- h1.page-title,
- .name-and-slogan h1 {
- margin: 0.75em 0 0.75em 1.9em; /* LTR */
- }
- [dir="rtl"] .name-and-slogan h1 {
- margin: 0.75em 1.9em 0.75em 0;
+ .page-title {
+ margin: 0.75em 1.9em;
}
}
diff --git a/core/themes/seven/templates/install-page.html.twig b/core/themes/seven/templates/install-page.html.twig
index 98b3f8a..9f4db8d 100644
--- a/core/themes/seven/templates/install-page.html.twig
+++ b/core/themes/seven/templates/install-page.html.twig
@@ -12,15 +12,8 @@
<div class="layout-container">
<header role="banner">
- {% if site_name or site_slogan %}
- <div class="name-and-slogan">
- {% if site_name %}
- <h1>{{ site_name }}</h1>
- {% endif %}
- {% if site_slogan %}
- <div class="site-slogan">{{ site_slogan }}</div>
- {% endif %}
- </div>{# /.name-and-slogan #}
+ {% if site_name %}
+ <h1 class="page-title">{{ site_name }}</h1>
{% endif %}
</header>
diff --git a/core/themes/seven/templates/maintenance-page.html.twig b/core/themes/seven/templates/maintenance-page.html.twig
index 01bc89b..f2bc53b 100644
--- a/core/themes/seven/templates/maintenance-page.html.twig
+++ b/core/themes/seven/templates/maintenance-page.html.twig
@@ -12,15 +12,8 @@
<div class="layout-container">
<header role="banner">
- {% if site_name or site_slogan %}
- <div class="name-and-slogan">
- {% if site_name %}
- <h1>{{ site_name }}</h1>
- {% endif %}
- {% if site_slogan %}
- <div class="site-slogan">{{ site_slogan }}</div>
- {% endif %}
- </div>{# /.name-and-slogan #}
+ {% if site_name %}
+ <h1 class="page-title">{{ site_name }}</h1>
{% endif %}
</header>