From 895d5a48762fc89eedf79b2ad9beaa81907eec05 Mon Sep 17 00:00:00 2001 From: karolinaszczur Date: Thu, 19 Sep 2013 20:37:01 +0200 Subject: [PATCH] [ux] store font sizes in variables --- public/css/app/connectionStatus.styl | 2 +- public/css/app/forms.styl | 10 ++++++---- public/css/app/roster.styl | 6 +++--- public/css/otalk.css | 16 ++++++++-------- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/public/css/app/connectionStatus.styl b/public/css/app/connectionStatus.styl index 215e57c..4ece441 100644 --- a/public/css/app/connectionStatus.styl +++ b/public/css/app/connectionStatus.styl @@ -32,7 +32,7 @@ display: inline-block padding: 0px 10px font-weight: bold - font-size: 24px + font-size: $fontLarge button padding: 5px 8px diff --git a/public/css/app/forms.styl b/public/css/app/forms.styl index 62bdab9..8ed1f0d 100644 --- a/public/css/app/forms.styl +++ b/public/css/app/forms.styl @@ -6,7 +6,7 @@ input[type=text], input[type=email], input[type=search], input[type=password], t padding: 0 10px background: white border: 1px solid $grayOutline - font-size: 0.8em + font-size: $fontSmall color: $baseText borderbox() gotham() @@ -36,7 +36,10 @@ label font-weight: bold color: $baseText -button, a.button +a.button + line-height: 35px + +button display: inline-block gotham() roundall(3px) @@ -46,8 +49,7 @@ button, a.button padding: 0 1em color: white background: $activeBlue - line-height: 35px - font-size: 14px + font-size: $fontMedium font-weight: bold text-decoration: none text-align: center diff --git a/public/css/app/roster.styl b/public/css/app/roster.styl index bbe6c80..c662cab 100644 --- a/public/css/app/roster.styl +++ b/public/css/app/roster.styl @@ -28,7 +28,7 @@ a text-decoration: none - font-size: 12px + font-size: $fontSmall color: #777 @@ -48,7 +48,7 @@ margin: 0px position: relative min-height: 20px - font-size: 11px + font-size: $fontSmall color: #fff cursor: pointer @@ -113,7 +113,7 @@ .status color: #ccc - font-size: 10px + font-size: $fontSmall font-style: italic font-weight: 600 margin: 0px diff --git a/public/css/otalk.css b/public/css/otalk.css index 4385a02..22ccdba 100644 --- a/public/css/otalk.css +++ b/public/css/otalk.css @@ -294,7 +294,7 @@ td { margin: 0px; position: relative; min-height: 20px; - font-size: 11px; + font-size: 12px; color: #fff; cursor: pointer; } @@ -387,7 +387,7 @@ td { #roster li .status, #bookmarks li .status { color: #ccc; - font-size: 10px; + font-size: 12px; font-style: italic; font-weight: 600; margin: 0px; @@ -621,7 +621,7 @@ td { display: inline-block; padding: 0px 10px; font-weight: bold; - font-size: 24px; + font-size: 20px; } #connectionStatus button { padding: 5px 8px; @@ -722,7 +722,7 @@ textarea { padding: 0 10px; background: #fff; border: 1px solid #e4e4e4; - font-size: 0.8em; + font-size: 12px; color: #565656; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -760,8 +760,10 @@ label { font-weight: bold; color: #565656; } -button, a.button { + line-height: 35px; +} +button { display: inline-block; font-family: 'Gotham SSm A', 'Gotham SSm B', Helvetica, Arial, sans-serif; font-style: normal; @@ -777,14 +779,12 @@ a.button { padding: 0 1em; color: #fff; background: #00aeef; - line-height: 35px; font-size: 14px; font-weight: bold; text-decoration: none; text-align: center; cursor: pointer; } -button:hover, -a.button:hover { +button:hover { background: #007aa7; }