eleventy billion css tweaks part quattuor

pull/1/head
Andromeda Yelton 2011-12-16 12:17:08 -05:00
parent 9085ce6db3
commit cd53080ac6
8 changed files with 114 additions and 25 deletions

View File

@ -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):

View File

@ -25,10 +25,9 @@
<div class="js-topnews3">
<div class="user-block">
<div class="user-block1">
<div class="block-intro-text">With your help we're trying to raise money to buy the right to give these books to the world.</div>
<div class="block-intro-text"><span class="special-user-name">{{ facet|capfirst }}</span></div>
</div>
<div class="user-block2">
<span class="user-name"><a href="#">{{ facet|capfirst }}</a></span>
<div class="user-block2">With your help we're raising money to buy the right to give these books to the world.
</div>
<div class="user-block3">
<div class="user-block">

View File

@ -55,7 +55,6 @@ how do I integrate the your wishlist thing with the tabs thing?
<a class="my-setting" href="#">My Settings</a>
</div>
</div>
{% endifequal %}
<div class="user-block2">
{% if supporter.profile.pic_url %}
<img class="user-avatar" src="{{ supporter.profile.pic_url }}" height="50" width="50" alt="Picture of {{ supporter }}" title="{{ supporter }}" />
@ -66,6 +65,22 @@ how do I integrate the your wishlist thing with the tabs thing?
<span class="user-date">{{ date }}</span>
<span class="user-short-info">{{ supporter.profile.tagline }}</span>
</div>
{% else %}
<div class="user-block1">
<div class="block-inner">
{% if supporter.profile.pic_url %}
<img class="user-avatar" src="{{ supporter.profile.pic_url }}" height="50" width="50" alt="Picture of {{ supporter }}" title="{{ supporter }}" />
{% else %}
<img class="user-avatar" src="/static/images/header/avatar.png" height="50" width="50" alt="Generic Ungluer Avatar" title="Ungluer" />
{% endif %}
<span class="user-name"><a href="#">{{ supporter.username }}</a></span>
<span class="user-date">{{ date }}</span>
</div>
</div>
<div class="user-block2">
<span class="user-short-info">{{ supporter.profile.tagline }}</span>
</div>
{% endifequal %}
<div class="user-block3">
<div class="badges">
<span class="rounded"><span class="blue tabs1" {% ifequal request.user supporter %}title="I've unglued {{ backed }} {% if backed == 1 %}book{% else %}books{% endif %}."{% else %}title="{{ supporter }} has unglued {{ backed }} {% if backed == 1 %}book{% else %}books{% endif %}."{% endifequal %}><span class="hovertext">I've unglued&nbsp;</span>{{ backed }}</span></span>
@ -109,12 +124,12 @@ how do I integrate the your wishlist thing with the tabs thing?
{% csrf_token %}
<div class="block block1">
<div class="block-inner">
<h3><a class="profile-edit" href="#">Your Tagline</a></h3>
<h3><a class="profile-edit" href="#">Your Tagline</a></h3> (140 characters max)
{{ profile_form.tagline.errors }}
{{ profile_form.tagline }}
<input class="profile-save" type="submit" name="submit" value="Update" id="submit">
</div>
<input class="profile-save" type="submit" name="submit" value="Update" id="submit">
</div>
<div class="block block2">

View File

@ -25,10 +25,9 @@
<div class="js-topnews3">
<div class="user-block">
<div class="user-block1">
<div class="block-intro-text">With your help we're trying to raise money to buy the right to give these books to the world.</div>
<div class="block-intro-text"><span class="special-user-name">{{ facet|capfirst }}</span></div>
</div>
<div class="user-block2">
<span class="user-name"><a href="#">{{ facet|capfirst }}</a></span>
<div class="user-block2"><span class="user-short-info">With your help we're raising money to buy the right to give these books to the world.</span>
</div>
<div class="user-block3">
<div class="user-block">
@ -60,9 +59,9 @@
<div class="content-block">
<div class="content-block-heading ungluing" id="tabs">
<ul class="tabs">
<li class="tabs1"><a href="#">Already Unglued</a></li>
<li class="tabs1"><a href="#">Unglued</a></li>
<li class="tabs2 active"><a href="#">Being Unglued</a></li>
<li class="tabs3"><a href="#">Needs Ungluing</a></li>
<li class="tabs3"><a href="#">Unglue It!</a></li>
</ul>
<ul class="book-list-view">

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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);