From a5ca6748d0dfb0ae13afed2bf4d97d20ba0eb0a0 Mon Sep 17 00:00:00 2001 From: karolinaszczur Date: Wed, 18 Sep 2013 19:50:11 +0200 Subject: [PATCH] [ux] small amendments to buttons and added header styles --- public/css/app/aux.styl | 6 ++++++ public/css/app/forms.styl | 5 +++-- public/css/app/layout.styl | 19 +++++++++++-------- public/css/otalk.css | 20 ++++++++++++++++---- 4 files changed, 36 insertions(+), 14 deletions(-) diff --git a/public/css/app/aux.styl b/public/css/app/aux.styl index 200c408..69568b7 100644 --- a/public/css/app/aux.styl +++ b/public/css/app/aux.styl @@ -34,3 +34,9 @@ padding-bottom: 20px +@media screen and (min-width: 768px) + + .box + width: 50% + + diff --git a/public/css/app/forms.styl b/public/css/app/forms.styl index 10303e9..d511f8f 100644 --- a/public/css/app/forms.styl +++ b/public/css/app/forms.styl @@ -37,17 +37,18 @@ label button, a.button display: inline-block - text-decoration: none - text-align: center roundall(3px) border: none height: 35px + min-width: 80px padding: 0 1em color: white background: $activeBlue line-height: 35px font-size: 14px font-weight: bold + text-decoration: none + text-align: center cursor: pointer &:hover diff --git a/public/css/app/layout.styl b/public/css/app/layout.styl index 58c9da1..a6e3533 100644 --- a/public/css/app/layout.styl +++ b/public/css/app/layout.styl @@ -9,12 +9,15 @@ body font-weight: 400 -webkit-font-smoothing: antialiased - #pages - position: absolute - top: 0px - right: 0px - left: 156px - borderbox() +h1, h2, h3, h4 + color: darken($baseText, 30%) - #menu - width: 155px +#pages + position: absolute + top: 0px + right: 0px + left: 156px + borderbox() + +#menu + width: 155px diff --git a/public/css/otalk.css b/public/css/otalk.css index 2eecd6f..4ba6606 100644 --- a/public/css/otalk.css +++ b/public/css/otalk.css @@ -664,7 +664,13 @@ body { font-weight: 400; -webkit-font-smoothing: antialiased; } -body #pages { +h1, +h2, +h3, +h4 { + color: #3c3c3c; +} +#pages { position: absolute; top: 0px; right: 0px; @@ -673,7 +679,7 @@ body #pages { -webkit-box-sizing: border-box; box-sizing: border-box; } -body #menu { +#menu { width: 155px; } .aux header { @@ -716,6 +722,11 @@ body #menu { margin: 0; padding-bottom: 20px; } +@media screen and (min-width: 768px) { + .box { + width: 50%; + } +} input[type=text], input[type=email], input[type=search], @@ -770,8 +781,6 @@ label { button, a.button { display: inline-block; - text-decoration: none; - text-align: center; -moz-border-radius: 3px; -webkit-border-radius: 3px; -khtml-border-radius: 3px; @@ -780,12 +789,15 @@ a.button { border-radius: 3px; border: none; height: 35px; + min-width: 80px; 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,