KILL ALL BUTTON ICONS

fixes item 5 in 1536
freedomofpress · Jan 30, 2017 · dbd4b25 · dbd4b25
1 parent c8eed80
commit dbd4b25
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 29 deletions.
diff --git a/securedrop/journalist_templates/admin.html b/securedrop/journalist_templates/admin.html
@@ -3,7 +3,7 @@
 <h2>Admin Interface</h2>
 
 <form action="{{ url_for('admin_add_user') }}">
-  <button class="sd-button" type="submit" class="btn" id="add-user"><i class="fa fa-plus"></i> ADD USER</button>
+  <button class="sd-button" type="submit" class="btn" id="add-user">ADD USER</button>
 </form>
 
 <hr class="no-line" />

diff --git a/securedrop/journalist_templates/admin_edit_user.html b/securedrop/journalist_templates/admin_edit_user.html
@@ -32,16 +32,12 @@ <h2>Reset Two Factor Authentication</h2>
 <form method="post" action="{{ url_for('admin_reset_two_factor_totp') }}" id="reset-two-factor-totp">
   <input name="csrf_token" type="hidden" value="{{ csrf_token() }}"/>
   <input name="uid" type="hidden" value="{{ user.id }}"/>
-  <button type="submit" class="center">
-      <i class="fa fa-refresh"></i> RESET TWO FACTOR AUTHENTICATION (GOOGLE AUTHENTICATOR)
-  </button>
+  <button type="submit" class="center">RESET TWO FACTOR AUTHENTICATION (GOOGLE AUTHENTICATOR)</button>
 </form>
 <br />
 <form method="post" action="{{ url_for('admin_reset_two_factor_hotp') }}" id="reset-two-factor-hotp">
   <input name="csrf_token" type="hidden" value="{{ csrf_token() }}"/>
   <input name="uid" type="hidden" value="{{ user.id }}"/>
-  <button class="sd-button" type="submit" class="center">
-      <i class="fa fa-refresh"></i> RESET TWO FACTOR AUTHENTICATION (HOTP YUBIKEY)
-  </button>
+  <button class="sd-button" type="submit" class="center">RESET TWO FACTOR AUTHENTICATION (HOTP YUBIKEY)</button>
 </form>
 {% endblock %}
diff --git a/securedrop/journalist_templates/col.html b/securedrop/journalist_templates/col.html
@@ -10,7 +10,7 @@
       <a href="/">All Sources</a>
       <i class="fa fa-chevron-right"></i>
       <strong>{{ source.journalist_designation }}</strong>
-      <a href="#change-codename-{{ source.journalist_designation }}" title="Generate a new random codename for this source. We recommend doing this if the first random codename is difficult to say or remember. You can generate new random codenames as many times as you like." class="plain" id="regenerate-codename-btn"><i class="fa fa-refresh"></i> <span id="regenerate-codename-btn-label">Change codename</span></a>
+      <a href="#change-codename-{{ source.journalist_designation }}" title="Generate a new random codename for this source. We recommend doing this if the first random codename is difficult to say or remember. You can generate new random codenames as many times as you like." class="plain" id="regenerate-codename-btn"><span id="regenerate-codename-btn-label">Change codename</span></a>
       <div id="change-codename-{{ source.journalist_designation }}" class="confirm-prompt">Are you sure you want to generate a new codename?
         <a href="#regenerate-code">Cancel</a>
         <button class="sd-button" type="submit">CONFIRM</button>
@@ -23,8 +23,8 @@
     <form action="/bulk" method="post">
       <div class="document-actions">
         <div id='select-container'></div>
-        <button class="sd-button" type="submit" name="action" value="download"><i class="fa fa-download"></i> DOWNLOAD</button>
-        <button class="sd-button" type="submit" name="action" value="confirm_delete" class="danger" id="delete_selected"><i class="fa fa-trash-o"></i> DELETE</button>
+        <button class="sd-button" type="submit" name="action" value="download"></i> DOWNLOAD</button>
+        <button class="sd-button" type="submit" name="action" value="confirm_delete" class="danger" id="delete_selected">DELETE</button>
       </div>
       <ul id="submissions" class="plain submissions">
         {% for doc in source.collection %}
@@ -86,7 +86,7 @@ <h3><i class="fa fa-reply"></i> Reply</h3>
     <form action="/flag" method="post">
       <input type="hidden" name="sid" value="{{ sid }}"/>
       <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
-      <button id="flag-button" class="sd-button" type="submit"><i class="fa fa-flag"></i> FLAG THIS SOURCE FOR REPLY</button>
+      <button id="flag-button" class="sd-button" type="submit">FLAG THIS SOURCE FOR REPLY</button>
     </form>
   {% endif %}
   <hr class="no-line" />
@@ -97,7 +97,7 @@ <h3><i class="fa fa-reply"></i> Reply</h3>
     <input name="csrf_token" type="hidden" value="{{ csrf_token() }}"/>
     <input type="hidden" name="sid" value="{{ sid }}"/>
     <input type="hidden" name="col_name" value="{{ source.journalist_designation }}"/>
-    <button type="submit" class="sd-button danger"><i class="fa fa-trash-o"></i> DELETE COLLECTION</button>
+    <button type="submit" class="sd-button danger">DELETE COLLECTION</button>
   </form>
 
 </div>

diff --git a/securedrop/journalist_templates/delete.html b/securedrop/journalist_templates/delete.html
@@ -17,7 +17,7 @@
   <input name="csrf_token" type="hidden" value="{{ csrf_token() }}"/>
   <input type="hidden" name="sid" value="{{ sid }}" autocomplete="off"/>
   <input type="hidden" name="confirm_delete" value="true" />
-  <p><button class="sd-button" type="submit" name="action" value="delete"><i class="fa fa-trash-o"></i> PERMANENTLY DELETE FILES</button></p>
+  <p><button class="sd-button" type="submit" name="action" value="delete">PERMANENTLY DELETE FILES</button></p>
 </form>
 
 <p><a href="/col/{{ sid }}">Return to the list of documents for {{ source.journalist_designation }}...</a></p>

diff --git a/securedrop/journalist_templates/edit_account.html b/securedrop/journalist_templates/edit_account.html
@@ -21,15 +21,11 @@ <h2>Reset Two Factor Authentication</h2>
 <p>If your two factor authentication credentials have been lost or compromised, or you got a new device, you can reset your credentials here. <em>If you do this, make sure you are ready to set up your new device, otherwise you will be locked out of your account.</em></p>
 <form method="post" action="{{ url_for('account_reset_two_factor_totp') }}" id="reset-two-factor-totp">
   <input name="csrf_token" type="hidden" value="{{ csrf_token() }}"/>
-  <button class="sd-button" type="submit" class="center"><i class="fa fa-refresh"></i>
-      RESET TWO FACTOR AUTHENTICATION (GOOGLE AUTHENTICATOR)
-  </button>
+  <button class="sd-button" type="submit" class="center">RESET TWO FACTOR AUTHENTICATION (GOOGLE AUTHENTICATOR)</button>
 </form>
 <br />
 <form method="post" action="{{ url_for('account_reset_two_factor_hotp') }}" id="reset-two-factor-hotp">
   <input name="csrf_token" type="hidden" value="{{ csrf_token() }}"/>
-  <button class="sd-button" type="submit" class="center">
-      <i class="fa fa-refresh"></i> RESET TWO FACTOR AUTHENTICATION (HOTP YUBIKEY)
-  </button>
+  <button class="sd-button" type="submit" class="center">RESET TWO FACTOR AUTHENTICATION (HOTP YUBIKEY)</button>
 </form>
 {% endblock %}
diff --git a/securedrop/journalist_templates/login.html b/securedrop/journalist_templates/login.html
@@ -8,7 +8,7 @@ <h2>Login to access the journalist interface</h2>
   <p class="center"><input type="text" name="username" autocomplete="off" placeholder="Username" autofocus></p>
   <p class="center"><input type="password" name="password" placeholder="Password"></p>
   <p class="center"><input name="token" id="token" type="text" placeholder="Two-factor Code"></p>
-  <p class="center"><button class="sd-button" type="submit">LOG IN <i class="fa fa-arrow-circle-o-right"></i></button></p>
+  <p class="center"><button class="sd-button" type="submit">LOG IN</i></button></p>
 </form>
 
 {% endblock %}
diff --git a/securedrop/source_templates/generate.html b/securedrop/source_templates/generate.html
@@ -31,9 +31,7 @@ <h2>Remember this codename and keep it secret</h2>
 
 <form id="create-form" method="post" action="/create" autocomplete="off">
   <input name="csrf_token" type="hidden" value="{{ csrf_token() }}">
-  <button type="submit" class="sd-button btn block pull-right" id="continue-button">
-    <img class="pull-left" src="{{ url_for('static', filename='i/font-awesome/white/arrow-circle-o-right.svg') }}" width="20px" height="20px">
-    CONTINUE</button>
+  <button type="submit" class="sd-button btn block pull-right" id="continue-button">CONTINUE</button>
   <a id="already-have-codename" href="/login">Already have a codename?</a>
 </form>
 {% endblock %}
diff --git a/securedrop/source_templates/index.html b/securedrop/source_templates/index.html
@@ -34,15 +34,16 @@ <h2>
           </h2>
           <hr class="cut-out" />
           <p>If this is your first time submitting documents to journalists, start here.</p>
-          <a href="/generate" class="sd-button btn alt block" id="submit-documents-button"><img id="warning-close" src="{{ url_for('static', filename='i/font-awesome/white/cloud-upload.svg') }}" width="17px" height="17px"> SUBMIT DOCUMENTS</a>
+          {# adding a break between 'submit' and 'documents' to make both containers equal sized #}
+          <a href="/generate" class="sd-button btn alt block" id="submit-documents-button">SUBMIT<br/>DOCUMENTS</a>
         </div>
         <div class="grid-item option">
           <h2>
             Already submitted something?
           </h2>
           <hr class="cut-out" />
           <p>If you have already submitted documents in the past, log in here to check for responses.</p>
-          <a href="/login" class="sd-button btn block"><img id="warning-close" src="{{ url_for('static', filename='i/font-awesome/white/comments.svg') }}" width="17px" height="17px"> CHECK FOR A RESPONSE</a>
+          <a href="/login" class="sd-button btn block">CHECK FOR A RESPONSE</a>
         </div>
       </div>
 

diff --git a/securedrop/source_templates/login.html b/securedrop/source_templates/login.html
@@ -8,6 +8,6 @@ <h2>Login to check for responses</h2>
 <form method="post" action="/login" autocomplete="off">
 <input name="csrf_token" type="hidden" value="{{ csrf_token() }}">
 <p class="center"><input type="password" name="codename" class="codename" autocomplete="off" placeholder="Enter your codename" autofocus /></p>
-<p class="center"><button type="submit" class="sd-button btn block"><img src="{{ url_for('static', filename='i/font-awesome/white/arrow-circle-o-right.svg') }}" width="20px" height="20px">CONTINUE</button></p>
+<p class="center"><button type="submit" class="sd-button btn block">CONTINUE</button></p>
 </form>
 {% endblock %}
diff --git a/securedrop/source_templates/lookup.html b/securedrop/source_templates/lookup.html
@@ -29,9 +29,7 @@ <h2 class="headline">Submit documents and messages</h2>
 
   <hr class="no-line">
 
-  <button type="submit" class="sd-button btn primary">
-  <img src="{{ url_for('static', filename='i/font-awesome/white/cloud-upload.svg') }}" width="17px" height="17px">
-  SUBMIT</button>
+  <button type="submit" class="sd-button btn primary">SUBMIT</button>
 </form>
 
 <p><strong>Tip:</strong> If you are already familiar with GPG, you can optionally encrypt your files and messages with our <a href="/journalist-key" class="text-link">public key</a> before submission. Files are encrypted as they are received by SecureDrop; encrypting before submission provides an extra layer of security before your data reaches SecureDrop. <a href="/why-journalist-key" class="text-link">Learn more</a>.</p>