diff --git a/frontend/templates/campaign_list.html b/frontend/templates/campaign_list.html index b434c992..1db51286 100644 --- a/frontend/templates/campaign_list.html +++ b/frontend/templates/campaign_list.html @@ -32,9 +32,8 @@
- {{ campaign_list.count }} + We're ungluing {{ campaign_list.count }}
- We are ungluing {{ campaign_list.count }} {% if campaign_list.count == 1 %}book{% else %}books{% endif %}
diff --git a/frontend/templates/supporter.html b/frontend/templates/supporter.html index fbc13d57..a06c53ee 100644 --- a/frontend/templates/supporter.html +++ b/frontend/templates/supporter.html @@ -67,11 +67,10 @@ how do I integrate the your wishlist thing with the tabs thing? {{ supporter.profile.tagline }}
-
Ungluing:
- {{ backed }} - {{ backing }} - {{ wished }} + I've unglued {{ backed }} + I'm ungluing {{ backing }} + I'm wishing for {{ wished }}
diff --git a/frontend/templates/work_list.html b/frontend/templates/work_list.html index 830d2087..aa4b9555 100644 --- a/frontend/templates/work_list.html +++ b/frontend/templates/work_list.html @@ -32,9 +32,9 @@
- {{ counts.unglued }} - {{ counts.unglueing }} - {{ counts.wished }} + Enjoy {{ counts.unglued }} + Ungluing {{ counts.unglueing }} + Wishing for {{ counts.wished }}
diff --git a/static/css/campaign.css b/static/css/campaign.css index f94eaaad..409dc217 100755 --- a/static/css/campaign.css +++ b/static/css/campaign.css @@ -114,15 +114,15 @@ float: right; margin-top: 11px; } -.book-detail-info .btn_support a { +.book-detail-info .btn_support input { background: url("/static/images/btn_bg.png") 0 0 no-repeat; width: 104px; height: 41px; - line-height: 41px; display: block; color: #fff; font-weight: bold; text-align: center; + border: none; } #tabs { border-bottom: 4px solid #6994a3; diff --git a/static/css/sitewide.css b/static/css/sitewide.css index 0882fc61..1b0e8ca9 100644 --- a/static/css/sitewide.css +++ b/static/css/sitewide.css @@ -235,7 +235,7 @@ a.readon span { } /* Main content area: top */ #js-topsection { - padding: 15px 0; + padding: 15px 0 0 0; overflow: hidden; } .js-topnews { @@ -255,6 +255,9 @@ a.readon span { padding: 10px; } /* Main content area: main*/ +#main-container { + margin: 15px 0 0 0; +} #js-maincol-fr { float: right; width: 725px; diff --git a/static/css/supporter_layout.css b/static/css/supporter_layout.css index 4ea85133..a05510a4 100644 --- a/static/css/supporter_layout.css +++ b/static/css/supporter_layout.css @@ -62,6 +62,9 @@ color: #3d4e53; padding-right: 5px; } +.user-block4 { + margin-top: 7px; +} img.user-avatar { float: left; margin-right: 10px; @@ -93,7 +96,7 @@ span.rounded { display: inline-block; } span.rounded > span { - padding: 7px 10px; + padding: 7px 7px; min-width: 15px; -moz-border-radius: 5px 5px 5px 5px; -webkit-border-radius: 5px 5px 5px 5px; @@ -101,6 +104,12 @@ span.rounded > span { text-align: center; display: inline-block; } +span.rounded > span .hovertext { + display: none; +} +span.rounded > span:hover .hovertext { + display: inline; +} span.blue { background: #a7d26a url("/static/images/header-button-blue.png") left bottom repeat-x; } diff --git a/static/images/bg.png b/static/images/bg.png index d9aa50d0..715142db 100755 Binary files a/static/images/bg.png and b/static/images/bg.png differ diff --git a/static/images/header-button-blue.png b/static/images/header-button-blue.png index 467132e5..dd6271bb 100755 Binary files a/static/images/header-button-blue.png and b/static/images/header-button-blue.png differ diff --git a/static/less/campaign.less b/static/less/campaign.less index 71c3225a..ad811cfe 100644 --- a/static/less/campaign.less +++ b/static/less/campaign.less @@ -120,15 +120,15 @@ margin-top: 11px; } - .btn_support a { + .btn_support input { background:url("@{image-base}btn_bg.png") 0 0 no-repeat; width:104px; height:41px; - line-height:41px; display:block; color:#fff; font-weight:bold; text-align:center; + border:none; } } diff --git a/static/less/sitewide.less b/static/less/sitewide.less index 02cba3a6..5836b406 100644 --- a/static/less/sitewide.less +++ b/static/less/sitewide.less @@ -252,7 +252,8 @@ a.readon { /* Main content area: top */ #js-topsection { - padding:15px 0; overflow:hidden; + padding:15px 0 0 0; + overflow:hidden; } .js-topnews { @@ -274,6 +275,11 @@ a.readon { } /* Main content area: main*/ + +#main-container { + margin: 15px 0 0 0; +} + #js-maincol-fr { float:right; width:725px; diff --git a/static/less/supporter_layout.less b/static/less/supporter_layout.less index 1b65ce90..be9710b2 100644 --- a/static/less/supporter_layout.less +++ b/static/less/supporter_layout.less @@ -63,6 +63,10 @@ } } +.user-block4 { + margin-top: 7px; +} + img.user-avatar { float:left; margin-right:10px; @@ -101,11 +105,19 @@ span.rounded { display:inline-block; > span { - padding:7px 10px; + padding:7px 7px; min-width:15px; .border-radius(5px, 5px, 5px, 5px); text-align:center; display:inline-block; + + .hovertext { + display: none; + } + + &:hover .hovertext { + display: inline; + } } }