resolving merge conflicts

pull/1/head
Andromeda Yelton 2011-11-07 11:06:01 -05:00
commit a1055a01aa
16 changed files with 1345 additions and 3696 deletions

View File

@ -152,7 +152,7 @@ Campaign for WORK TITLE GOES HERE
{% for premium in premiums %} {% for premium in premiums %}
<li class="{% if forloop.first %}first{% else %}{% if forloop.last %}last{% endif %}{% endif %}"><a href=""> <li class="{% if forloop.first %}first{% else %}{% if forloop.last %}last{% endif %}{% endif %}"><a href="">
<span class="menu-item-price">${{ premium.amount }}</span> <span class="menu-item-price">${{ premium.amount }}</span>
<span class="menu-item-desc">${{ premium.description }}</span> <span class="menu-item-desc">{{ premium.description }}</span>
</a></li> </a></li>
{% endfor %} {% endfor %}
</ul> </ul>

View File

@ -1,6 +1,7 @@
import logging import logging
from decimal import Decimal as D from decimal import Decimal as D
from django.db.models import Q
from django.conf import settings from django.conf import settings
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
@ -47,9 +48,8 @@ def work(request, work_id, action='display'):
work = get_object_or_404(models.Work, id=work_id) work = get_object_or_404(models.Work, id=work_id)
campaign = work.last_campaign() campaign = work.last_campaign()
if campaign: if campaign:
premiums = campaign.premiums.all() q = Q(campaign=campaign) | Q(campaign__isnull=True)
if premiums.count() == 0: premiums = models.Premium.objects.filter(q)
premiums = models.Premium.objects.filter(campaign__isnull=True)
if action == 'setup_campaign': if action == 'setup_campaign':
return render(request, 'setup_campaign.html', {'work': work}) return render(request, 'setup_campaign.html', {'work': work})
else: else:

File diff suppressed because it is too large Load Diff

View File

@ -1,184 +0,0 @@
.header-text {
height: 36px;
line-height: 36px;
display: block;
text-decoration: none;
font-weight: bold;
font-size: 13px;
letter-spacing: -0.05em;
}
.panelborders {
border-width: 1px 0px;
border-style: solid none;
border-color: #FFFFFF;
}
div.book-list.listview {
clear: both;
display: block;
vertical-align: middle;
height: 43px;
line-height: 43px;
margin: 0 5px 0 0;
padding: 7px 0;
}
div.book-list.listview.row1 {
background: #f6f9f9;
}
div.book-list.listview.row2 {
background: #fff;
}
div.book-list.listview div.unglue-this {
float: left;
}
div.book-list.listview div.book-thumb {
margin-right: 5px;
float: left;
}
div.book-list.listview div.book-name {
width: 260px;
margin-right: 10px;
background: url("../images/booklist/booklist-vline.png") right center no-repeat;
float: left;
}
div.book-list.listview div.book-name span {
display: block;
line-height: normal;
height: 43px;
line-height: 43px;
}
div.book-list.listview div.add-wishlist, div.book-list.listview div.remove-wishlist {
margin-right: 10px;
padding-right: 10px;
background: url("../images/booklist/booklist-vline.png") right center no-repeat;
float: left;
}
div.book-list.listview div.add-wishlist a, div.book-list.listview div.remove-wishlist a {
font-weight: normal;
color: #3d4e53;
text-transform: none;
background: url("../images/booklist/add-wishlist.png") left center no-repeat;
padding-left: 20px;
}
div.book-list.listview div.booklist-status {
margin-right: 7px;
float: left;
}
.booklist-status.listview span.booklist-status-label {
display: none;
}
.booklist-status.listview span.booklist-status-text {
float: left;
display: block;
padding-right: 5px;
text-transform: capitalize;
}
.booklist-status.listview .booklist-status-img p {
display: none;
}
div.unglue-this a {
text-transform: uppercase;
color: #3d4e53;
font-size: 11px;
font-weight: bold;
}
div.unglue-this.complete .unglue-this-inner1 {
background: url("/static/images/booklist/bg.png") 0 -84px no-repeat;
height: 42px;
}
div.unglue-this.complete .unglue-this-inner2 {
background: url("/static/images/booklist/bg.png") 100% -126px no-repeat;
margin-left: 29px;
height: 42px;
padding-right: 10px;
}
div.unglue-this.complete a {
color: #fff;
display: block;
}
div.unglue-this.processing .unglue-this-inner1 {
background: url("/static/images/booklist/bg.png") 0 0 no-repeat;
height: 42px;
}
div.unglue-this.processing .unglue-this-inner2 {
background: url("/static/images/booklist/bg.png") 100% -42px no-repeat;
margin-left: 25px;
height: 42px;
padding-right: 10px;
}
ul.book-list-view {
padding: 0;
margin: 15px;
float: right;
list-style: none;
}
ul.book-list-view li {
float: left;
margin-right: 10px;
display: block;
vertical-align: middle;
line-height: 22px;
}
div.navigation {
float: left;
clear: both;
width: 100%;
color: #37414d;
}
ul.navigation {
float: right;
padding: 0;
margin: 0;
list-style: none;
}
ul.navigation li {
float: left;
line-height: normal;
margin-right: 5px;
}
ul.navigation li a {
color: #37414d;
font-weight: normal;
}
ul.navigation li.arrow-l a {
background: url("/static/images/booklist/bg.png") 0 -168px no-repeat;
width: 10px;
height: 15px;
display: block;
text-indent: -10000px;
}
ul.navigation li.arrow-r a {
background: url("/static/images/booklist/bg.png") -1px -185px no-repeat;
width: 10px;
height: 15px;
display: block;
text-indent: -10000px;
}
ul.navigation li a:hover, ul.navigation li.active a {
color: #8ac3d7;
text-decoration: underline;
}
.unglue-button {
display: block;
border: 0;
}
.book-thumb.listview a {
display: block;
height: 50px;
width: 32px;
overflow: hidden;
position: relative;
z-index: 1;
}
.book-thumb.listview a:hover {
overflow: visible;
z-index: 1000;
border: none;
}
.book-thumb.listview a img {
position: absolute;
top: -20px;
left: -50px;
}
.listview.author {
display: none;
}

View File

@ -1,431 +0,0 @@
.header-text {
height: 36px;
line-height: 36px;
display: block;
text-decoration: none;
font-weight: bold;
font-size: 13px;
letter-spacing: -0.05em;
}
.panelborders {
border-width: 1px 0px;
border-style: solid none;
border-color: #FFFFFF;
}
.greenpanelstuff {
font-family: Arial, Helvetica, sans-serif;
font-size: 12px;
width: 120px;
line-height: 16px;
}
.greenpanelactionborders {
border-top-width: 1px;
border-bottom-width: 1px;
border-top-style: solid;
border-bottom-style: solid;
border-top-color: #FFFFFF;
border-bottom-color: #FFFFFF;
}
.panelhoverlink {
text-decoration: none;
color: #3d4e53;
}
@charset "utf-8";
* {
padding: 0px;
margin: 0px;
}
/*main_Css*/
#main-wrapper {
height: 100%;
width: 725px;
margin: 0px;
padding: 0px 0px;
}
.panelview.tabs {
padding: 5px 0px;
margin: 0px;
width: 142px;
float: left;
}
.panelview.tabs span.active {
padding: 15px;
margin: 15px 0px;
font-weight: bold;
}
.panelview.book-list {
font-family: Arial, Helvetica, sans-serif;
font-size: 12px;
width: 120px;
line-height: 16px;
margin: auto;
padding: 0px 5px 5px 5px;
height: 300px;
background-color: #ffffff;
color: #3d4e53;
border: 5px solid #edf3f4;
/* might need this for panel hover state; don't want it for nonhover. hm.
a {
color: @dark-green;
text-decoration: none;
&:hover {
color: @green;
text-decoration: none;
}
}
*/
}
.panelview.book-list:hover {
color: #3d4e53;
}
.panelview.book-list img {
padding: 5px 0px;
margin: 0px;
}
div.remove-wishlist.panelview {
display: none;
}
.panelview.book-name, .panelview.author {
font-family: Arial, Helvetica, sans-serif;
font-size: 12px;
line-height: 16px;
color: #3d4e53;
}
.panelview.booklist-status {
color: #8dc63f;
text-align: left;
}
.panelview.booklist-status .booklist-status-label {
float: left;
font-weight: bold;
}
/*2 start*/
.greenpanel2 {
font-family: Arial, Helvetica, sans-serif;
font-size: 12px;
width: 120px;
line-height: 16px;
margin: 0px auto;
padding: 10px;
height: 295px;
background-color: #8dc63f;
color: #ffffff;
position: relative;
}
.unglued_white {
font-size: 12px;
margin: 0px auto;
margin-bottom: 5px;
padding: 10px 0px;
}
.read_itbutton {
width: 118px;
height: 35px;
padding: 0px 0px;
background: #FFFFFF;
margin: 0px;
-moz-border-radius: 4px 4px 4px 4px;
-webkit-border-radius: 4px 4px 4px 4px;
border-radius: 4px 4px 4px 4px;
border: 1px solid #81bb38;
}
.read_itbutton a {
line-height: 40px;
font-size: 11px;
background-repeat: no-repeat;
background-position: 10px center;
font-weight: bold;
text-decoration: none;
text-transform: uppercase;
background: url(/static/images/book-panel/book_icon.png) no-repeat left center;
padding: 0px 0px 0px 30px;
color: #73a334;
}
.read_itbutton a:hover {
text-decoration: none;
}
.add_towish {
width: 125px;
height: 30px;
padding: 0px 0px;
margin: 15px auto;
}
.add_towish a {
line-height: 40px;
font-size: 11px;
background-repeat: no-repeat;
background-position: left center;
font-weight: bold;
text-decoration: none;
text-transform: uppercase;
background-image: url(/static/images/book-panel/add_wish_icon.png);
padding: 8px 5px 8px 21px;
color: #FFFFFF;
border-top-width: 1px;
border-bottom-width: 1px;
border-top-style: solid;
border-bottom-style: solid;
border-top-color: #FFFFFF;
border-bottom-color: #FFFFFF;
}
.add_towish a:hover {
text-decoration: none;
color: #3d4e53;
}
.white_text {
width: 130px;
height: 40px;
padding: 17px 0px;
margin: 0px;
}
.white_text a {
color: #FFFFFF;
text-decoration: none;
}
.white_text a:hover {
text-decoration: none;
color: #3d4e53;
}
/*more info*/
.moreinfo {
width: 130px;
height: 30px;
padding: 0px;
margin: 15px 0 0;
}
.moreinfo a {
line-height: 40px;
font-size: 11px;
background-repeat: no-repeat;
background-position: left center;
font-weight: bold;
text-decoration: none;
text-transform: uppercase;
background-image: url(/static/images/book-panel/more_icon.png);
padding: 8px 42px 8px 20px;
padding-left: 20px;
color: #FFFFFF;
border-top-width: 1px;
border-bottom-width: 1px;
border-top-style: solid;
border-bottom-style: solid;
border-top-color: #FFFFFF;
border-bottom-color: #FFFFFF;
}
.moreinfo a:hover {
text-decoration: none;
color: #3d4e53;
}
/*end of the more info/*
/*end the 2greenpanel*/
/*2 start*/
.graypanel {
font-family: Arial, Helvetica, sans-serif;
font-size: 12px;
margin: 20px auto;
padding: 4px 5px;
height: 300px;
width: 130px;
line-height: 16px;
background-color: #edf3f4;
color: #3d4e53;
border: 5px solid #edf3f4;
}
.unglued_white2 {
font-size: 12px;
margin: 3px auto;
padding: 5px 0px;
}
.green {
color: #8dc63f;
text-align: left;
}
.graypanel a {
text-decoration: none;
color: #3d4e53;
}
.graypanel a:hover {
color: #8dc63f;
text-decoration: none;
}
.Unglue_itbutton {
width: 110px;
height: 40px;
padding: 0px 9px;
background: #FFFFFF;
margin: 0px auto;
-moz-border-radius: 4px 4px 4px 4px;
-webkit-border-radius: 4px 4px 4px 4px;
border-radius: 4px 4px 4px 4px;
border: 1px solid #d4dcdd;
}
.Unglue_itbutton a {
line-height: 40px;
font-size: 11px;
background-repeat: no-repeat;
background-position: 2px center;
font-weight: bold;
text-decoration: none;
text-transform: uppercase;
background-image: url(/static/images/book-panel/unglue_icon.png);
padding: 5px 0px 0px 20px;
color: #3d4e53;
text-align: right;
font-family: "LucidaGrandeBold";
}
.Unglue_itbutton a:hover {
text-decoration: none;
}
.add_towish2 {
width: 130px;
height: 30px;
padding: 0px 0px;
margin: 15px auto;
}
.add_towish2 a {
line-height: 40px;
font-size: 11px;
background-repeat: no-repeat;
background-position: left center;
font-weight: bold;
text-decoration: none;
text-transform: uppercase;
background-image: url(/static/images/book-panel/add_gray.png);
padding: 8px 0px;
padding-left: 20px;
color: #3d4e53;
border-top-width: 1px;
border-bottom-width: 1px;
border-top-style: solid;
border-bottom-style: solid;
border-top-color: #FFFFFF;
border-bottom-color: #FFFFFF;
font-family: "LucidaGrandeBold";
}
.add_towish2 a:hover {
text-decoration: none;
}
.white_text2 {
width: 130px;
height: 40px;
padding: 13px 0px;
margin: 0px;
}
.white_text2 a, a:hover {
text-decoration: none;
color: #3d4e53;
}
/*more info*/
.moreinfo2 {
width: 130px;
height: 30px;
padding: 0px 20px 0px 0px;
margin: 15px auto;
}
.moreinfo2 a {
line-height: 40px;
font-size: 12px;
background-image: url(/static/images/book-panel/gray_more_info.png);
background-repeat: no-repeat;
background-position: left center;
padding: 8px 35px;
font-weight: bold;
padding-left: 20px;
color: #3d4e53;
text-decoration: none;
text-transform: uppercase;
border-top-width: 1px;
border-bottom-width: 1px;
border-top-style: solid;
border-bottom-style: solid;
border-top-color: #FFFFFF;
border-bottom-color: #FFFFFF;
font-family: "LucidaGrandeBold";
}
.moreinfo2 a:hover {
text-decoration: none;
color: #3d4e53;
}
/*end the 2greenpanel*/
.read {
margin: 15px auto 5px auto;
padding: 0px;
width: 140px;
color: #8dc63f;
height: 40px;
line-height: 25px;
float: left;
position: absolute;
bottom: -15px;
}
.read p {
margin: 0px;
padding: 10px 3px;
width: 50px;
font-size: 10pt;
float: left;
}
.read img {
padding: 5px 0px;
margin: 0px;
float: left;
}
.right_add {
padding: 10px;
margin: 0px;
float: right;
}
p.right_add {
float: right;
padding: 10px 10px 0 0;
width: 24px;
}
/**/
.read2 {
margin: 15px auto;
padding: 0px;
width: 130px;
color: #8dc63f;
height: 40px;
line-height: 25px;
}
.read2 p {
margin: 0px;
padding: 10px 3px;
width: 50px;
font-size: 10pt;
float: left;
}
.read2 img {
padding: 0px;
margin: 0px;
float: left;
}
.right_add {
padding: 10px;
margin: 0px;
float: right;
}
/* --------------- ( slideout hover state ) --------------------------------------------- */
.panelview.book-thumb {
float: left;
position: relative;
margin: 0px;
padding: 0px;
left: 0px;
}
.panelview.book-thumb img {
z-index: 100;
width: 120px;
height: 182px;
}
.panelview.book-thumb span {
position: absolute;
bottom: 0;
left: -10px;
top: -5px;
z-index: 1000;
height: auto;
}

View File

@ -1,227 +0,0 @@
.header-text {
height: 36px;
line-height: 36px;
display: block;
text-decoration: none;
font-weight: bold;
font-size: 13px;
letter-spacing: -0.05em;
}
.panelborders {
border-width: 1px 0px;
border-style: solid none;
border-color: #FFFFFF;
}
#js-page-wrap {
overflow: hidden;
}
#main-container {
margin-top: 20px;
}
#js-leftcol .jsmodule {
margin-bottom: 10px;
}
#js-leftcol .jsmodule.rounded {
background: #edf3f4;
-moz-border-radius: 20px 20px 20px 20px;
-webkit-border-radius: 20px 20px 20px 20px;
border-radius: 20px 20px 20px 20px;
}
#js-leftcol .jsmodule.rounded .jsmod-content {
padding: 10px 20px;
font-weight: bold;
border: none;
margin: 0;
}
.book-detail {
float: left;
width: 100%;
clear: both;
display: block;
}
.book-detail-img {
float: left;
margin-right: 10px;
width: 151px;
}
.book-detail-img img {
padding: 5px;
border: solid 5px #edf3f4;
}
.book-detail-info {
float: left;
width: 309px;
}
.book-detail-info h2.book-name, .book-detail-info h3.book-author, .book-detail-info h3.book-year {
padding: 0;
margin: 0;
line-height: normal;
}
.book-detail-info h2.book-name {
font-size: 18px;
text-transform: capitalize;
font-weight: bold;
color: #3d4e53;
}
.book-detail-info h3.book-author, .book-detail-info h3.book-year {
font-size: 12px;
font-weight: normal;
color: #6994a3;
}
.book-detail-info > div {
width: 100%;
clear: both;
display: block;
overflow: hidden;
border-top: 1px solid #edf3f4;
padding: 10px 0;
}
.book-detail-info .find-book {
margin-top: 15px;
}
.book-detail-info .find-book label {
float: left;
line-height: 31px;
}
.book-detail-info .find-link {
float: right;
}
.book-detail-info .pledged-info {
padding: 0;
}
.book-detail-info .pledged-group {
padding: 10px 40px 10px 0;
float: left;
}
.book-detail-info .status {
float: right;
padding-top: 4px;
}
.book-detail-info .btn_support a {
background: url("/static/images/btn_bg.png") 0 0 no-repeat;
width: 104px;
height: 41px;
line-height: 41px;
display: block;
color: #fff;
font-weight: bold;
text-align: center;
}
#tabs {
border-bottom: 4px solid #6994a3;
clear: both;
float: left;
margin-top: 10px;
width: 100%;
}
#tabs ul.book-list-view {
margin-bottom: 4px !important;
}
#tabs-1, #tabs-2, #tabs-3 {
margin-left: 10px;
}
#tabs-2, #tabs-3, #tabs-4 {
display: none;
}
ul.tabs {
float: left;
padding: 0;
margin: 0;
list-style: none;
}
ul.tabs li {
float: left;
height: 46px;
line-height: 46px;
margin-right: 2px;
margin-bottom: 1px;
}
ul.tabs li a {
height: 46px;
line-height: 46px;
display: block;
text-align: center;
padding: 0 10px;
min-width: 80px;
-moz-border-radius: 7px 7px 0 0;
-webkit-border-radius: 7px 7px 0 0;
border-radius: 7px 7px 0 0;
background: #d6dde0;
color: #3d4e53;
}
ul.tabs li a:hover, ul.tabs li.active a {
background: #6994a3;
color: #fff;
}
#js-rightcol {
float: right;
width: 235px;
}
#js-rightcol h3.jsmod-title {
background: #a7c1ca;
-moz-border-radius: 10px 10px 10px 10px;
-webkit-border-radius: 10px 10px 10px 10px;
border-radius: 10px 10px 10px 10px;
padding: 10px;
height: auto;
font-style: normal;
font-size: 14px;
margin: 0 0 10px 0;
}
#js-rightcol h3.jsmod-title span {
padding: 0;
color: #fff;
font-style: normal;
}
#js-rightcol .jsmodule {
margin-bottom: 10px;
}
#js-rightcol .jsmod-content {
padding-left: 10px;
}
.js-rightcol-pad {
border: 1px solid #d6dde0;
-moz-border-radius: 10px 10px 10px 10px;
-webkit-border-radius: 10px 10px 10px 10px;
border-radius: 10px 10px 10px 10px;
padding: 10px;
}
#js-maincol {
float: left;
width: 470px;
margin: 0 10px;
}
#js-maincol div.content-block {
background: none;
padding: 0;
}
ul.social li {
padding: 5px 0 5px 30px;
height: 28px;
line-height: 28px;
}
ul.social li.facebook {
background: url("/static/images/icons/facebook.png") left center no-repeat;
}
ul.social li.twitter {
background: url("/static/images/icons/twitter.png") left center no-repeat;
}
ul.social li.email {
background: url("/static/images/icons/email.png") left center no-repeat;
}
ul.support li {
border-bottom: 1px solid #d6dde0;
padding: 10px 15px 10px 0;
background: url("/static/images/icons/r-arrow.png") right center no-repeat;
}
ul.support li span {
display: block;
}
ul.support li span .menu-item-price {
font-size: 18px;
}
/* differs from sitewide.css. should it? */
a {
color: #3d4e53;
font-size: 12px;
}

View File

@ -241,7 +241,7 @@ ul.support li {
span { span {
display:block; display:block;
.menu-item-price { &.menu-item-price {
font-size:18px; font-size:18px;
} }
} }

File diff suppressed because it is too large Load Diff

View File

@ -1,14 +0,0 @@
.errorlist {
color: red;
}
#registration {
margin-left: auto;
margin-right: auto;
width: 30%;
margin-top: 5%;
}
#registration input[type="submit"] {
margin-left: auto;
margin-right: auto;
padding: 5px 15px;
}

View File

@ -1,252 +0,0 @@
.header-text {
height: 36px;
line-height: 36px;
display: block;
text-decoration: none;
font-weight: bold;
font-size: 13px;
letter-spacing: 1px;
text-transform: capitalize;
}
.panelborders {
border-width: 1px 0px;
border-style: solid none;
border-color: #FFFFFF;
}
body {
background: url("/static/images/bg-body.png") 0 0 repeat-x;
padding: 0 0 20px 0;
margin: 0;
font-size: 12px;
font-family: Lucida "Lucida Grande", "Lucida Sans Unicode", sans-serif, Helvetica, sans-serif;
color: #3d4e53;
}
img {
border: none;
}
#js-header {
height: 90px;
}
.js-main {
width: 960px;
margin: 0 auto;
clear: both;
padding: 0;
}
.js-logo {
float: left;
padding-top: 20px;
}
.js-logo a img {
border: none;
}
.js-topmenu {
float: right;
padding-top: 25px;
}
.js-topmenu ul li {
float: left;
padding: 0 10px;
}
.js-topmenu ul li a {
color: #fff;
height: 36px;
line-height: 36px;
display: block;
text-decoration: none;
font-weight: bold;
font-size: 13px;
letter-spacing: 1px;
text-transform: capitalize;
}
.js-topmenu ul li span#welcome {
color: yellow;
height: 36px;
line-height: 36px;
display: block;
text-decoration: none;
font-weight: bold;
font-size: 13px;
letter-spacing: 1px;
text-transform: capitalize;
}
.js-topmenu ul lilast a {
background: url("/static/images/bg.png") right top no-repeat;
}
.js-topmenu ul lilast a span {
background: url("/static/images/bg.png") -770px -36px no-repeat;
margin-right: 29px;
display: block;
padding: 0 5px 0 15px;
}
#js-topsection {
padding: 15px 0;
overflow: hidden;
}
.js-topnews {
float: left;
width: 60%;
}
.js-news-text {
float: left;
width: 70%;
font-size: 16px;
color: #3d4e53;
}
.js-news-links {
float: right;
width: 30%;
}
.js-search {
width: 960px;
margin: 0 auto;
clear: both;
padding: 0;
}
.js-search .inputbox {
padding: 0 0 0 15px;
margin: 0;
border: none;
outline: none;
background: url("/static/images/bg.png") -645px -180px;
height: 36px;
line-height: 36px;
float: left;
color: #6994a3;
}
.js-search .button {
background: url("/static/images/bg.png") 100% -144px no-repeat;
padding: 0;
margin: 0;
width: 40px;
height: 36px;
display: block;
border: none;
text-indent: -10000px;
cursor: pointer;
}
.js-search-inner {
margin: 0 auto;
}
#js-leftcol {
float: left;
width: 235px;
}
#js-leftcol a {
font-weight: normal;
}
#js-leftcol a:hover {
text-decoration: underline;
}
#js-leftcol .jsmod-content {
border: 1px solid #edf3f4;
margin-left: 10px;
border-radius: 0 0 10px 10px;
-moz-border-radius: 0 0 10px 10px;
-webkit-border-radius: 0 0 10px 10px;
}
#js-leftcol ul.level1 > li > a {
text-transform: uppercase;
color: #3d4e53;
font-size: 12px;
border-bottom: 1px solid #edf3f4;
border-top: 1px solid #edf3f4;
display: block;
padding: 10px;
}
#js-leftcol ul.level2 li {
padding: 5px 10px;
}
#js-leftcol ul.level2 li a {
color: #6994a3;
line-height: 20px;
}
#js-maincol-fr {
float: left;
width: 725px;
}
div.content-block {
overflow: hidden;
background: url("/static/images/bg.png") 100% -223px no-repeat;
padding: 0 0 0 7px;
}
.content-block-heading a.block-link {
float: right;
padding: 15px;
font-size: 11px;
color: #3d4e53;
text-decoration: underline;
font-weight: normal;
}
div.content-block-content {
width: 100%;
overflow: hidden;
}
div.content-block-content .cols3 .column {
width: 33.33%;
float: left;
}
h2 .content-heading {
padding: 15px;
margin: 0;
font-size: 19px;
font-weight: normal;
color: #3d4e53;
float: left;
width: 50%;
}
h2 .content-heading span {
font-style: italic;
}
h3 .jsmod-title {
background: url("/static/images/bg.png") 0 0 no-repeat;
padding: 0;
margin: 0;
height: 73px;
}
h3 .jsmod-title span {
background: url(../images/icon-h3.png) 90% center no-repeat;
font-size: 17px;
color: #fff;
padding: 26px 40px 27px 20px;
display: block;
}
ul.menu {
list-style: none;
padding: 0;
margin: 0;
line-height: 20px;
}
a.readon {
background: url("/static/images/bg.png") 100% -72px no-repeat;
color: #fff;
text-transform: capitalize;
display: block;
float: right;
font-size: 13px;
font-weight: bold;
}
a.readon span {
background: url("/static/images/bg.png") -770px -108px no-repeat;
margin-right: 34px;
padding: 0 5px 0 20px;
height: 36px;
line-height: 36px;
display: block;
}
a {
font-weight: bold;
font-size: 13px;
text-decoration: none;
cursor: pointer;
}
#footer {
border-top: 7px solid #edf3f4;
clear: both;
height: 90px;
text-align: center;
padding-top: 5px;
}
#footer a {
color: #3d4e53;
}

View File

@ -1,258 +0,0 @@
.header-text {
height: 36px;
line-height: 36px;
display: block;
text-decoration: none;
font-weight: bold;
font-size: 13px;
letter-spacing: -0.05em;
}
.panelborders {
border-width: 1px 0px;
border-style: solid none;
border-color: #FFFFFF;
}
.block-inner {
padding-right: 10px;
}
.user-block {
width: 100%;
clear: both;
}
.user-block-hide {
float: left;
width: 100%;
clear: both;
}
.user-block-hide .block {
float: left;
width: 33%;
}
.user-block-hide input {
float: left;
margin: 3px 10px 0 0;
}
.user-block-hide label {
float: left;
width: 90%;
}
.user-block1 {
float: left;
width: 25%;
}
.user-block2 {
color: #6994a3;
font-size: 11px;
line-height: normal;
float: left;
width: 25%;
}
.user-block3, .user-block4 {
float: right;
width: 25%;
margin-top: 10px;
}
img.user-avatar {
float: left;
margin-right: 10px;
}
.social {
width: 100%;
padding-left: 35px;
}
span.user-name, span.user-date, span.user-short-info {
display: block;
}
span.user-name, span.user-name a, a {
font-size: 12px;
color: #3d4e53;
}
span.user-status-title {
float: left;
margin-right: 8px;
padding-top: 5px;
}
span.rounded {
border: 1px solid #d4d4d4;
-moz-border-radius: 7px 7px 7px 7px;
-webkit-border-radius: 7px 7px 7px 7px;
border-radius: 7px 7px 7px 7px;
padding: 1px;
color: #fff;
margin: 0 8px 0 0;
display: inline-block;
}
span.rounded > span {
padding: 7px 10px;
min-width: 15px;
-moz-border-radius: 5px 5px 5px 5px;
-webkit-border-radius: 5px 5px 5px 5px;
border-radius: 5px 5px 5px 5px;
text-align: center;
display: inline-block;
}
span.blue {
background: #a7d26a url("/static/images/header-button-blue.png") left bottom repeat-x;
}
span.orange {
background: #eabc7c url("/static/images/header-button-orange.png") left bottom repeat-x;
}
span.grey {
background: #bacfd6 url("/static/images/header-button-grey.png") left bottom repeat-x;
}
div.check-list {
float: left;
width: 100%;
padding-bottom: 7px;
}
a.profile-edit {
display: block;
background: url("/static/images/header/icon-edit.png") right top no-repeat;
}
div.profile-save {
padding-top: 15px;
border: none;
}
input.profile-save {
background: url("/static/images/header/save-setting.png") 0 0 no-repeat;
width: 116px;
height: 42px;
display: block;
text-indent: -100000px;
border: none;
}
a.my-setting {
background: #d6dde0 url("/static/images/header/explane.png") 90% center no-repeat;
border-radius: 7px;
height: 50px;
line-height: 50px;
display: block;
padding: 0 0 0 10px;
font-size: 20px;
}
a.my-setting.active {
background: #d6dde0 url("/static/images/header/collspane.png") 90% center no-repeat;
}
#tabs {
border-bottom: 4px solid #8dc63f;
clear: both;
float: left;
margin-left: 10px;
margin-top: 10px;
width: 100%;
}
#tabs ul.book-list-view {
margin-bottom: 4px !important;
}
#tabs-1, #tabs-2, #tabs-3 {
margin-left: 10px;
}
ul.tabs {
float: left;
padding: 0;
margin: 0;
list-style: none;
}
ul.tabs li {
float: left;
height: 46px;
line-height: 46px;
margin-right: 10px;
}
ul.tabs li a {
height: 46px;
line-height: 46px;
display: block;
text-align: center;
padding: 0 10px;
min-width: 80px;
border-radius: 7px 7px 0 0;
background: url("/static/images/header/bg-tabs1.png") left bottom repeat-x;
}
ul.tabs li a:hover, ul.tabs li.active a {
background: url("/static/images/header/bg-tabs.png") left bottom repeat-x;
color: #fff;
}
.book-list span.rounded > span {
line-height: normal;
width: 75px;
}
.book-list span.rounded > span a {
text-transform: capitalize;
}
div.content-block-content {
padding-left: 10px;
}
.js-news-text {
float: left;
width: 70%;
font-size: 16px;
color: #3d4e53;
font-family: lucida grande;
}
.js-news-links {
float: right;
width: 30%;
}
.column-left .item {
margin: 0 10px 10px 0;
}
.column-center .item {
margin: 0 5px 10px 5px;
}
.column-right .item {
margin: 0 0 10px 10px;
}
.column .item {
border: 7px solid #edf3f4;
padding: 10px;
}
.book-image {
padding: 0 0 10px 0;
}
.book-info {
padding: 0 0 10px 0;
line-height: 125%;
position: relative;
}
.book-info span.book-new {
background: url(/static/images/images/icon-new.png) 0 0 no-repeat;
width: 38px;
height: 36px;
display: block;
position: absolute;
right: 10px;
top: 0;
}
.book-name {
color: #3d4e53;
font-weight: bold;
}
.book-author {
color: #6994a3;
}
.book-status {
margin: 0 -10px;
border-top: 1px solid #edf3f4;
padding: 15px 10px 0 10px;
position: relative;
}
.book-status span.unglue {
font-style: italic;
}
.book-status span.status {
position: absolute;
right: 10px;
bottom: -5px;
width: 37px;
height: 25px;
display: block;
}
/* Do I even still need this?
.book-status span.percent99{ background:url(../images/images/icon-book1.png) 0 0 no-repeat;}
.book-status span.percent60{ background:url(../images/images/icon-book2.png) 0 0 no-repeat;}
.book-status span.percent22{ background:url(../images/images/icon-book3.png) 0 0 no-repeat;}
.book-status span.percent7{ background:url(../images/images/icon-book4.png) 0 0 no-repeat;}
.book-status span.percent62{ background:url(../images/images/icon-book5.png) 0 0 no-repeat;}
.book-status span.percent21{ background:url(../images/images/icon-book6.png) 0 0 no-repeat;}
*/