third pass through /generate: "{base,generate}.html" styling

freedomofpress · Jul 15, 2021 · 746d029 · 746d029
1 parent 3626a5c
commit 746d029
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 27 deletions.
diff --git a/securedrop/sass/modules/_aside.sass b/securedrop/sass/modules/_aside.sass
@@ -1,9 +1,9 @@
 =aside
-  aside
+  .aside
     background-color: #fffbe6
     color: #82572d
     border-radius: 10px
-    padding: 10px
+    padding: 10px + 2*8px  // cf. hr.no-line
     margin: 10px
     text-align: left
     font-size: medium

diff --git a/securedrop/sass/modules/_header.sass b/securedrop/sass/modules/_header.sass
@@ -1,5 +1,5 @@
 =header
-  #header
+  header
     float: left
 
     &:dir(rtl)

diff --git a/securedrop/sass/modules/_headline.sass b/securedrop/sass/modules/_headline.sass
@@ -6,6 +6,7 @@
   h1
     text-align: left
     font-size: 30px
+    padding-top: 10px + 2*8px  // cf. hr.no-line
 
     &:dir(rtl)
       text-align: right

diff --git a/securedrop/sass/modules/_panel.sass b/securedrop/sass/modules/_panel.sass
@@ -1,8 +1,13 @@
 =panel
-  .panel
-    max-width: 800px
-    width: 100%
-    margin: 0 auto
-    padding: 16px 30px
-    border: 1px solid #e1e1e1
-    float: right
+  body:not(#source-index)
+    main
+      max-width: 800px
+      width: 100%
+      margin: 0 auto
+      padding: 16px 30px
+      border: 1px solid #e1e1e1
+      float: right
+
+      section
+        display: flow-root
+        margin-top: 10px + 2*8px  // cf. hr.no-line
diff --git a/securedrop/source_templates/base.html b/securedrop/source_templates/base.html
@@ -21,10 +21,7 @@
         <header>
         {% block header %}
           <a href="{% if 'logged_in' in session %}{{ url_for('main.lookup') }}{% else %}{{ url_for('main.index') }}{% endif %}" class="no-bottom-border">
-            {# FIXME:
-            <img src="{{ g.logo }}" class="logo small" alt="{{ g.organization_name }} | {{ gettext('SecureDrop Home') }}" width="250">
-            #}
-            {{ g.organization_name }} | {{ gettext('SecureDrop Home')}}
+            <img src="{{ g.logo }}" class="logo small" alt="{{ g.organization_name }} logo" width="250">
           </a>
           {% include 'locales.html' %}
         {% endblock %}

diff --git a/securedrop/source_templates/generate.html b/securedrop/source_templates/generate.html
@@ -3,15 +3,10 @@
 {% block body %}
 <h1>{{ gettext('Welcome') }}</h1>
 
-{# FIXME: aside.center #}
-  <p id="codename-instructions" class="center">{{ gettext('Please either write this codename down and keep it in a safe place, or memorize it.') }}</p>
+  <p id="codename-instructions" class="aside center">{{ gettext('Please either write this codename down and keep it in a safe place, or memorize it.') }}</p>
 
 <p id="codename-explanation" class="explanation">{{ gettext('This codename is what you will use in future visits to receive messages from our team in response to what you submit on the next screen.') }}</p>
 
-{# FIXME:
-<hr class="no-line">
-#}
-
 <section class="code">
   {# FIXME:
   <img class="pull-left" src="{{ url_for('static', filename='i/font-awesome/lock-black.png') }}" alt="" width="20" height="23">
@@ -32,14 +27,7 @@ <h1>{{ gettext('Welcome') }}</h1>
     </form>
   </div>
 </section>
-{# FIXME:
-<div class="clearfix"></div>
-</div>
-
-<div class="clearfix"></div>
 
-<hr class="no-line">
-#}
 <p class="explanation">{{ gettext('Because we do not track users of our <strong>SecureDrop</strong>
  service, in future visits, using this codename will be the only way we have to communicate with you should we have
  questions or are interested in additional information. Unlike passwords, there is no way to retrieve a lost codename.') }}