addressing CSS comments and also fixing some invalid html

pull/1/head
Andromeda Yelton 2012-12-17 14:23:23 -05:00
parent ab2d3d51b6
commit 4a307a1e00
12 changed files with 152 additions and 35 deletions

View File

@ -22,9 +22,9 @@
<p><b>On:</b> {{ deadline|date:"M d, Y" }}</p>
<p><b>Raised:</b> {{ work.last_campaign.current_total|floatformat:0|intcomma }}</p>
{% if first_ebook %}
<a href="{% url download workid %}" class="hijax"><div class="read_itbutton"><span>Read it Now</span></div></a>
<a href="{% url download workid %}" class="hijax"><span class="read_itbutton"><span>Read it Now</span></span></a>
{% else %}
<div class="read_itbutton"><span>Coming Soon</span></div>
<span class="read_itbutton"><span>Coming Soon</span></span>
{% endif %}
{% else %}{% if status == 'ACTIVE' %}
@ -32,7 +32,7 @@
<p><b>${{ work.last_campaign.current_total|floatformat:0|intcomma }}</b> raised</p>
<p><b>${{ work.last_campaign.target|floatformat:0|intcomma }}</b> needed</p>
<p>by {{ deadline|naturalday:"M d, Y" }}</p>
<a href="{% url pledge work_id=workid %}"><div class="read_itbutton pledge"><span>Pledge</span></div></a>
<a href="{% url pledge work_id=workid %}"><span class="read_itbutton pledge"><span>Pledge</span></span></a>
{% else %}{% if status == 'INITIALIZED' %}
<p>Campaign coming soon!</p>
@ -50,7 +50,7 @@
{% else %}
{% if first_ebook %}
<b>AVAILABLE!</b>
<a href="{{ work.ebooks.0.url }}"><div class="read_itbutton"><span>Read it Now</span></div></a>
<a href="{{ work.ebooks.0.url }}"><span class="read_itbutton"><span>Read it Now</span></span></a>
{% else %}
<p>No campaign yet.</p><br /><p>But if lots of ungluers wishlist this book, maybe there will be!</p>
{% endif %}
@ -156,7 +156,7 @@
<span class="booklist-status-label">Status:&nbsp;</span><span class="booklist-status-text">Coming soon!</span>
{% else %}{% ifequal status "SUCCESSFUL" %}
{% if work.has_unglued_edition %}
<a href="{% url download workid %}" class="hijax"><div class="read_itbutton"><span>Read it Now</span></div></a>
<a href="{% url download workid %}" class="hijax"><span class="read_itbutton"><span>Read it Now</span></span></a>
{% else %}
Ebook coming soon!
{% endif %}

View File

@ -13,10 +13,6 @@
#tabs-2 {
display: none;
}
ul.tabs li a {
line-height: 18px;
}
</style>
{% endblock %}
{% block extra_head %}

View File

@ -215,10 +215,10 @@ $j(document).ready(function(){
{% get_comment_count for work as comment_count %}
<div class="content-block-heading" id="tabs">
<ul class="tabs">
<li class="tabs1 {% if activetab == '1' %}active{% endif %}"><a href="#"><div>{% if status == 'ACTIVE' %}Campaign{% else %}Description{% endif %}</div></a></li>
<li class="tabs2 {% if activetab == '2' %}active{% endif %}"><a href="#"><div>Comments {% if comment_count > 0 %}({{ comment_count }}){% endif %}</div></a></li>
<li class="tabs3 {% if activetab == '3' %}active{% endif %}" id="supporters"><a href="#"><div>Ungluers {% if wishers > 0 %}<br />({{ wishers }}){% endif %}</div></a></li>
<li class="tabs4 {% if activetab == '4' %}active{% endif %}"><a href="#"><div>Rights</div></a></li>
<li class="tabs1 {% if activetab == '1' %}active{% endif %}"><a href="#">{% if status == 'ACTIVE' %}Campaign{% else %}Description{% endif %}</a></li>
<li class="tabs2 {% if activetab == '2' %}active{% endif %}"><a href="#">Comments {% if comment_count > 0 %}({{ comment_count }}){% endif %}</a></li>
<li class="tabs3 {% if activetab == '3' %}active{% endif %}" id="supporters"><a href="#">Ungluers {% if wishers > 0 %}<br />({{ wishers }}){% endif %}</a></li>
<li class="tabs4 {% if activetab == '4' %}active{% endif %}"><a href="#">Rights</a></li>
</ul>
</div>

View File

@ -145,6 +145,12 @@ div.book-list.listview div.create-account span {
text-transform: none;
padding-left: 20px;
}
div.book-list.listview div.add-wishlist span.booklist_pledge,
div.book-list.listview div.remove-wishlist span.booklist_pledge,
div.book-list.listview div.on-wishlist span.booklist_pledge,
div.book-list.listview div.create-account span.booklist_pledge {
padding-left: 18px;
}
div.book-list.listview div.add-wishlist span,
div.book-list.listview div.create-account span {
background: url("/static/images/booklist/add-wishlist.png") left center no-repeat;

View File

@ -77,7 +77,6 @@
}
/* Local variables */
.greenpanelstuff {
font-family: Arial, Helvetica, sans-serif;
font-size: 12px;
width: 120px;
line-height: 16px;
@ -97,6 +96,7 @@
.readit {
width: 118px;
height: 35px;
line-height: 35px;
padding: 0px 0px;
background: #FFF;
margin: 0px;
@ -130,7 +130,6 @@
}
/* styling of front side elements */
.panelview.book-list {
font-family: Arial, Helvetica, sans-serif;
font-size: 12px;
width: 120px;
line-height: 16px;
@ -156,7 +155,6 @@
display: none;
}
.panelview.book-name div {
font-family: Arial, Helvetica, sans-serif;
font-size: 12px;
line-height: 16px;
max-height: 32px;
@ -236,7 +234,6 @@ div.panelview.side2 {
position: relative;
}
.greenpanel2 {
font-family: Arial, Helvetica, sans-serif;
font-size: 12px;
width: 120px;
line-height: 16px;
@ -263,6 +260,7 @@ div.panelview.side2 {
.read_itbutton {
width: 118px;
height: 35px;
line-height: 35px;
padding: 0px 0px;
background: #FFF;
margin: 0px;
@ -270,12 +268,14 @@ div.panelview.side2 {
-webkit-border-radius: 4px;
border-radius: 4px;
border: 1px solid #81bb38;
display: block;
}
.read_itbutton span {
height: 35px;
line-height: 35px;
font-size: 11px;
background-repeat: no-repeat;
background-position: 10px center;
background-position: 10px auto;
font-weight: bold;
text-decoration: none;
text-transform: uppercase;
@ -296,10 +296,11 @@ div.panelview.side2 {
background-position: 90% center;
}
.read_itbutton.pledge span {
height: 35px;
line-height: 35px;
font-size: 11px;
background-repeat: no-repeat;
background-position: 10px center;
background-position: 10px auto;
font-weight: bold;
text-decoration: none;
text-transform: uppercase;
@ -317,6 +318,7 @@ div.panelview.side2 {
.read_itbutton_fail {
width: 118px;
height: 35px;
line-height: 35px;
padding: 0px 0px;
background: #FFF;
margin: 0px;
@ -326,10 +328,11 @@ div.panelview.side2 {
border: 1px solid #81bb38;
}
.read_itbutton_fail span {
line-height: 40px;
height: 35px;
line-height: 35px;
font-size: 11px;
background-repeat: no-repeat;
background-position: 10px center;
background-position: 10px auto;
font-weight: bold;
text-decoration: none;
text-transform: uppercase;
@ -343,6 +346,7 @@ div.panelview.side2 {
.Unglue_itbutton {
width: 118px;
height: 35px;
line-height: 35px;
padding: 0px 0px;
background: #FFF;
margin: 0px;
@ -353,10 +357,11 @@ div.panelview.side2 {
}
.Unglue_itbutton a {
background-image: url("/static/images/book-panel/unglue_icon.png");
height: 40px;
line-height: 40px;
font-size: 11px;
background-repeat: no-repeat;
background-position: 10px center;
background-position: 10px auto;
font-weight: bold;
text-decoration: none;
text-transform: uppercase;
@ -385,10 +390,11 @@ div.panelview.side2 {
.moreinfo.create-account a,
.moreinfo.add-wishlist span,
.moreinfo.create-account span {
height: 30px;
line-height: 30px;
font-size: 11px;
background-repeat: no-repeat;
background-position: left center;
background-position: left auto;
font-weight: bold;
text-decoration: none;
text-transform: uppercase;
@ -417,10 +423,11 @@ div.panelview.side2 {
}
.moreinfo.remove-wishlist a,
.moreinfo.remove-wishlist span {
height: 30px;
line-height: 30px;
font-size: 11px;
background-repeat: no-repeat;
background-position: left center;
background-position: left auto;
font-weight: bold;
text-decoration: none;
text-transform: uppercase;
@ -447,10 +454,11 @@ div.panelview.side2 {
}
.moreinfo.on-wishlist a,
.moreinfo.on-wishlist span {
height: 30px;
line-height: 30px;
font-size: 11px;
background-repeat: no-repeat;
background-position: left center;
background-position: left auto;
font-weight: bold;
text-decoration: none;
text-transform: uppercase;
@ -500,10 +508,11 @@ div.panelview.side2 {
}
.moreinfo a,
.moreinfo span {
height: 30px;
line-height: 30px;
font-size: 11px;
background-repeat: no-repeat;
background-position: left center;
background-position: left auto;
font-weight: bold;
text-decoration: none;
text-transform: uppercase;

View File

@ -122,7 +122,7 @@ ul.tabs li.tabs4 {
padding-right: 0px;
}
ul.tabs li a {
height: 46px;
height: 41px;
line-height: 18px;
display: block;
text-align: center;
@ -133,6 +133,7 @@ ul.tabs li a {
border-radius: 7px 7px 0 0;
background: #d6dde0;
color: #3d4e53;
padding-top: 5px;
}
ul.tabs li a:hover {
text-decoration: none;

View File

@ -1,3 +1,80 @@
/* 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;
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;
}
.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;
}
.user-block2 {
width: 48%;
font-size: 14px;
@ -17,3 +94,13 @@
#tabs-3 {
margin-left: 0;
}
ul.tabs li a {
height: 41px;
line-height: 18px;
padding-top: 5px;
}
ul.tabs li.active a,
ul.tabs li:hover a {
background-color: #8dc63f !important;
color: white !important;
}

View File

@ -122,7 +122,7 @@ ul.tabs li.tabs4 {
padding-right: 0px;
}
ul.tabs li a {
height: 46px;
height: 41px;
line-height: 18px;
display: block;
text-align: center;
@ -133,6 +133,7 @@ ul.tabs li a {
border-radius: 7px 7px 0 0;
background: #d6dde0;
color: #3d4e53;
padding-top: 5px;
}
ul.tabs li a:hover {
text-decoration: none;

View File

@ -73,6 +73,10 @@ div.book-list.listview{
padding-left:20px;
}
span.booklist_pledge {
padding-left: 18px;
}
}
&.add-wishlist span, &.create-account span {

View File

@ -2,17 +2,16 @@
/* Local variables */
.greenpanelstuff {
font-family: Arial, Helvetica, sans-serif;
font-size: 12px;
width: 120px;
line-height:16px;
}
.greenpanelactionitems(@pos, @lineheight) {
line-height:@lineheight;
.height(@lineheight);
font-size:11px;
background-repeat: no-repeat;
background-position: @pos center;
background-position: @pos auto;
font-weight:bold;
text-decoration:none;
text-transform: uppercase;
@ -34,7 +33,7 @@
.readit {
width:118px;
height:35px;
.height(35px);
padding:0px 0px;
background:#FFF;
margin:0px;
@ -123,7 +122,6 @@
}
.panelview.book-name div {
font-family: Arial, Helvetica, sans-serif;
font-size: 12px;
line-height:16px;
max-height:32px;
@ -221,6 +219,7 @@ div.panelview.side2 {
/* White-background action buttons; vary by state of campaign */
.read_itbutton {
.readit;
display: block;
span {
.readit_inner(30px, 35px);
background: url("@{image-base}book-panel/book_icon.png") no-repeat 10% center;
@ -246,7 +245,7 @@ div.panelview.side2 {
.readit;
span {
.readit_inner(15px, 40px);
.readit_inner(15px, 35px);
background: none;
}
}

View File

@ -46,7 +46,7 @@ ul.tabs {
}
a {
height: 46px;
height: 41px;
line-height: 18px;
display:block;
text-align:center;
@ -55,6 +55,7 @@ ul.tabs {
.border-radius(7px, 7px, 0, 0);
background:@blue-grey;
color:@text-blue;
padding-top: 5px;
&:hover {
text-decoration: none;

View File

@ -1,3 +1,5 @@
@import "variables.less";
.user-block2 {
width: 48%;
font-size: 14px;
@ -18,4 +20,15 @@
#tabs-1, #tabs-2, #tabs-3 {
margin-left: 0;
}
ul.tabs li a {
height: 41px;
line-height: 18px;
padding-top: 5px;
}
ul.tabs li.active a, ul.tabs li:hover a {
background-color: @call-to-action !important;
color: white !important;
}