EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #103 from Gluejar/list_tab_vertical_centering 

List tab vertical centering
pull/1/head
eshellman 2013-01-02 14:32:07 -08:00
parent a6186e3bc6 c2bc4f6b68
commit 606d531ab9
26 changed files with 280 additions and 912 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
core/management/commands/rectify_OLA_acknames.py Normal file
View File

@ -0,0 +1,25 @@
"""
one-time command to ensure transaction.ack_name for OLA returns something sensible
see https://github.com/Gluejar/regluit/pull/97#discussion_r2436193
"""
from django.core.management.base import BaseCommand
from regluit.core.models import Campaign
from regluit.payment.models import Transaction
class Command(BaseCommand):
help = "make sure transaction.ack_name returns something sensible for OLA transactions"
def handle(self, **options):
ola_campaign = Campaign.objects.filter(work__id=81834)
assert ola_campaign.count() == 1
ola_campaign = ola_campaign[0]
ola_transactions = Transaction.objects.filter(campaign=ola_campaign)
for t in ola_transactions:
if t.anonymous:
t.ack_name = ''
else:
if not t.ack_name:
t.ack_name = t.user.username
t.dedication = ''
t.save()

10
core/models.py
View File

@ -781,7 +781,15 @@ class Work(models.Model):
def __unicode__(self):
return self.title
@property
def has_unglued_edition(self):
"""
allows us to distinguish successful campaigns with ebooks still in progress from successful campaigns with ebooks available
"""
if self.ebooks().filter(edition__unglued=True):
return True
return False
class Author(models.Model):
created = models.DateTimeField(auto_now_add=True)

12
frontend/templates/book_panel.html
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 %}
@ -151,12 +151,12 @@
<div class="listview panelfront side1 booklist-status">
{% ifequal status "ACTIVE" %}
<span class="booklist-status-text" style="width: 190px"><b>${{ work.last_campaign.current_total|floatformat:0|intcomma }}</b>/<b>${{ work.last_campaign.target|floatformat:0|intcomma }}</b></span>
<span class="booklist-status-text"><b>${{ work.last_campaign.current_total|floatformat:0|intcomma }}</b>/<b>${{ work.last_campaign.target|floatformat:0|intcomma }}</b></span>
{% else %}{% ifequal status "INITIALIZED" %}
<span class="booklist-status-label">Status:&nbsp;</span><span class="booklist-status-text">Coming soon!</span>
{% else %}{% ifequal status "SUCCESSFUL" %}
{% if not first_ebook %}
<span class="booklist-status-text" style="width: 190px">Ebook coming soon</span>
<span class="booklist-status-text">Ebook coming soon</span>
{% else %}
<span class="booklist-status-label"></span>
{% endif %}

7
frontend/templates/campaign_list.html
View File

@ -59,7 +59,7 @@ location.hash = "#2";
<div id="content-block">
<div class="content-block-heading ungluing" id="tabs">
<ul class="tabs">
<li class="tabs2 active"><a href="#">Active</a></li>
<li class="tabs2 active"><a href="#">Active<br />({{ campaign_list.count }})</a></li>
</ul>
<ul class="book-list-view">
@ -75,13 +75,10 @@ location.hash = "#2";
</a>
</li>
</ul>
<div class="badges listspage">
<span class="rounded"><span class="orange" title="We're ungluing {{ campaign_list.count }} {% if campaign_list.count == 1 %}book{% else %}books{% endif %}."><span class="hovertext">We're ungluing&nbsp;</span>{{ campaign_list.count }}</span></span>
</div>
</div>
<div id="content-block-content">
{% ifequal campaign_list.count 0 %}
There aren't any {{pub_lang|ez_lang_name}} ungluing campaigns active yet. If you're a rights holder, you can <a href="/faq/rightsholders">start one</a>.
There aren't any {{ pub_lang|ez_lang_name }} ungluing campaigns active yet. If you're a rights holder, you can <a href="/faq/rightsholders">start one</a>.
{% else %}
{% lazy_paginate 20 campaign_list using "campaign_list" %}

2
frontend/templates/explore.html
View File

@ -19,7 +19,7 @@
<li><a href="{% url work_list 'popular' %}"><span>Most Wished</span></a></li>
<li><a href="{% url work_list 'new' %}"><span>Newly Wished</span></a></li>
<li><a href="{% url work_list 'recommended' %}"><span>Noteworthy</span></a></li>
<li class="last"><a href="{% url unglued_list 'recent' %}"><span>Ready to Read</span></a></li>
<li class="last"><a href="{% url unglued_list '' %}"><span>Ready to Read</span></a></li>
</ul>
</li>
{% if show_langs %}

14
frontend/templates/front_matter.html
View File

@ -6,6 +6,7 @@
.ackbox {
float: left;
min-width: 33%;
margin-right: 7px;
}
h2 {
@ -14,19 +15,6 @@
padding: 20px 0 10px 0 !important;
}
dt {
margin-left: auto;
padding-left: 7px;
margin-bottom: 0;
}
dd {
margin-left: 7px;
border-left: solid 2px #EDF3F4;
padding-left: 5px;
padding-top: 7px;
}
p {
text-indent: 0;
}

40
frontend/templates/unglued_list.html
View File

@ -28,9 +28,9 @@
<div class="js-topnews3">
<div class="user-block">
<div id="user-block1">
<div id="block-intro-text"><span class="special-user-name">{{ facet|capfirst }}</span></div>
<div id="block-intro-text"><span class="special-user-name">{% if facet %}{{ facet|capfirst }}{% else %}Ready to Read{% endif %}</span></div>
</div>
<div class="user-block2"><span class="user-short-info">These {% if pub_lang %}{{pub_lang|ez_lang_name}} language {% endif %}ebooks are ready to read- either they're in the public domain, or they've been 'unglued' by ungluers like you.</span>
<div class="user-block2"><span class="user-short-info">These {% if pub_lang %}{{ pub_lang|ez_lang_name }} language {% endif %}ebooks are ready to read - either they're in the public domain, or they've been unglued by people like you.</span>
</div>
<div class="user-block3">
</div>
@ -57,29 +57,25 @@
<div id="content-block">
<div class="content-block-heading unglued" id="tabs">
<ul class="tabs">
<li class="tabs1"><a href="#">Unglued</a></li>
<li class="tabs1"><a href="#">All<br />({{ work_list.count }})</a></li>
</ul>
<ul class="book-list-view">
<li>View As:</li>
<li class="view-list">
<a href="#" id="toggle-list">
<img src="/static/images/booklist/view-list.png" alt="view list" title="view list" height="21" width="24" />
</a>
</li>
<li class="view-list">
<a href="#" id="toggle-panel">
<img src="/static/images/booklist/view-icon.png" alt="view icon" title="view icon" height="22" width="22" />
</a>
</li>
</ul>
<div class="badges listspage">
<span class="rounded"><span class="blue tabs1" title="Enjoy {{ counts.unglued }} unglued {% if counts.unglued == 1 %}book{% else %}books{% endif %}."><span class="hovertext">Enjoy&nbsp;</span>{{ counts.unglued }}</span></span>
</div>
<ul class="book-list-view">
<li>View As:</li>
<li class="view-list">
<a href="#" id="toggle-list">
<img src="/static/images/booklist/view-list.png" alt="view list" title="view list" height="21" width="24" />
</a>
</li>
<li class="view-list">
<a href="#" id="toggle-panel">
<img src="/static/images/booklist/view-icon.png" alt="view icon" title="view icon" height="22" width="22" />
</a>
</li>
</ul>
</div>
<div id="content-block-content">
{% ifequal work_list.count 0 %}
There aren't any {{pub_lang|ez_lang_name}} works in this list. Why don't you add some?
There aren't any {{ pub_lang|ez_lang_name }} works in this list. Why don't you add some?
{% else %}
{% lazy_paginate 20 work_list using "work_list" %}
{% for work in work_list %}
@ -105,4 +101,4 @@
</div>
</div>
{% endblock %}
{% endwith %}
{% endwith %}

8
frontend/templates/work.html
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>

40
frontend/templates/work_list.html
View File

@ -71,36 +71,30 @@
<div id="content-block">
<div class="content-block-heading wantto" id="tabs">
<ul class="tabs">
<li class="tabs1"><a href="#">Unglued</a></li>
<li class="tabs2"><a href="#">Active</a></li>
<li class="tabs3"><a href="#">Unglue It!</a></li>
<li class="tabs1"><a href="#">Unglued<br />({{ counts.unglued }})</a></li>
<li class="tabs2"><a href="#">Active<br />({{ counts.unglueing }})</a></li>
<li class="tabs3"><a href="#">Unglue It!<br />({{ counts.wished }})</a></li>
</ul>
<ul class="book-list-view">
<li>View As:</li>
<li class="view-list">
<a href="#" id="toggle-list">
<img src="/static/images/booklist/view-list.png" alt="view list" title="view list" height="21" width="24" />
</a>
</li>
<li class="view-list">
<a href="#" id="toggle-panel">
<img src="/static/images/booklist/view-icon.png" alt="view icon" title="view icon" height="22" width="22" />
</a>
</li>
</ul>
<div class="badges listspage">
<span class="rounded"><span class="blue tabs1" title="Enjoy {{ counts.unglued }} unglued {% if counts.unglued == 1 %}book{% else %}books{% endif %}."><span class="hovertext">Enjoy&nbsp;</span>{{ counts.unglued }}</span></span>
<span class="rounded"><span class="orange tabs2" title="We're ungluing {{ counts.unglueing }} {% if counts.unglueing == 1 %}book{% else %}books{% endif %}."><span class="hovertext">Ungluing&nbsp;</span>{{ counts.unglueing }}</span></span>
<span class="rounded"><span class="grey tabs3" title="We're wishing for {{ counts.wished }} {% if counts.wished == 1 %}book{% else %}books{% endif %}."><span class="hovertext">Wishing for&nbsp;</span>{{ counts.wished }}</span></span>
</div>
<ul class="book-list-view">
<li>View As:</li>
<li class="view-list">
<a href="#" id="toggle-list">
<img src="/static/images/booklist/view-list.png" alt="view list" title="view list" height="21" width="24" />
</a>
</li>
<li class="view-list">
<a href="#" id="toggle-panel">
<img src="/static/images/booklist/view-icon.png" alt="view icon" title="view icon" height="22" width="22" />
</a>
</li>
</ul>
</div>
<div id="content-block-content">
{% ifequal work_list.count 0 %}
{% if facet == 'recommended' %}
Check back soon to see what we're recommending.
{% else %}
There aren't any {{pub_lang|ez_lang_name}} works in this list yet. Why not add your favorite books to your wishlist, so we can feature them here?
There aren't any {{ pub_lang|ez_lang_name }} works in this list yet. Why not add your favorite books to your wishlist, so we can feature them here?
{% endif %}
{% else %}
{% comment %}

17
static/css/book_list.css
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;
@ -160,8 +166,7 @@ div.book-list.listview div > span.on-wishlist {
background: url("/static/images/checkmark_small.png") left center no-repeat;
}
div.book-list.listview div.booklist-status {
width: 110px;
margin-right: 7px;
margin-right: 85px;
float: left;
}
div.add-wishlist,
@ -175,6 +180,11 @@ div.remove-wishlist {
float: left;
display: block;
padding-right: 5px;
max-width: 180px;
overflow: hidden;
}
.booklist-status.listview .read_itbutton {
margin-top: 4px;
}
div.unglue-this a {
text-transform: uppercase;
@ -304,6 +314,9 @@ ul.navigation li.active a {
.listview.icons .booklist-status-label {
display: none;
}
.listview.icons .boolist-ebook img {
margin-top: 6px;
}
div#content-block-content {
padding-bottom: 100px;
}

39
static/css/book_panel.css
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 {
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;
@ -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;
@ -340,7 +343,7 @@ div.panelview.side2 {
.read_itbutton_fail span:hover {
text-decoration: none;
}
.panelfront.icons .read_itbutton {
.panelview.panelfront.icons .read_itbutton {
margin-bottom: 7px;
height: 30px !important;
line-height: 30px !important;
@ -348,6 +351,7 @@ div.panelview.side2 {
.Unglue_itbutton {
width: 118px;
height: 35px;
line-height: 35px;
padding: 0px 0px;
background: #FFF;
margin: 0px;
@ -358,10 +362,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;
@ -390,10 +395,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;
@ -422,10 +428,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;
@ -452,10 +459,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;
@ -505,10 +513,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;

3
static/css/campaign.css
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;

39
static/css/documentation.css
View File

@ -313,25 +313,17 @@ body {
font-weight: bold;
}
.doc ul {
list-style: none;
list-style-type: disc;
padding: 0;
margin: 0;
}
.doc ul li {
margin-bottom: 7px;
-moz-border-radius: 14px;
-webkit-border-radius: 14px;
border-radius: 14px;
-moz-border-radius: 14px;
-webkit-border-radius: 14px;
border-radius: 14px;
padding: 10px;
background: #edf3f4;
}
.doc ul.errorlist li {
background: none;
margin-bottom: 0;
}
.doc ul li {
margin-left: 7px;
}
.doc ul.terms {
list-style: inherit;
list-style-position: inside;
@ -359,24 +351,15 @@ body {
font-style: italic;
}
dt {
margin: 7px 0px 7px -7px;
-moz-border-radius: 14px;
-webkit-border-radius: 14px;
border-radius: 14px;
-moz-border-radius: 14px;
-webkit-border-radius: 14px;
border-radius: 14px;
padding: 10px 0px 10px 7px;
background: #edf3f4;
}
dt.nomargin {
margin: 7px 0px;
}
dt.nomargin a {
margin-left: 7px;
font-style: italic;
font-size: 15px;
margin-bottom: 7px;
border-top: solid #edf3f4 2px;
border-bottom: solid #edf3f4 2px;
padding: 7px 0;
}
dd {
margin: 0;
margin: 0 0 0 7px;
padding-bottom: 7px;
}
dd.margin {

552
static/css/landingpage2.css
View File

File diff suppressed because one or more lines are too long

87
static/css/lists.css
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;
@ -12,3 +89,13 @@
#lang_list {
display: none;
}
#tabs-1,
#tabs-2,
#tabs-3 {
margin-left: 0;
}
ul.tabs li a {
height: 41px;
line-height: 18px;
padding-top: 5px;
}

3
static/css/manage_campaign.css
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;

199
static/css/registration2.css
View File

@ -1,198 +1 @@
/* 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;
}
#login_centerer {
padding: 10px 25%;
width: 960px;
}
#registration {
width: 960px;
padding: 10px;
margin: 0 auto;
padding: 10px 0;
font-size: 13px;
line-height: 19.5px;
}
#registration .helptext {
font-style: italic;
}
#registration .helptext:before {
white-space: pre;
content: "\A";
}
#login {
border: solid 3px #d6dde0;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
margin: 10px auto;
float: left;
padding: 10px;
width: 50%;
}
#login .google_signup {
padding: 14px 0;
}
#login .google_signup div {
height: 32px;
line-height: 32px;
float: left;
padding-left: 5px;
font-size: 15px;
}
#login .google_signup img {
float: left;
height: 32px;
width: 32px;
}
#login input[type="text"],
#login input[type="password"] {
width: 90%;
}
.actionbutton {
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;
float: left;
}
#welcomesearch label {
display: block;
margin: 0 auto;
font-size: 19px;
padding-bottom: 10px;
}
#welcomesearch p {
margin-bottom: 5px;
}
#welcomesearch form {
margin: 0 auto;
width: 210px;
background: url("/static/images/landingpage/search-box-two.png") 0 0 no-repeat;
height: 36px;
display: block;
overflow: hidden;
}
#welcomesearch input.inputbox {
border: none;
color: #66942e;
height: 26px;
line-height: 26px;
font-size: 13px;
float: left;
padding: 0;
margin: 5px 0 5px 20px;
width: 149px;
outline: none;
}
#welcomesearch input.inputbox:focus {
border: none;
}
#welcomesearch input.greenbutton[type="submit"] {
background: url("/static/images/landingpage/search-button-two.png") 0 0 no-repeat;
width: 40px;
height: 40px;
padding: 0;
margin: 0;
border: none;
display: block;
float: right;
text-indent: -10000px;
font-size: 0;
-moz-border-radius: 0;
-webkit-border-radius: 0;
border-radius: 0;
}
.welcomealternatives {
border-top: 1px solid #d6dde0;
margin-top: 10px;
padding-top: 5px;
}
label:before {
content: "\A";
white-space: pre;
}
.header-text{height:36px;line-height:36px;display:block;text-decoration:none;font-weight:bold;letter-spacing:-0.05em}.panelborders{border-width:1px 0;border-style:solid none;border-color:#fff}.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:0;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:0}#login_centerer{padding:10px 25%;width:960px}#registration{width:960px;padding:10px;margin:0 auto;padding:10px 0;font-size:13px;line-height:19.5px}#registration .helptext{font-style:italic}#registration .helptext:before{white-space:pre;content:"\A"}#login{border:solid 3px #d6dde0;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;margin:10px auto;float:left;padding:10px;width:50%}#login .google_signup{padding:14px 0}#login .google_signup div{height:32px;line-height:32px;float:left;padding-left:5px;font-size:15px}#login .google_signup img{float:left;height:32px;width:32px}#login input[type="text"],#login input[type="password"]{width:90%}.actionbutton{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:0;margin:5px 0;float:left}#welcomesearch label{display:block;margin:0 auto;font-size:19px;padding-bottom:10px}#welcomesearch p{margin-bottom:5px}#welcomesearch form{margin:0 auto;width:210px;background:url("/static/images/landingpage/search-box-two.png") 0 0 no-repeat;height:36px;display:block;overflow:hidden}#welcomesearch input.inputbox{border:0;color:#66942e;height:26px;line-height:26px;font-size:13px;float:left;padding:0;margin:5px 0 5px 20px;width:149px;outline:0}#welcomesearch input.inputbox:focus{border:0}#welcomesearch input.greenbutton[type="submit"]{background:url("/static/images/landingpage/search-button-two.png") 0 0 no-repeat;width:40px;height:40px;padding:0;margin:0;border:0;display:block;float:right;text-indent:-10000px;font-size:0;-moz-border-radius:0;-webkit-border-radius:0;border-radius:0}.welcomealternatives{border-top:1px solid #d6dde0;margin-top:10px;padding-top:5px}label:before{content:"\A";white-space:pre}

2
static/css/sitewide2.css
View File

File diff suppressed because one or more lines are too long

4
static/css/supporter_layout.css
View File

@ -327,10 +327,6 @@ span.my-setting {
span.my-setting.active {
background: #d6dde0 url("/static/images/header/collspane.png") 90% center no-repeat;
}
.badges.listspage {
float: left;
margin-left: 12px;
}
#tabs {
clear: both;
float: left;

18
static/less/book_list.less
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 {
@ -92,8 +96,8 @@ div.book-list.listview{
}
&.booklist-status {
width: 110px;
margin-right:7px;
//width: 110px;
margin-right:85px;
float: left;
}
}
@ -112,6 +116,12 @@ div.add-wishlist, div.remove-wishlist {
float:left;
display:block;
padding-right:5px;
max-width: 180px;
overflow: hidden;
}
.read_itbutton {
margin-top: 4px;
}
}
@ -255,6 +265,10 @@ ul.navigation li a:hover, ul.navigation li.active a {
.booklist-status-label, {
display: none;
}
.boolist-ebook img {
margin-top: 6px;
}
}
div#content-block-content {

15
static/less/book_panel.less
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,8 +219,9 @@ div.panelview.side2 {
/* White-background action buttons; vary by state of campaign */
.read_itbutton {
.readit;
display: block;
span {
.readit_inner(30px, 40px);
.readit_inner(30px, 35px);
background: url("@{image-base}book-panel/book_icon.png") no-repeat 10% center;
&:hover { .panelhoverlink; }
@ -246,12 +245,12 @@ div.panelview.side2 {
.readit;
span {
.readit_inner(15px, 40px);
.readit_inner(15px, 35px);
background: none;
}
}
.panelfront.icons .read_itbutton {
.panelview.panelfront.icons .read_itbutton {
margin-bottom: 7px;
.height(30px) !important;
}

3
static/less/campaign_tabs.less
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;

32
static/less/documentation.less
View File

@ -100,22 +100,19 @@ body {
}
.doc ul {
list-style: none;
list-style-type: disc;
padding:0;
margin:0;
li {
margin-bottom:7px;
.one-border-radius(14px);
padding:10px;
background:@pale-blue;
}
&.errorlist li {
background: none;
margin-bottom: 0;
}
li {
margin-left: 7px;
}
&.terms {
list-style: inherit;
list-style-position: inside;
@ -137,21 +134,16 @@ body {
}
dt {
margin:7px 0px 7px -7px;
.one-border-radius(14px);
padding:10px 0px 10px 7px;
background:@pale-blue;
&.nomargin {
margin:7px 0px;
a {
margin-left: 7px;
}
}
font-style: italic;
font-size: @font-size-larger;
margin-bottom: 7px;
border-top: solid @pale-blue 2px;
border-bottom: solid @pale-blue 2px;
padding: 7px 0;
}
dd {
margin: 0;
margin: 0 0 0 7px;
padding-bottom: 7px;
&.margin {

12
static/less/lists.less
View File

@ -1,3 +1,5 @@
@import "variables.less";
.user-block2 {
width: 48%;
font-size: 14px;
@ -11,4 +13,14 @@
}
#lang_list {
display: none;
}
#tabs-1, #tabs-2, #tabs-3 {
margin-left: 0;
}
ul.tabs li a {
height: 41px;
line-height: 18px;
padding-top: 5px;
}

4
static/less/sitewide2.less
View File

@ -776,6 +776,10 @@ a.nounderline {
h2 + form, h3 + form, h4 + form {
margin-top: 15px;
}
h2, h3, h4 {
margin-bottom: 10px;
}
}
// need to style /about/X pages such that they will not conflict with lightboxed About from header

5
static/less/supporter_layout.less
View File

@ -264,11 +264,6 @@ span.my-setting.active {
background:@blue-grey url("@{image-base}header/collspane.png") 90% center no-repeat;
}
.badges.listspage {
float: left;
margin-left: 12px;
}
#tabs {
clear: both;
float: left;