From b5c2f743a6cf0c95c9a9b9fca46811377f14eaa8 Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Mon, 21 May 2012 16:02:16 -0400 Subject: [PATCH] need to move some styling to sitewide.css since the About section now means it may display anywhere on the site --- static/css/documentation.css | 42 +++++++---------------------- static/css/landingpage.css | 51 +++++++++++------------------------- static/css/learnmore.css | 22 ---------------- static/css/sitewide.css | 34 +++++++++++++++++++++--- static/less/learnmore.less | 22 ---------------- static/less/sitewide.less | 22 ++++++++++++++++ 6 files changed, 78 insertions(+), 115 deletions(-) diff --git a/static/css/documentation.css b/static/css/documentation.css index 5faf0fae..226a3a4b 100644 --- a/static/css/documentation.css +++ b/static/css/documentation.css @@ -261,33 +261,6 @@ #block-intro-text div#active { display: inherit; } -.signuptoday { - -moz-border-radius: 32px; - -webkit-border-radius: 32px; - border-radius: 32px; - -moz-border-radius: 32px; - -webkit-border-radius: 32px; - border-radius: 32px; - background-color: #8dc63f; - padding: 0 15px; - height: 36px; - line-height: 36px; - height: 36px; - line-height: 36px; - float: left; - clear: both; - margin: 10px auto; - cursor: pointer; - font-style: normal; -} -.signuptoday a { - background: url("/static/images/icons/pledgearrow-hover.png") right center no-repeat; - padding-right: 17px; - color: white; -} -.signuptoday a:hover { - text-decoration: none; -} body { font-size: 13px; line-height: 16px; @@ -297,7 +270,8 @@ body { width: 100%; clear: both; } -#user-block1, .user-block2 { +#user-block1, +.user-block2 { float: left; } #user-block1 { @@ -440,10 +414,12 @@ dd { .collapse ul { display: none; } -.faq, .answer { +.faq, +.answer { text-transform: none !important; } -.faq a, .answer a { +.faq a, +.answer a { color: #6994a3; } .faq { @@ -488,7 +464,8 @@ dd { border-bottom: solid 1px #3d4e53; float: left; } -.pressvideos iframe, .pressvideos div.mediaborder { +.pressvideos iframe, +.pressvideos div.mediaborder { padding: 5px; border: solid 5px #EDF3F4; padding: 5px; @@ -574,7 +551,8 @@ h2.thank-you { color: #8dc63f; line-height: 40px; } -.pledge_complete, .pledge_complete a { +.pledge_complete, +.pledge_complete a { font-size: 14px; line-height: 17px; margin-bottom: 14px; diff --git a/static/css/landingpage.css b/static/css/landingpage.css index f41db55c..11065e3b 100644 --- a/static/css/landingpage.css +++ b/static/css/landingpage.css @@ -261,33 +261,6 @@ #block-intro-text div#active { display: inherit; } -.signuptoday { - -moz-border-radius: 32px; - -webkit-border-radius: 32px; - border-radius: 32px; - -moz-border-radius: 32px; - -webkit-border-radius: 32px; - border-radius: 32px; - background-color: #8dc63f; - padding: 0 15px; - height: 36px; - line-height: 36px; - height: 36px; - line-height: 36px; - float: left; - clear: both; - margin: 10px auto; - cursor: pointer; - font-style: normal; -} -.signuptoday a { - background: url("/static/images/icons/pledgearrow-hover.png") right center no-repeat; - padding-right: 17px; - color: white; -} -.signuptoday a:hover { - text-decoration: none; -} #expandable { display: none; } @@ -320,7 +293,8 @@ width: 100%; clear: both; } -#user-block1, .user-block2 { +#user-block1, +.user-block2 { float: left; } #user-block1 { @@ -354,11 +328,13 @@ color: #3d4e53; padding-right: 15px; } -#js-rightcol, #js-rightcol2 { +#js-rightcol, +#js-rightcol2 { float: right; width: 230px; } -#js-rightcol .jsmodule, #js-rightcol2 .jsmodule { +#js-rightcol .jsmodule, +#js-rightcol2 .jsmodule { float: left; width: 208px; background: #edf3f4; @@ -372,11 +348,13 @@ margin-bottom: 10px; padding: 0 10px 10px 10px; } -#js-rightcol .jsmodule.last, #js-rightcol2 .jsmodule.last { +#js-rightcol .jsmodule.last, +#js-rightcol2 .jsmodule.last { border-bottom: none; padding-bottom: 10px; } -#js-rightcol .jsmodule input, #js-rightcol2 .jsmodule input { +#js-rightcol .jsmodule input, +#js-rightcol2 .jsmodule input { -moz-border-radius: 32px; -webkit-border-radius: 32px; border-radius: 32px; @@ -392,7 +370,8 @@ outline: none; padding-left: 16px; } -#js-rightcol .jsmodule input.signup, #js-rightcol2 .jsmodule input.signup { +#js-rightcol .jsmodule input.signup, +#js-rightcol2 .jsmodule input.signup { background: url("/static/images/landingpage/button.png") no-repeat 0 0; border: medium none; color: #FFF; @@ -404,10 +383,12 @@ padding: 0 31px 0 11px; width: 111px; } -#js-rightcol div.button, #js-rightcol2 div.button { +#js-rightcol div.button, +#js-rightcol2 div.button { padding-top: 10px; } -#js-rightcol label, #js-rightcol2 label { +#js-rightcol label, +#js-rightcol2 label { width: 100%; display: block; clear: both; diff --git a/static/css/learnmore.css b/static/css/learnmore.css index f7513ff0..cea17514 100644 --- a/static/css/learnmore.css +++ b/static/css/learnmore.css @@ -137,25 +137,3 @@ #block-intro-text div#active { display: inherit; } -.signuptoday { - -moz-border-radius: 32px; - -webkit-border-radius: 32px; - border-radius: 32px; - background-color: #8dc63f; - padding: 0 15px; - height: 36px; - line-height: 36px; - float: left; - clear: both; - margin: 10px auto; - cursor: pointer; - font-style: normal; -} -.signuptoday a { - background: url("/static/images/icons/pledgearrow-hover.png") right center no-repeat; - padding-right: 17px; - color: white; -} -.signuptoday a:hover { - text-decoration: none; -} diff --git a/static/css/sitewide.css b/static/css/sitewide.css index c4a28ec0..123e26c3 100644 --- a/static/css/sitewide.css +++ b/static/css/sitewide.css @@ -168,7 +168,8 @@ display: block; } /* Page-wide elements */ -html, body { +html, +body { /* Necessary to make footer stretch to bottom of page */ height: 100%; @@ -231,13 +232,15 @@ a:hover { img { border: none; } -input, textarea { +input, +textarea { border: 2px solid #d6dde0; -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; } -input:focus, textarea:focus { +input:focus, +textarea:focus { border: 2px solid #8dc63f; outline: none; } @@ -518,7 +521,8 @@ a#readon span { -webkit-border-radius: 0 0 10px 10px; border-radius: 0 0 10px 10px; } -#js-leftcol ul.level1 > li > a, #js-leftcol ul.level1 > li > span { +#js-leftcol ul.level1 > li > a, +#js-leftcol ul.level1 > li > span { border-bottom: 1px solid #edf3f4; border-top: 1px solid #edf3f4; text-transform: uppercase; @@ -724,3 +728,25 @@ a.nounderline { margin-top: -12px; margin-right: -22px; } +.signuptoday { + -moz-border-radius: 32px; + -webkit-border-radius: 32px; + border-radius: 32px; + background-color: #8dc63f; + padding: 0 15px; + height: 36px; + line-height: 36px; + float: left; + clear: both; + margin: 10px auto; + cursor: pointer; + font-style: normal; +} +.signuptoday a { + background: url("/static/images/icons/pledgearrow-hover.png") right center no-repeat; + padding-right: 17px; + color: white; +} +.signuptoday a:hover { + text-decoration: none; +} diff --git a/static/less/learnmore.less b/static/less/learnmore.less index 616b4275..577776d7 100644 --- a/static/less/learnmore.less +++ b/static/less/learnmore.less @@ -54,26 +54,4 @@ &#active { display: inherit; } -} - -.signuptoday { - a { - background: url("/static/images/icons/pledgearrow-hover.png") right center no-repeat; - padding-right: 17px; - color: white; - - &:hover { - text-decoration: none; - } - } - - .one-border-radius(32px); - background-color: @call-to-action; - padding:0 15px; - .height(36px); - float: left; - clear: both; - margin: 10px auto; - cursor: pointer; - font-style: normal; } \ No newline at end of file diff --git a/static/less/sitewide.less b/static/less/sitewide.less index ff92f4cd..c5d702dc 100644 --- a/static/less/sitewide.less +++ b/static/less/sitewide.less @@ -648,3 +648,25 @@ a.nounderline { margin-top: -12px; margin-right:-22px; } + +.signuptoday { + a { + background: url("/static/images/icons/pledgearrow-hover.png") right center no-repeat; + padding-right: 17px; + color: white; + + &:hover { + text-decoration: none; + } + } + + .one-border-radius(32px); + background-color: @call-to-action; + padding:0 15px; + .height(36px); + float: left; + clear: both; + margin: 10px auto; + cursor: pointer; + font-style: normal; +} \ No newline at end of file