From 41e4154d60fa3018c8907a69d8d169de2c134214 Mon Sep 17 00:00:00 2001 From: lilia Date: Wed, 24 Aug 2016 15:15:55 -0700 Subject: [PATCH] Make font sizes relative So it's easier to adjust them globally. // FREEBIE --- stylesheets/_conversation.scss | 6 +++--- stylesheets/_global.scss | 2 +- stylesheets/_index.scss | 6 +++--- stylesheets/_variables.scss | 3 +++ stylesheets/manifest.css | 14 +++++++------- 5 files changed, 17 insertions(+), 14 deletions(-) diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss index ae2a184f..7b2f1f5b 100644 --- a/stylesheets/_conversation.scss +++ b/stylesheets/_conversation.scss @@ -62,7 +62,7 @@ label { display: block; margin-bottom: 10px; - font-size: small; + font-size: $font-size-small; } .key, .placeholder { @@ -159,7 +159,7 @@ .error-message { margin: 6px 0 0; - font-size: small; + font-size: $font-size-small; font-weight: bold; color: red; } @@ -563,7 +563,7 @@ li.entry .error-icon-container { color: white; box-shadow: 0 0 5px 0 black; border-radius: $border-radius; - font-size: small; + font-size: $font-size-small; } .confirmation-dialog { diff --git a/stylesheets/_global.scss b/stylesheets/_global.scss index f6cd9522..0e807241 100644 --- a/stylesheets/_global.scss +++ b/stylesheets/_global.scss @@ -325,7 +325,7 @@ $avatar-size: 44px; .number { color: $grey; - font-size: small; + font-size: $font-size-small; } } diff --git a/stylesheets/_index.scss b/stylesheets/_index.scss index 54d4b6ed..fca62663 100644 --- a/stylesheets/_index.scss +++ b/stylesheets/_index.scss @@ -165,7 +165,7 @@ input.search { .last-message { margin: 6px 0 0; - font-size: small; + font-size: $font-size-small; font-weight: 300; } @@ -274,12 +274,12 @@ input.search { } } .synced_at { - font-size: small; + font-size: $font-size-small; color: $grey; } .sync_failed { display: none; - font-size: small; + font-size: $font-size-small; color: red; } } diff --git a/stylesheets/_variables.scss b/stylesheets/_variables.scss index 07c05878..42b3aef4 100644 --- a/stylesheets/_variables.scss +++ b/stylesheets/_variables.scss @@ -45,3 +45,6 @@ $big-avatar-min-width: 900px; $border-radius: 5px; $error-icon-size: 24px; + +$font-size: 14px; +$font-size-small: (13/14) + em; diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css index 4e4efbd2..5f197d62 100644 --- a/stylesheets/manifest.css +++ b/stylesheets/manifest.css @@ -291,7 +291,7 @@ img.emoji { text-align: left; } .contact-details .number { color: #616161; - font-size: small; } + font-size: 0.92857em; } .recipients-input { position: relative; } @@ -743,7 +743,7 @@ input.search { padding: 0.5em; } .index .last-message { margin: 6px 0 0; - font-size: small; + font-size: 0.92857em; font-weight: 300; } .index .gutter .timestamp { position: absolute; @@ -829,11 +829,11 @@ input.search { .syncSettings button[disabled=disabled] { background: #616161; } .syncSettings .synced_at { - font-size: small; + font-size: 0.92857em; color: #616161; } .syncSettings .sync_failed { display: none; - font-size: small; + font-size: 0.92857em; color: red; } .conversation-title { @@ -884,7 +884,7 @@ input.search { .key-verification label { display: block; margin-bottom: 10px; - font-size: small; } + font-size: 0.92857em; } .key-verification .key, .key-verification .placeholder { padding: 0 1em; -webkit-user-select: text; } @@ -950,7 +950,7 @@ input.search { float: right; } .message-detail .contacts .contact-detail .error-message { margin: 6px 0 0; - font-size: small; + font-size: 0.92857em; font-weight: bold; color: red; } .message-detail h3 { @@ -1268,7 +1268,7 @@ li.entry .error-icon-container { color: white; box-shadow: 0 0 5px 0 black; border-radius: 5px; - font-size: small; } + font-size: 0.92857em; } .confirmation-dialog .content { max-width: 350px;