tidying visibly wrong things

pull/1/head
Andromeda Yelton 2013-01-02 16:10:32 -05:00
parent 8d321d46dc
commit c2bc4f6b68
12 changed files with 16 additions and 781 deletions

View File

@ -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 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 %}

View File

@ -2,7 +2,6 @@
{% load endless %}
{% load lang_utils %}
{% with request.user.wishlist.works.all as wishlist %}
{% with work_list.count as works_count %}
{% block title %} Ready-to-Read Works {% if pub_lang %} in {{pub_lang|ez_lang_name}}{% endif %}{% endblock %}
{% block extra_css %}
@ -58,7 +57,7 @@
<div id="content-block">
<div class="content-block-heading unglued" id="tabs">
<ul class="tabs">
<li class="tabs1"><a href="#">All<br />{{ works_count }}</a></li>
<li class="tabs1"><a href="#">All<br />({{ work_list.count }})</a></li>
</ul>
<ul class="book-list-view">
<li>View As:</li>
@ -75,7 +74,7 @@
</ul>
</div>
<div id="content-block-content">
{% ifequal works_count 0 %}
{% ifequal work_list.count 0 %}
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" %}
@ -103,4 +102,3 @@
</div>
{% endblock %}
{% endwith %}
{% endwith %}

View File

@ -180,6 +180,8 @@ div.remove-wishlist {
float: left;
display: block;
padding-right: 5px;
max-width: 180px;
overflow: hidden;
}
.booklist-status.listview .read_itbutton {
margin-top: 4px;

View File

@ -271,14 +271,7 @@ div.panelview.side2 {
display: block;
}
.read_itbutton span {
<<<<<<< HEAD
<<<<<<< HEAD
height: 35px;
=======
>>>>>>> 73266f0... line up icons better and more clearly indicate status of books with successful campaigns
=======
height: 35px;
>>>>>>> 4a307a1... addressing CSS comments and also fixing some invalid html
line-height: 35px;
font-size: 11px;
background-repeat: no-repeat;
@ -350,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;

View File

@ -358,12 +358,6 @@ dt {
border-bottom: solid #edf3f4 2px;
padding: 7px 0;
}
dt.nomargin {
margin: 7px 0px;
}
dt.nomargin a {
margin-left: 7px;
}
dd {
margin: 0 0 0 7px;
padding-bottom: 7px;

File diff suppressed because one or more lines are too long

View File

@ -89,7 +89,6 @@
#lang_list {
display: none;
}
<<<<<<< HEAD
#tabs-1,
#tabs-2,
#tabs-3 {
@ -100,13 +99,3 @@ ul.tabs li a {
line-height: 18px;
padding-top: 5px;
}
ul.tabs li.active a,
ul.tabs li:hover a {
background-color: #8dc63f !important;
color: white !important;
}
<<<<<<< HEAD
=======
>>>>>>> parent of b001aef... separating unglued and PD works on ready-to-read page
=======
>>>>>>> 4a307a1... addressing CSS comments and also fixing some invalid html

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}

File diff suppressed because one or more lines are too long

View File

@ -116,6 +116,8 @@ div.add-wishlist, div.remove-wishlist {
float:left;
display:block;
padding-right:5px;
max-width: 180px;
overflow: hidden;
}
.read_itbutton {

View File

@ -250,7 +250,7 @@ div.panelview.side2 {
}
}
.panelfront.icons .read_itbutton {
.panelview.panelfront.icons .read_itbutton {
margin-bottom: 7px;
.height(30px) !important;
}

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