From cd53080ac6bb0424090e3dfcf183b89f7475f590 Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Fri, 16 Dec 2011 12:17:08 -0500 Subject: [PATCH] eleventy billion css tweaks part quattuor --- frontend/forms.py | 2 +- frontend/templates/campaign_list.html | 5 ++--- frontend/templates/supporter.html | 21 ++++++++++++++++--- frontend/templates/work_list.html | 9 ++++---- static/css/landingpage.css | 28 ++++++++++++++++++++----- static/css/supporter_layout.css | 24 ++++++++++++++++++--- static/less/landingpage.less | 20 ++++++++++++++++-- static/less/supporter_layout.less | 30 ++++++++++++++++++++++++--- 8 files changed, 114 insertions(+), 25 deletions(-) diff --git a/frontend/forms.py b/frontend/forms.py index c958c02c..3019e965 100644 --- a/frontend/forms.py +++ b/frontend/forms.py @@ -65,7 +65,7 @@ class ProfileForm(forms.ModelForm): model = UserProfile fields = 'tagline', 'librarything_id', 'home_url', 'clear_facebook', 'clear_twitter' widgets = { - 'tagline': forms.Textarea(attrs={'cols': 35, 'rows': 4}), + 'tagline': forms.Textarea(attrs={'cols': 25, 'rows': 5}), } class UserData(forms.Form): diff --git a/frontend/templates/campaign_list.html b/frontend/templates/campaign_list.html index 1db51286..d154416b 100644 --- a/frontend/templates/campaign_list.html +++ b/frontend/templates/campaign_list.html @@ -25,10 +25,9 @@
-
With your help we're trying to raise money to buy the right to give these books to the world.
+
{{ facet|capfirst }}
-
- {{ facet|capfirst }} +
With your help we're raising money to buy the right to give these books to the world.
diff --git a/frontend/templates/supporter.html b/frontend/templates/supporter.html index a06c53ee..65d872e2 100644 --- a/frontend/templates/supporter.html +++ b/frontend/templates/supporter.html @@ -55,7 +55,6 @@ how do I integrate the your wishlist thing with the tabs thing? My Settings
- {% endifequal %}
{% if supporter.profile.pic_url %} Picture of {{ supporter }} @@ -66,6 +65,22 @@ how do I integrate the your wishlist thing with the tabs thing? {{ date }} {{ supporter.profile.tagline }}
+ {% else %} +
+
+ {% if supporter.profile.pic_url %} + Picture of {{ supporter }} + {% else %} + Generic Ungluer Avatar + {% endif %} + {{ supporter.username }} + {{ date }} +
+
+
+ {{ supporter.profile.tagline }} +
+ {% endifequal %}
I've unglued {{ backed }} @@ -109,12 +124,12 @@ how do I integrate the your wishlist thing with the tabs thing? {% csrf_token %}
-

Your Tagline

+

Your Tagline

(140 characters max) {{ profile_form.tagline.errors }} {{ profile_form.tagline }} -
+
diff --git a/frontend/templates/work_list.html b/frontend/templates/work_list.html index aa4b9555..9f7bd798 100644 --- a/frontend/templates/work_list.html +++ b/frontend/templates/work_list.html @@ -25,10 +25,9 @@
-
With your help we're trying to raise money to buy the right to give these books to the world.
+
{{ facet|capfirst }}
-
- {{ facet|capfirst }} +
With your help we're raising money to buy the right to give these books to the world.
@@ -60,9 +59,9 @@
    diff --git a/static/css/landingpage.css b/static/css/landingpage.css index 15819d2f..cdc7c8ae 100644 --- a/static/css/landingpage.css +++ b/static/css/landingpage.css @@ -13,6 +13,9 @@ border-style: solid none; border-color: #FFFFFF; } +#expandable { + display: none; +} #main-container.main-container-fl .js-main { width: 968px; background: #ffffff url(/static/images/landingpage/container-top.png) top center no-repeat; @@ -80,11 +83,26 @@ color: #3d4e53; padding-right: 15px; } -#js-rightcol { +#collapser { + float: right; + height: 24px; + line-height: 24px; + width: 24px; + -moz-border-radius: 12px 12px 12px 12px; + -webkit-border-radius: 12px 12px 12px 12px; + border-radius: 12px 12px 12px 12px; + border: solid 4px #3d4e53; + text-align: center; + font-size: 17px; + z-index: 5000; + margin-top: -12px; + margin-right: -22px; +} +#js-rightcol, #js-rightcol2 { float: right; width: 230px; } -#js-rightcol .jsmodule { +#js-rightcol .jsmodule, #js-rightcol2 .jsmodule { float: left; width: 208px; background: #edf3f4; @@ -95,14 +113,14 @@ margin-bottom: 10px; padding: 0 10px 10px 10px; } -#js-rightcol .jsmodule.last { +#js-rightcol .jsmodule.last, #js-rightcol2 .jsmodule.last { border-bottom: none; padding-bottom: 10px; } -#js-rightcol div.button { +#js-rightcol div.button, #js-rightcol2 div.button { padding-top: 10px; } -#js-rightcol label { +#js-rightcol label, #js-rightcol2 label { width: 100%; display: block; clear: both; diff --git a/static/css/supporter_layout.css b/static/css/supporter_layout.css index a05510a4..e249a319 100644 --- a/static/css/supporter_layout.css +++ b/static/css/supporter_layout.css @@ -24,10 +24,16 @@ float: left; width: 100%; clear: both; + padding-top: 10px; } .user-block-hide .block { float: left; - width: 33%; +} +.user-block-hide .block1, .user-block-hide .block3 { + width: 25%; +} +.user-block-hide .block2 { + width: 50%; } .user-block-hide input { float: left; @@ -71,11 +77,21 @@ img.user-avatar { } .social { width: 100%; - padding-left: 35px; +} +span.special-user-name { + display: block; + font-size: 17px; + color: #3d4e53; + margin-left: 10px; + font-weight: bold; + height: 50px; } span.user-name, span.user-date, span.user-short-info { display: block; } +.user-block2 .user-short-info { + padding-right: 10px; +} span.user-name, span.user-name a, a { font-size: 12px; color: #3d4e53; @@ -126,7 +142,6 @@ div.check-list { } a.profile-edit { display: block; - background: url("/static/images/header/icon-edit.png") right top no-repeat; } div.profile-save { padding-top: 15px; @@ -186,6 +201,9 @@ ul.tabs li { line-height: 46px; margin-right: 2px; } +ul.tabs li.tabs1, ul.tabs li.tabs2 { + width: 112px; +} ul.tabs li a { height: 46px; line-height: 46px; diff --git a/static/less/landingpage.less b/static/less/landingpage.less index 18c94885..17760afd 100644 --- a/static/less/landingpage.less +++ b/static/less/landingpage.less @@ -9,12 +9,15 @@ position:absolute; top:45%; } +#expandable { + display: none; +} #main-container.main-container-fl .js-main { width:968px; background:#fff url(/static/images/landingpage/container-top.png) top center no-repeat; } -#js-maincol-fl { +#js-maincol-fl, { padding:30px 30px 0 30px; overflow:hidden; @@ -90,7 +93,20 @@ } } -#js-rightcol { +#collapser { + float: right; + .height(24px); + width: 24px; + .border-radius(12px, 12px, 12px, 12px); + border: solid 4px @text-blue; + text-align: center; + font-size: 17px; + z-index:5000; + margin-top: -12px; + margin-right:-22px; +} + +#js-rightcol, #js-rightcol2 { float:right; width:230px; diff --git a/static/less/supporter_layout.less b/static/less/supporter_layout.less index be9710b2..1e52947b 100644 --- a/static/less/supporter_layout.less +++ b/static/less/supporter_layout.less @@ -13,12 +13,20 @@ float: left; width:100%; clear:both; + padding-top: 10px; .block { float:left; - width:33%; } + .block1, .block3 { + width:25%; + } + + .block2 { + width:50%; + } + input { float:left; margin:3px 10px 0 0; @@ -74,7 +82,15 @@ img.user-avatar { .social { width:100%; - padding-left:35px; +} + +span.special-user-name { + display: block; + font-size: 17px; + color:@text-blue; + margin-left:10px; + font-weight:bold; + height:50px; } span.user-name, @@ -83,6 +99,10 @@ span.user-short-info { display: block; } +.user-block2 .user-short-info { + padding-right:10px; +} + span.user-name, span.user-name a, a { @@ -142,7 +162,7 @@ div.check-list { a.profile-edit { display:block; - background:url("@{image-base}header/icon-edit.png") right top no-repeat; +// background:url("@{image-base}header/icon-edit.png") right top no-repeat; } div.profile-save { @@ -212,6 +232,10 @@ ul.tabs { float: left; .height(46px); margin-right:2px; + + &.tabs1, &.tabs2 { + width:112px; + } a { .height(46px);