From 8a4c8526fa0b01d4deae5273f421a7d900089e1c Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Wed, 15 Mar 2017 12:50:45 +0000 Subject: [PATCH] Use 19px not 16px type in more places MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Making the navigation narrower means that we have more space on every page. So on pages where we had to use 16px type just to fit stuff on the page we can now bump the type size up to something less miserly. This is mainly the team and settings pages. We still need to use 16px on pages which list notifications or previews of spreadsheets, because we’re still trying to fit a lot of information onto these pages, so every little space-saving helps. --- .../stylesheets/components/tick-cross.scss | 2 +- app/assets/stylesheets/views/users.scss | 2 +- app/templates/views/api/keys.html | 70 ++++++++++--------- app/templates/views/service-settings.html | 2 +- 4 files changed, 39 insertions(+), 37 deletions(-) diff --git a/app/assets/stylesheets/components/tick-cross.scss b/app/assets/stylesheets/components/tick-cross.scss index b3a90660a..74fc461ab 100644 --- a/app/assets/stylesheets/components/tick-cross.scss +++ b/app/assets/stylesheets/components/tick-cross.scss @@ -1,6 +1,6 @@ %tick-cross { - @include core-16; + @include core-19; display: inline-block; background-size: 19px 19px; background-repeat: no-repeat; diff --git a/app/assets/stylesheets/views/users.scss b/app/assets/stylesheets/views/users.scss index 0d774388a..b04cd671d 100644 --- a/app/assets/stylesheets/views/users.scss +++ b/app/assets/stylesheets/views/users.scss @@ -1,6 +1,6 @@ .user-list { - @include core-16; + @include core-19; margin-bottom: $gutter * 1.5; &-item { diff --git a/app/templates/views/api/keys.html b/app/templates/views/api/keys.html index 6dbb99f44..44bbdf177 100644 --- a/app/templates/views/api/keys.html +++ b/app/templates/views/api/keys.html @@ -19,41 +19,43 @@ Create an API key - {% call(item, row_number) list_table( - keys, - empty_message="You haven’t created any API keys yet", - caption="API keys", - caption_visible=false, - field_headings=[ - 'API keys', - 'Action' - ], - field_headings_visible=False - ) %} - {% call field() %} -
- {{ item.name }} - - {% if item.key_type == 'normal' %} - Live – sends to anyone - {% elif item.key_type == 'team' %} - Team and whitelist – limits who you can send to - {% elif item.key_type == 'test' %} - Test – pretends to send messages - {% endif %} - -
+
+ {% call(item, row_number) list_table( + keys, + empty_message="You haven’t created any API keys yet", + caption="API keys", + caption_visible=false, + field_headings=[ + 'API keys', + 'Action' + ], + field_headings_visible=False + ) %} + {% call field() %} +
+ {{ item.name }} +
+ {% if item.key_type == 'normal' %} + Live – sends to anyone + {% elif item.key_type == 'team' %} + Team and whitelist – limits who you can send to + {% elif item.key_type == 'test' %} + Test – pretends to send messages + {% endif %} +
+
+ {% endcall %} + {% if item.expiry_date %} + {% call field(align='right') %} + Revoked {{ item.expiry_date|format_datetime_short }} + {% endcall %} + {% else %} + {% call field(align='right', status='error') %} + Revoke + {% endcall %} + {% endif %} {% endcall %} - {% if item.expiry_date %} - {% call field(align='right') %} - Revoked {{ item.expiry_date|format_datetime_short }} - {% endcall %} - {% else %} - {% call field(align='right', status='error') %} - Revoke - {% endcall %} - {% endif %} - {% endcall %} +
{{ page_footer( secondary_link=url_for('.api_integration', service_id=current_service.id), diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html index 22328e672..b25b93875 100644 --- a/app/templates/views/service-settings.html +++ b/app/templates/views/service-settings.html @@ -11,7 +11,7 @@

Settings

-
+
{% call mapping_table( caption='Settings',