From 3d5cf5107f61f13c956a4b3d0d86e20aa3775d95 Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Wed, 13 Jun 2012 13:31:21 -0300 Subject: [PATCH] embiggening font sitewide (almost nothing below 13px), making font size a less variable so it's easier to change in future and we don't have so many different font sizes --- frontend/templates/work.html | 4 +- static/css/book_list.css | 6 +- static/css/campaign.css | 26 +++++---- static/css/comments.css | 96 ++++++++++++++++++++++++++++++- static/css/documentation.css | 17 +++--- static/css/landingpage.css | 18 +++--- static/css/manage_campaign.css | 6 +- static/css/pledge.css | 8 +-- static/css/registration.css | 4 +- static/css/sitewide.css | 45 +++++---------- static/css/supporter_layout.css | 12 ++-- static/less/book_detail.less | 8 +-- static/less/book_list.less | 10 ++-- static/less/book_panel.less | 2 +- static/less/campaign.less | 89 ++++++++++++++-------------- static/less/comments.less | 6 +- static/less/documentation.less | 17 +++--- static/less/landingpage.less | 22 +++---- static/less/learnmore.less | 2 +- static/less/notices.less | 2 +- static/less/pledge.less | 8 +-- static/less/registration.less | 8 +-- static/less/searchandbrowse.less | 6 +- static/less/sitewide.less | 46 +++++++-------- static/less/supporter_layout.less | 12 ++-- static/less/variables.less | 3 + 26 files changed, 280 insertions(+), 203 deletions(-) diff --git a/frontend/templates/work.html b/frontend/templates/work.html index 604146a7..76b5c426 100644 --- a/frontend/templates/work.html +++ b/frontend/templates/work.html @@ -132,7 +132,7 @@ $j(document).ready(function(){ {% if work.first_ebook %}
- + {% for ebook in work.ebooks %} {% if forloop.first %} @@ -155,7 +155,7 @@ $j(document).ready(function(){
{% endif %}
- +
{% if work.googlebooks_id %} Find on Google Books diff --git a/static/css/book_list.css b/static/css/book_list.css index 6764e886..c2e686cc 100755 --- a/static/css/book_list.css +++ b/static/css/book_list.css @@ -316,6 +316,9 @@ ul.navigation li.active a { .listview.icons .booklist-status-label { display: none; } +.listview.icons .boolist-ebook span { + padding-bottom: 6px; +} div#content-block-content { padding-bottom: 100px; } @@ -323,9 +326,6 @@ div#content-block-content { .listview.panelback div { display: none; } -.listview.boolist-ebook a { - color: #3d4e53; -} /* Starting state of toggle icons; will be overwritten by js in page */ #toggle-list { filter: alpha(opacity=100); diff --git a/static/css/campaign.css b/static/css/campaign.css index 209226f7..7836b910 100755 --- a/static/css/campaign.css +++ b/static/css/campaign.css @@ -190,14 +190,14 @@ ul.tabs li.active a { line-height: normal; } .book-detail-info h2.book-name { - font-size: 18px; + font-size: 19px; text-transform: capitalize; font-weight: bold; color: #3d4e53; } .book-detail-info h3.book-author, .book-detail-info h3.book-year { - font-size: 12px; + font-size: 13px; font-weight: normal; color: #6994a3; } @@ -222,7 +222,7 @@ ul.tabs li.active a { float: right; } .book-detail-info > div.layout div.btn_support input { - font-size: 17px; + font-size: 15px; } .book-detail-info > div.layout div.btn_support.modify input { background: #d6dde0; @@ -295,7 +295,7 @@ ul.tabs li.active a { .pledge.jsmodule.rounded .jsmod-content.ACTIVE { background: #8dc63f; color: white; - font-size: 18px; + font-size: 19px; font-weight: normal; line-height: 20px; } @@ -326,18 +326,18 @@ ul.tabs li.active a { } a { color: #3d4e53; - font-size: 12px; + font-size: 13px; } #js-search { margin: 0 15px 0 15px !important; } .alert > .errorlist { list-style-type: none; - font-size: 14px; + font-size: 15px; border: none; text-align: left; font-weight: normal; - font-size: 12px; + font-size: 13px; } .alert > .errorlist > li { margin-bottom: 14px; @@ -350,7 +350,7 @@ a { height: auto; padding-left: 32px; padding-right: 32px; - font-size: 12px; + font-size: 13px; } /* Center elements */ #js-maincol { @@ -363,7 +363,7 @@ a { padding: 0; } .status { - font-size: 17px; + font-size: 19px; color: #8dc63f; } /* Center - add/remove actions in book detail area */ @@ -514,7 +514,7 @@ div#content-block-content #tabs-1 img { padding: 10px; height: auto; font-style: normal; - font-size: 14px; + font-size: 15px; margin: 0 0 10px 0; color: white; } @@ -624,7 +624,7 @@ ul.support li span { padding-right: 10px; } ul.support li span.menu-item-price { - font-size: 18px; + font-size: 19px; float: left; display: inline; margin-bottom: 3px; @@ -632,6 +632,8 @@ ul.support li span.menu-item-price { ul.support li span.menu-item-desc { float: none; clear: both; + font-size: 15px; + font-weight: normal; } ul.support li:hover { color: #fff; @@ -650,7 +652,7 @@ ul.support li:hover a { background: url("/static/images/checkmark_small.png") left center no-repeat; } .thank-you { - font-size: 18px; + font-size: 19px; font-weight: bold; margin: 20px auto; } diff --git a/static/css/comments.css b/static/css/comments.css index e930dcc4..590551c1 100644 --- a/static/css/comments.css +++ b/static/css/comments.css @@ -1,3 +1,95 @@ +/* variables and mixins used in multiple less files go here */ +.header-text { + height: 36px; + line-height: 36px; + display: block; + text-decoration: none; + font-weight: bold; + font-size: 13px; + letter-spacing: -0.05em; +} +.panelborders { + border-width: 1px 0px; + border-style: solid none; + border-color: #FFFFFF; +} +.roundedspan { + border: 1px solid #d4d4d4; + -moz-border-radius: 7px; + -webkit-border-radius: 7px; + border-radius: 7px; + padding: 1px; + color: #fff; + margin: 0 8px 0 0; + display: inline-block; +} +.roundedspan > span { + padding: 7px 7px; + min-width: 15px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; + text-align: center; + display: inline-block; +} +.roundedspan > span .hovertext { + display: none; +} +.roundedspan > span:hover .hovertext { + display: inline; +} +.mediaborder { + padding: 5px; + border: solid 5px #EDF3F4; +} +.google_signup_div { + padding: 14px 0; +} +.google_signup_div div { + height: 24px; + line-height: 24px; + float: left; + padding-left: 5px; +} +.google_signup_div img { + float: left; + height: 24px; + width: 24px; +} +.actionbuttons { + width: auto; + height: 36px; + line-height: 36px; + background: #8dc63f; + -moz-border-radius: 32px; + -webkit-border-radius: 32px; + border-radius: 32px; + color: white; + cursor: pointer; + font-size: 13px; + font-weight: bold; + padding: 0 15px; + border: none; + margin: 5px 0; +} +.errors { + -moz-border-radius: 16px 16px 0 0; + -webkit-border-radius: 16px 16px 0 0; + border-radius: 16px 16px 0 0; + border: solid #e35351 3px; + clear: both; + width: 90%; + height: auto; + line-height: 16px; + padding: 7px 0; + font-weight: bold; + font-size: 13px; + text-align: center; +} +.errors li { + list-style: none; + border: none; +} .comments { clear: both; padding: 5px; @@ -34,12 +126,12 @@ } .comments .nonavatar span.text:before { content: "\201C"; - font-size: 17px; + font-size: 15px; font-weight: bold; } .comments .nonavatar span.text:after { content: "\201D"; - font-size: 17px; + font-size: 15px; font-weight: bold; } .comments .avatar { diff --git a/static/css/documentation.css b/static/css/documentation.css index 226a3a4b..4aede896 100644 --- a/static/css/documentation.css +++ b/static/css/documentation.css @@ -262,8 +262,7 @@ display: inherit; } body { - font-size: 13px; - line-height: 16px; + line-height: 17px; } /* Learn More area (not already styles by learnmore.less) */ .user-block { @@ -280,7 +279,7 @@ body { #user-block1 #block-intro-text { float: left; width: 70%; - font-size: 20px; + font-size: 19px; } #user-block1 a#readon { float: left; @@ -288,7 +287,7 @@ body { } .user-block2 { color: #6994a3; - font-size: 11px; + font-size: 13px; line-height: normal; width: 30%; } @@ -298,7 +297,7 @@ body { } .user-block2 label { float: left; - font-size: 20px; + font-size: 19px; height: 30px; line-height: 30px; color: #3d4e53; @@ -340,7 +339,7 @@ body { .doc h2 { margin: 20px 0; color: #3d4e53; - font-size: 17px; + font-size: 15px; font-weight: bold; } .doc h3 { @@ -553,9 +552,9 @@ h2.thank-you { } .pledge_complete, .pledge_complete a { - font-size: 14px; - line-height: 17px; - margin-bottom: 14px; + font-size: 15px; + line-height: 18px; + margin-bottom: 15px; } #js-slide .jsmodule.pledge { width: 960px !important; diff --git a/static/css/landingpage.css b/static/css/landingpage.css index 11065e3b..3b4c2b16 100644 --- a/static/css/landingpage.css +++ b/static/css/landingpage.css @@ -286,7 +286,7 @@ #js-maincol-fl h2.page-heading { margin: 0 0 20px 0; color: #3d4e53; - font-size: 17px; + font-size: 19px; font-weight: bold; } #user-block { @@ -303,14 +303,14 @@ #user-block1 #block-intro-text { float: left; width: 70%; - font-size: 20px; + font-size: 19px; } #user-block1 a#readon { float: left; } .user-block2 { color: #6994a3; - font-size: 11px; + font-size: 13px; line-height: normal; width: 30%; } @@ -320,7 +320,7 @@ } .user-block2 label { float: left; - font-size: 20px; + font-size: 19px; height: 30px; line-height: 30px; height: 30px; @@ -437,13 +437,13 @@ ul.ungluingwhat .user-book-info { ul.ungluingwhat .user-book-info p { margin: 0; padding: 0 5px; - font-size: 11px; + font-size: 13px; } ul.ungluingwhat .user-book-info a { display: block; padding: 0; color: #3d4e53; - font-size: 11px; + font-size: 13px; text-decoration: underline; } ul.ungluingwhat .user-book-info a.user-book-name { @@ -488,7 +488,7 @@ div.signup_btn a span { .have-content-right-module .item-content { float: left; width: 364px; - font-size: 14px; + font-size: 15px; height: 132px; border-bottom: 7px solid #8ac3d7; } @@ -529,7 +529,7 @@ h2.page-heading { .js-maincontainer-faq-inner { float: right; color: #3d4e53; - font-size: 14px; + font-size: 15px; padding-right: 60px; } .js-maincontainer-faq-inner a { @@ -539,7 +539,7 @@ h2.page-heading { } h3.module-title { padding: 10px 0 0 0; - font-size: 17px; + font-size: 19px; font-weight: normal; } .google_signup { diff --git a/static/css/manage_campaign.css b/static/css/manage_campaign.css index e299d1d4..a370028b 100644 --- a/static/css/manage_campaign.css +++ b/static/css/manage_campaign.css @@ -190,14 +190,14 @@ ul.tabs li.active a { line-height: normal; } .book-detail-info h2.book-name { - font-size: 18px; + font-size: 19px; text-transform: capitalize; font-weight: bold; color: #3d4e53; } .book-detail-info h3.book-author, .book-detail-info h3.book-year { - font-size: 12px; + font-size: 13px; font-weight: normal; color: #6994a3; } @@ -222,7 +222,7 @@ ul.tabs li.active a { float: right; } .book-detail-info > div.layout div.btn_support input { - font-size: 17px; + font-size: 15px; } .book-detail-info > div.layout div.btn_support.modify input { background: #d6dde0; diff --git a/static/css/pledge.css b/static/css/pledge.css index 41e58fd0..e5804977 100644 --- a/static/css/pledge.css +++ b/static/css/pledge.css @@ -97,13 +97,13 @@ } input[type="submit"] { float: right; - font-size: 17px; + font-size: 19px; margin: 10px; cursor: pointer; } .pledge_amount { padding: 10px; - font-size: 17px; + font-size: 19px; background: #edf3f4; } .pledge_amount.premium_level { @@ -115,7 +115,7 @@ form.pledgeform { #id_preapproval_amount { width: 50%; line-height: 30px; - font-size: 16px; + font-size: 15px; } ul.support li, ul.support li:hover { @@ -151,7 +151,7 @@ p { background-color: #e35351; cursor: pointer; font-weight: bold; - font-size: 17px; + font-size: 19px; display: none; } span.menu-item-price { diff --git a/static/css/registration.css b/static/css/registration.css index 954d0a1f..532a3478 100644 --- a/static/css/registration.css +++ b/static/css/registration.css @@ -153,7 +153,7 @@ display: block; margin-top: -11px; font-style: italic; - font-size: 12px; + font-size: 13px; } #login .google_signup { padding: 14px 0; @@ -189,7 +189,7 @@ #welcomesearch label { display: block; margin: 0 auto; - font-size: 17px; + font-size: 19px; padding-bottom: 10px; } #welcomesearch p { diff --git a/static/css/sitewide.css b/static/css/sitewide.css index 3e6722cc..4c7a457a 100644 --- a/static/css/sitewide.css +++ b/static/css/sitewide.css @@ -105,26 +105,6 @@ .preview a { color: #8dc63f; } -.preview_top { - border: solid 3px #e35351; - -moz-border-radius: 7px; - -webkit-border-radius: 7px; - border-radius: 7px; - clear: both; - padding: 5px 10px; - font-size: 13px; - line-height: 17px; - border-color: #e18551; - width: 934px; - margin: 10px auto 0 auto; - font-size: 120%; -} -.preview_top a { - color: #8dc63f; -} -.preview_top a { - font-size: 110%; -} .launch_top { border: solid 3px #e35351; -moz-border-radius: 7px; @@ -164,7 +144,7 @@ .utilityheaders { text-transform: uppercase; color: #3d4e53; - font-size: 12px; + font-size: 15px; display: block; } /* Page-wide elements */ @@ -178,7 +158,8 @@ body { background: url("/static/images/bg-body.png") 0 0 repeat-x; padding: 0 0 20px 0; margin: 0; - font-size: 12px; + font-size: 13px; + line-height: 16.900000000000002px; font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Arial, Helvetica, sans-serif; color: #3d4e53; } @@ -527,7 +508,7 @@ a#readon span { border-top: 1px solid #edf3f4; text-transform: uppercase; color: #3d4e53; - font-size: 12px; + font-size: 15px; display: block; padding: 10px; } @@ -536,6 +517,7 @@ a#readon span { } #js-leftcol ul.level2 li a { color: #6994a3; + font-size: 15px; } #js-leftcol ul.level2 li img { vertical-align: middle; @@ -588,7 +570,7 @@ div#content-block.jsmodule { .content-block-heading a.block-link { float: right; padding: 15px; - font-size: 11px; + font-size: 13px; color: #3d4e53; text-decoration: underline; font-weight: normal; @@ -608,7 +590,7 @@ div#content-block-content .cols3 .column { clear: both; text-transform: uppercase; color: #3d4e53; - font-size: 12px; + font-size: 15px; display: block; padding: 15px 0px 45px 0px; margin-top: 15px; @@ -632,6 +614,7 @@ div#content-block-content .cols3 .column { } #footer .column li a { color: #6994a3; + font-size: 15px; } .pagination { width: 100%; @@ -642,14 +625,14 @@ div#content-block-content .cols3 .column { padding-top: 7px; } .pagination .endless_page_link { - font-size: 13pt; + font-size: 13px; border: thin #3d4e53 solid; font-weight: normal; margin: 5px; padding: 1px; } .pagination .endless_page_current { - font-size: 13pt; + font-size: 13px; border: thin #3d4e53 solid; font-weight: normal; margin: 5px; @@ -680,12 +663,12 @@ a.nounderline { } #about_expandable p { padding: 9px 0; - font-size: 14px; - line-height: 18px; + font-size: 15px; + line-height: 20px; } #about_expandable p a { - font-size: 14px; - line-height: 18px; + font-size: 15px; + line-height: 20px; } #about_expandable p b { color: #8dc63f; diff --git a/static/css/supporter_layout.css b/static/css/supporter_layout.css index 174603ed..4208979c 100644 --- a/static/css/supporter_layout.css +++ b/static/css/supporter_layout.css @@ -157,7 +157,7 @@ } .user-block2 { color: #6994a3; - font-size: 11px; + font-size: 13px; line-height: normal; float: left; width: 25%; @@ -200,7 +200,7 @@ img.user-avatar { } span.special-user-name { display: block; - font-size: 17px; + font-size: 19px; color: #3d4e53; margin-left: 10px; font-weight: bold; @@ -216,7 +216,7 @@ span.user-short-info { } span.user-name, span.user-name a { - font-size: 12px; + font-size: 13px; color: #3d4e53; } span.user-status-title { @@ -317,7 +317,7 @@ span.my-setting { line-height: 50px; display: block; padding: 0 0 0 10px; - font-size: 20px; + font-size: 19px; font-weight: bold; cursor: pointer; } @@ -412,7 +412,7 @@ ul.tabs li.tabs3.active a { } #rss span { margin-left: 3px; - font-size: 12px; + font-size: 13px; } .listview .rounded { line-height: normal; @@ -427,7 +427,7 @@ div#content-block-content { .js-news-text { float: left; width: 70%; - font-size: 16px; + font-size: 15px; color: #3d4e53; font-family: lucida grande; } diff --git a/static/less/book_detail.less b/static/less/book_detail.less index 705d368c..3a8ace2c 100644 --- a/static/less/book_detail.less +++ b/static/less/book_detail.less @@ -29,14 +29,14 @@ } h2.book-name { - font-size:18px; + font-size: @font-size-header; text-transform:capitalize; font-weight:bold; color:@text-blue; } h3.book-author, h3.book-year { - font-size:12px; + font-size: @font-size-default; font-weight:normal; color:@medium-blue; } @@ -64,12 +64,12 @@ float: right; input { - font-size: 17px; + font-size: @font-size-larger; } &.modify input { background:@blue-grey; - font-size: 13px; + font-size: @font-size-default; border: double white; line-height: 17px; } diff --git a/static/less/book_list.less b/static/less/book_list.less index 15fd11b5..667f3c3a 100755 --- a/static/less/book_list.less +++ b/static/less/book_list.less @@ -251,6 +251,12 @@ ul.navigation li a:hover, ul.navigation li.active a { .booklist-status-label, { display: none; } + + .boolist-ebook { + span { + padding-bottom: 6px; + } + } } div#content-block-content { @@ -261,10 +267,6 @@ div#content-block-content { display: none; } -.listview.boolist-ebook a { - color: @text-blue; -} - /* Starting state of toggle icons; will be overwritten by js in page */ #toggle-list { .opacity(100); diff --git a/static/less/book_panel.less b/static/less/book_panel.less index 945c586f..18917aca 100644 --- a/static/less/book_panel.less +++ b/static/less/book_panel.less @@ -314,7 +314,7 @@ div.panelview.side2 { margin: 0px; padding: 10px 3px; width: 50px; - font-size:10pt; + font-size: 10pt; float:left; } .read img{ diff --git a/static/less/campaign.less b/static/less/campaign.less index 495c77ad..b148e54d 100644 --- a/static/less/campaign.less +++ b/static/less/campaign.less @@ -33,43 +33,42 @@ margin-bottom:10px; &.rounded .jsmod-content { - .one-border-radius(20px); - background:@pale-blue; - color: @text-blue; - padding:10px 20px; - font-weight:bold; - border:none; - margin:0; - line-height: 16px; - - /* Bubble in upper left looks different depending on campaign status */ - &.ACTIVE { - background: @green; - color: white; - font-size: 18px; - font-weight: normal; - line-height: 20px; - } - - &.No.campaign.yet { - background: @orange; - color: white; - } - - span { - display: inline-block; - vertical-align: middle; - - &.spacer { - visibility: none; - } - - &.findtheungluers { - cursor: pointer; - } - } - + .one-border-radius(20px); + background:@pale-blue; + color: @text-blue; + padding:10px 20px; + font-weight:bold; + border:none; + margin:0; + line-height: 16px; + + /* Bubble in upper left looks different depending on campaign status */ + &.ACTIVE { + background: @green; + color: white; + font-size: @font-size-header; + font-weight: normal; + line-height: 20px; } + + &.No.campaign.yet { + background: @orange; + color: white; + } + + span { + display: inline-block; + vertical-align: middle; + + &.spacer { + visibility: none; + } + + &.findtheungluers { + cursor: pointer; + } + } + } } .jsmodule.pledge { @@ -83,7 +82,7 @@ a { color:#3d4e53; - font-size:12px; + font-size: @font-size-default; } #js-search { @@ -92,11 +91,11 @@ a { .alert > .errorlist { list-style-type: none; - font-size: 14px; + font-size: @font-size-larger; border: none; text-align: left; font-weight: normal; - font-size: 12px; + font-size: @font-size-default; > li { margin-bottom: 14px; @@ -110,7 +109,7 @@ a { height: auto; padding-left: 32px; padding-right: 32px; - font-size: 12px; + font-size: @font-size-default; } } } @@ -128,7 +127,7 @@ a { } .status { - font-size: 17px; + font-size: @font-size-header; color: @green; } @@ -279,7 +278,7 @@ div#content-block-content { padding:10px; height:auto; font-style:normal; - font-size:14px; + font-size: @font-size-larger; margin:0 0 10px 0; color: white; @@ -355,7 +354,7 @@ ul.support li { padding-right:10px; &.menu-item-price { - font-size:18px; + font-size: @font-size-header; float: left; display: inline; margin-bottom: 3px; @@ -364,6 +363,8 @@ ul.support li { &.menu-item-desc { float: none; clear: both; + font-size: @font-size-larger; + font-weight: normal; } } @@ -387,7 +388,7 @@ ul.support li { } .thank-you { - font-size: 18px; + font-size: @font-size-header; font-weight: bold; margin: 20px auto; } \ No newline at end of file diff --git a/static/less/comments.less b/static/less/comments.less index 24f2e38d..730313ac 100644 --- a/static/less/comments.less +++ b/static/less/comments.less @@ -1,3 +1,5 @@ +@import "variables.less"; + .comments { clear: both; padding: 5px; @@ -42,13 +44,13 @@ &.text:before { content: "\201C"; - font-size: 17px; + font-size: @font-size-larger; font-weight: bold; } &.text:after { content: "\201D"; - font-size: 17px; + font-size: @font-size-larger; font-weight: bold; } } diff --git a/static/less/documentation.less b/static/less/documentation.less index bb4feb19..37a2b563 100644 --- a/static/less/documentation.less +++ b/static/less/documentation.less @@ -3,8 +3,7 @@ @import "learnmore.less"; body { - font-size: 13px; - line-height: 16px; + line-height: 17px; } /* Learn More area (not already styles by learnmore.less) */ @@ -22,7 +21,7 @@ body { #block-intro-text { float:left; width:70%; - font-size:20px; + font-size: @font-size-header; } a#readon { @@ -33,7 +32,7 @@ body { .user-block2 { color: @medium-blue; - font-size:11px; + font-size: @font-size-default; line-height:normal; width:30%; @@ -44,7 +43,7 @@ body { label { float:left; - font-size:20px; + font-size: @font-size-header; height:30px; line-height:30px; color:@text-blue; @@ -91,7 +90,7 @@ body { .doc h2 { margin:20px 0; color:@text-blue; - font-size:17px; + font-size: @font-size-larger; font-weight: bold; } @@ -296,9 +295,9 @@ h2.thank-you { } .pledge_complete, .pledge_complete a { - font-size: 14px; - line-height: 17px; - margin-bottom: 14px; + font-size: @font-size-larger; + line-height: 18px; + margin-bottom: 15px; } #js-slide .jsmodule.pledge { diff --git a/static/less/landingpage.less b/static/less/landingpage.less index dcecce9a..8f9ef161 100644 --- a/static/less/landingpage.less +++ b/static/less/landingpage.less @@ -30,7 +30,7 @@ h2.page-heading { margin:0 0 20px 0; color:@text-blue; - font-size:17px; + font-size: @font-size-header; font-weight: bold; } } @@ -50,7 +50,7 @@ #block-intro-text { float:left; width:70%; - font-size:20px; + font-size: @font-size-header; } a#readon { @@ -60,7 +60,7 @@ .user-block2 { color:@medium-blue; - font-size:11px; + font-size: @font-size-default; line-height:normal; width:30%; @@ -71,7 +71,7 @@ label { float:left; - font-size:20px; + font-size: @font-size-header; .height(30px); color:@text-blue; padding-right:15px; @@ -116,7 +116,7 @@ cursor: pointer; display: inline-block; font-weight: bold; - font-size: 13px; + font-size: @font-size-default; overflow: hidden; padding: 0 31px 0 11px; width: 111px; @@ -181,14 +181,14 @@ ul.ungluingwhat { p { margin:0; padding:0 5px; - font-size:11px; + font-size: @font-size-default; } a { display:block; padding:0; color:@text-blue; - font-size:11px; + font-size: @font-size-default; text-decoration:underline; } @@ -213,7 +213,7 @@ div.signup_btn { background: url("@{image-base}bg.png") no-repeat scroll right top transparent; color: #fff; display: block; - font-size: 13px; + font-size: @font-size-default; font-weight: bold; .height(36px); letter-spacing: 1px; @@ -234,7 +234,7 @@ div.signup_btn { .item-content { float:left; width:364px; - font-size:14px; + font-size: @font-size-larger; height: 132px; border-bottom:7px solid @bright-blue; @@ -283,7 +283,7 @@ h2.page-heading { .js-maincontainer-faq-inner { float:right; color:@text-blue; - font-size:14px; + font-size: @font-size-larger; padding-right:60px; a { @@ -295,7 +295,7 @@ h2.page-heading { h3.module-title { padding: 10px 0 0 0; - font-size:17px; + font-size: @font-size-header; font-weight: normal; } diff --git a/static/less/learnmore.less b/static/less/learnmore.less index 577776d7..77c1f77a 100644 --- a/static/less/learnmore.less +++ b/static/less/learnmore.less @@ -12,7 +12,7 @@ float: left; font-style: italic; line-height:20px; - font-size:13px; + font-size: @font-size-default; margin-top: 20px; .highlight { diff --git a/static/less/notices.less b/static/less/notices.less index 446694b7..6cd76d98 100644 --- a/static/less/notices.less +++ b/static/less/notices.less @@ -8,7 +8,7 @@ margin: -15px auto 7px 7px; a { - font-size: 13px; + font-size: @font-size-default; font-weight: bold; } } diff --git a/static/less/pledge.less b/static/less/pledge.less index e379dd26..717260f9 100644 --- a/static/less/pledge.less +++ b/static/less/pledge.less @@ -7,14 +7,14 @@ input[type="submit"] { float: right; - font-size: 17px; + font-size: @font-size-header; margin: 10px; cursor: pointer; } .pledge_amount { padding: 10px; - font-size: 17px; + font-size: @font-size-header; background: @pale-blue; &.premium_level { @@ -29,7 +29,7 @@ form.pledgeform { #id_preapproval_amount { width: 50%; line-height: 30px; - font-size: 16px; + font-size: @font-size-larger; } ul.support li, ul.support li:hover { @@ -70,7 +70,7 @@ p { background-color: @alert; cursor: pointer; font-weight: bold; - font-size: 17px; + font-size: @font-size-header; display: none; } diff --git a/static/less/registration.less b/static/less/registration.less index c70b2297..fa7d9f6a 100644 --- a/static/less/registration.less +++ b/static/less/registration.less @@ -10,7 +10,7 @@ padding: 10px; margin: 0 auto; padding: 10px 0; - font-size: 13px; + font-size: @font-size-default; line-height: 18px; } @@ -53,7 +53,7 @@ display: block; margin-top: -11px; font-style: italic; - font-size: 12px; + font-size: @font-size-default; } } @@ -71,7 +71,7 @@ label { display: block; margin: 0 auto; - font-size: 17px; + font-size: @font-size-header; padding-bottom: 10px; } @@ -93,7 +93,7 @@ border:none; color:#66942e; .height(26px); - font-size:13px; + font-size: @font-size-default; float:left; padding:0; margin:5px 0 5px 20px; diff --git a/static/less/searchandbrowse.less b/static/less/searchandbrowse.less index 8660c53d..4d2a4985 100644 --- a/static/less/searchandbrowse.less +++ b/static/less/searchandbrowse.less @@ -17,7 +17,7 @@ label { line-height:80px; - font-size:18px; + font-size: @font-size-header; float:left; padding:0; width:auto; @@ -64,7 +64,7 @@ border:none; color:#66942e; .height(26px); - font-size:13px; + font-size: @font-size-default; float:left; padding:0; margin:5px 0 5px 20px; @@ -96,7 +96,7 @@ color:#fff; padding:10px 20px; .border-radius(10px, 10px, 0, 0); - font-size:18px; + font-size: @font-size-header; overflow:hidden; display:inline-block; font-weight:normal; diff --git a/static/less/sitewide.less b/static/less/sitewide.less index f41cb2a9..bcfa475f 100644 --- a/static/less/sitewide.less +++ b/static/less/sitewide.less @@ -8,7 +8,8 @@ .one-border-radius(7px); clear:both; padding: 5px 10px; - font-size:13px; + font-size: @font-size-default; + line-height: 17px; a { @@ -16,18 +17,6 @@ } } -.preview_top { - .preview; - border-color: @orange; - width: 934px; - margin:10px auto 0 auto; - font-size: 120%; - - a { - font-size: 110%; - } -} - .launch_top { .preview; border-color: @green; @@ -50,7 +39,7 @@ .utilityheaders { text-transform:uppercase; color:@text-blue; - font-size:12px; + font-size: @font-size-larger; display:block; } @@ -58,6 +47,7 @@ padding:@topbottom @leftright; a { color:@medium-blue; + font-size: @font-size-larger; } } @@ -71,7 +61,9 @@ body{ background:url(@background-body) 0 0 repeat-x; padding:0 0 20px 0; margin:0; - font-size:12px; + font-size: @font-size-default; + line-height: @font-size-default*1.3; + font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Arial, Helvetica, sans-serif; color:@text-blue; } @@ -114,7 +106,8 @@ body{ a { font-weight:bold; - font-size:13px; + font-size: @font-size-default; + text-decoration:none; cursor:pointer; color: @medium-blue; @@ -146,7 +139,7 @@ h2 { &.content-heading { padding:15px; margin:0; - font-size:19px; + font-size: @font-size-header; font-weight:normal; color:@text-blue; float:left; @@ -167,7 +160,7 @@ h3 { height:73px; span { - font-size:19px; + font-size: @font-size-header; font-style: italic; color:@text-blue; padding:26px 40px 27px 20px; @@ -384,7 +377,8 @@ a#readon { text-transform:capitalize; display:block; float:right; - font-size:13px; + font-size: @font-size-default; + font-weight:bold; &.down { @@ -500,7 +494,7 @@ div#content-block { .content-block-heading a.block-link { float:right; padding:15px; - font-size:11px; + font-size: @font-size-default; color:@text-blue; text-decoration:underline; font-weight:normal; @@ -555,14 +549,14 @@ div#content-block-content { padding-top:7px; .endless_page_link { - font-size: 13pt; + font-size: @font-size-default; border: thin @text-blue solid; font-weight: normal; margin: 5px; padding:1px; } .endless_page_current { - font-size: 13pt; + font-size: @font-size-default; border: thin @text-blue solid; font-weight: normal; margin: 5px; @@ -595,12 +589,12 @@ a.nounderline { p { padding: 9px 0; - font-size: 14px; - line-height: 18px; + font-size: @font-size-larger; + line-height: 20px; a { - font-size: 14px; - line-height: 18px; + font-size: @font-size-larger; + line-height: 20px; } b { diff --git a/static/less/supporter_layout.less b/static/less/supporter_layout.less index 2d8a28ef..3e010c23 100644 --- a/static/less/supporter_layout.less +++ b/static/less/supporter_layout.less @@ -81,7 +81,7 @@ .user-block2 { color:@medium-blue; - font-size:11px; + font-size: @font-size-default; line-height:normal; float:left; width:25%; @@ -127,7 +127,7 @@ img.user-avatar { span.special-user-name { display: block; - font-size: 17px; + font-size: @font-size-header; color:@text-blue; margin-left:10px; font-weight:bold; @@ -146,7 +146,7 @@ span.user-short-info { span.user-name, span.user-name a { - font-size:12px; + font-size: @font-size-default; color:@text-blue; } @@ -237,7 +237,7 @@ span.my-setting { .height(50px); display:block; padding:0 0 0 10px; - font-size:20px; + font-size: @font-size-header; font-weight: bold; cursor:pointer; } @@ -347,7 +347,7 @@ ul.tabs { span { margin-left: 3px; - font-size: 12px; + font-size: @font-size-default; } } @@ -368,7 +368,7 @@ div#content-block-content { .js-news-text { float:left; width:70%; - font-size:16px; + font-size: @font-size-larger; color:@text-blue; font-family:lucida grande; } diff --git a/static/less/variables.less b/static/less/variables.less index 9ec1d5d5..9b74ec99 100644 --- a/static/less/variables.less +++ b/static/less/variables.less @@ -15,6 +15,9 @@ @background-header: "@{image-base}bg.png"; @background-body: "@{image-base}bg-body.png"; @background-booklist: "@{image-base}booklist/bg.png"; +@font-size-default: 13px; +@font-size-larger: 15px; +@font-size-header: 19px; .header-text { height:36px;