From bdfd344f45141870cf38426765dd7091b1e043c0 Mon Sep 17 00:00:00 2001 From: karolinaszczur Date: Wed, 23 Oct 2013 19:15:38 +0200 Subject: [PATCH] [ux] port font sizes --- public/css/_variables.styl | 1 + public/css/app/callbar.styl | 3 +-- public/css/app/chat.styl | 8 ++++---- public/css/app/layout.styl | 2 +- public/css/app/roster.styl | 8 ++++---- public/css/otalk.css | 11 +++++------ 6 files changed, 16 insertions(+), 17 deletions(-) diff --git a/public/css/_variables.styl b/public/css/_variables.styl index 70fed3a..2ad9a3a 100644 --- a/public/css/_variables.styl +++ b/public/css/_variables.styl @@ -19,6 +19,7 @@ $font-family-gotham = 'Gotham SSm A', 'Gotham SSm B', Helvetica, Arial, sans-ser $font-size-large = 16px $font-size-base = 14px $font-size-small = 12px +$font-size-smaller = 10px $font-size-h1 = 30px $font-size-h2 = 24px diff --git a/public/css/app/callbar.styl b/public/css/app/callbar.styl index c427800..520700f 100644 --- a/public/css/app/callbar.styl +++ b/public/css/app/callbar.styl @@ -106,11 +106,11 @@ $callHeight = 80px color: #fff text_shadow(rgba(0,0,0,.7),0,1px,0) line-height: 1 + font-size: $font-size-h3 .caller margin: 0 padding: 5px 0 0 0 - font-size: 20px padding-bottom: 0px .callerName @@ -123,5 +123,4 @@ $callHeight = 80px position: absolute top: 12px right: 40px - font-size: 20px margin: 0 diff --git a/public/css/app/chat.styl b/public/css/app/chat.styl index aaa7df9..d6f669f 100644 --- a/public/css/app/chat.styl +++ b/public/css/app/chat.styl @@ -39,7 +39,7 @@ margin: 15px padding: 0px margin-left: 45px - font-size: 14px + font-size: $font-size-base line-height: 14px max-width: 50% @@ -52,7 +52,7 @@ padding: 0 5px roundall(3px) text-transform: uppercase - font-size: 9px + font-size: $font-size-smaller font-weight: $font-weight-bold line-height: 20px color: lighten($baseText, 30%) @@ -145,7 +145,7 @@ vertical-align: middle .message - font-size: 12px + font-size: $font-size-small margin: 0px display: inline-block padding-right: 11px @@ -178,7 +178,7 @@ word-break: break-word .timestamp - font-size: 10px + font-size: $font-size-smaller font-weight: $font-weight-bold color: lighten($activeBlue, 50%) float: right diff --git a/public/css/app/layout.styl b/public/css/app/layout.styl index 0017235..72259ac 100644 --- a/public/css/app/layout.styl +++ b/public/css/app/layout.styl @@ -14,7 +14,7 @@ h1, h2, h3, h4 h3 margin-top: 0 - font-size: $fontMedium + font-size: $font-size-h3 #pages position: absolute diff --git a/public/css/app/roster.styl b/public/css/app/roster.styl index 1f5e2e3..75d3f96 100644 --- a/public/css/app/roster.styl +++ b/public/css/app/roster.styl @@ -42,7 +42,7 @@ background: lighten($sidebarActive, 10%) h1 - font-size: 10px + font-size: $font-size-small margin: 0 padding: 20px 10px color: white @@ -165,7 +165,7 @@ .status color: $textSecondary - font-size: 10px + font-size: $font-size-smaller font-weight: 400 line-height: 12px margin: 0 @@ -180,7 +180,7 @@ position: absolute top: 5px left: 10px - font-size: 10px + font-size: $font-size-smaller font-weight: $font-weight-bold text-align: center background: rgba(0, 174, 239, .8) @@ -188,7 +188,7 @@ .idleTime display: inline-block margin-left: 5px - font-size: 10px + font-size: $font-size-small color: darken($textSecondary, 50%) #bookmarks diff --git a/public/css/otalk.css b/public/css/otalk.css index 36f7e53..defd10b 100644 --- a/public/css/otalk.css +++ b/public/css/otalk.css @@ -177,7 +177,7 @@ h4 { } h3 { margin-top: 0; - font-size: $fontMedium; + font-size: 18px; } #pages { position: absolute; @@ -278,7 +278,7 @@ h3 { background: #2b3f65; } #menu h1 { - font-size: 10px; + font-size: 12px; margin: 0; padding: 20px 10px; color: #fff; @@ -480,7 +480,7 @@ h3 { #bookmarks li .idleTime { display: inline-block; margin-left: 5px; - font-size: 10px; + font-size: 12px; color: #5c5c5c; } #bookmarks .name { @@ -621,7 +621,7 @@ h3 { -border-radius: 3px; border-radius: 3px; text-transform: uppercase; - font-size: 9px; + font-size: 10px; font-weight: 800; line-height: 20px; color: #898989; @@ -1127,11 +1127,11 @@ rgba(0,0,0,0.2) color: #fff; rgba(0,0,0,0.7) line-height: 1; + font-size: 18px; } #calls .caller { margin: 0; padding: 5px 0 0 0; - font-size: 20px; padding-bottom: 0px; } #calls .callerName { @@ -1145,6 +1145,5 @@ rgba(0,0,0,0.7) position: absolute; top: 12px; right: 40px; - font-size: 20px; margin: 0; }