Merge pull request #324 from Gluejar/fix_docpage_css

Fix docpage css
pull/1/head
Raymond Yee 2014-04-10 19:50:08 -07:00
commit 83ed4eaf11
22 changed files with 76 additions and 27 deletions

View File

@ -10,10 +10,15 @@ base.html extra_css(empty) extra_js(empty) extra_head(empty)
about_wishlist.html
about_wishlist_empty.html
campaign_list.html extra_css extra_head
cc_list.html extra_css extra_head
comments.html extra_css extra_head
download.html extra_js
goodreads_display.html extra_head
home.html extra_css extra_js
kindle_change_successful.html extra_js
libraryauth/library.html extra_head extra_css extra_js
libraryauth/list.html extra_head extra_css
libraryauth/users.html extra_head extra_css
librarything.html
lockss.html
lockss_manifest.html
@ -22,15 +27,17 @@ base.html extra_css(empty) extra_js(empty) extra_head(empty)
profiles/profile_detail.html
profiles/profile_list.html
registration/registration_base.html extra_js extra_head extra_extra_head
basedocumentation.html extra_js extra_extra_head(empty)
basedocumentation.html extra_js extra_extra_head
api_help.html
about.html
about_smashwords.html
admins_only.html
campaign_admin.html extra_extra_head
campaign_results.html
claim.html
comments/base.html
comments/preview.html extra_css
edition_uploads.html
gift.html extra_extra_head
emailshare.html extra_css
faq.html
@ -38,6 +45,7 @@ base.html extra_css(empty) extra_js(empty) extra_head(empty)
front_matter.html extra_extra_head
languages.html
libraries.html extra_css extra_js
libraryauth/edit.html extra_extra_head
manage_account.html extra_extra_head
manage_campaign.html extra_extra_head
merge.html extra_extra_head
@ -47,6 +55,7 @@ base.html extra_css(empty) extra_js(empty) extra_head(empty)
notification/notice_settings.html extra_css extra_js
notification/notices.html extra_css
press.html
press_new.html
privacy.html
rh_tools.html extra_extra_head
rights_holders.html extra_extra_head
@ -64,6 +73,7 @@ base.html extra_css(empty) extra_js(empty) extra_head(empty)
pledge_nevermind.html extra_css
pledge_recharge.html extra_css
pledge_user_error.html extra_extra_head
purchase.html extra_extra_head
stripe.html extra_extra_head
registration/activation_complete.html
registration/activate.html
@ -93,3 +103,16 @@ base.html extra_css(empty) extra_js(empty) extra_head(empty)
nonprofit_base.html extra_extra_head
nonprofit.html extra_extra_head
book_panel_addbutton.html
cardform.html
cardscripts.html
ebookfiles.html
edition_display.html
edition_upload.html
explore.html
faqmenu.html
faq_t4u.html
learn_more.html
num_wishes.html
split.html
trans_summary.html

View File

@ -4,13 +4,19 @@
<script type="text/javascript" src="/static/js/definitions.js"></script>
{% endblock %}
{% block extra_extra_head %}
<!-- extra head content in descendants goes in extra_extra_head, not extra_head, to avoid overwriting the documentation.css include -->
<link type="text/css" rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css">
<link type="text/css" rel="stylesheet" href="/static/css/landingpage4.css" />
<link type="text/css" rel="stylesheet" href="/static/css/book_panel2.css" />
<script type="text/javascript" src="/static/js/greenpanel.js"></script>
{% endblock %}
{% block title %}{% endblock %}
{% block topsection %}
{% with hide_learn_more='on' %}
{% include "learn_more.html" %}
{% endwith %}
{% endblock %}
{% block content %}

View File

@ -181,13 +181,12 @@
<div class="unglued_white">
{% if first_ebook %}
<b>AVAILABLE!</b>
<div class="add_button">
{% include "book_panel_addbutton.html" %}
</div>
{% else %}
<p>No campaign yet.</p><br /><p>But if lots of ungluers fave this book, maybe there will be!</p>
{% endif %}
<div class="add_button">
{% include "book_panel_addbutton.html" %}
</div>
</div>
</div>
<div class="white_text bottom_button">

View File

@ -24,7 +24,7 @@
{% else %}
{% comment %} on the empty-wishlist slideshow {% endcomment %}
<div class="moreinfo add-wishlist">
<span class="work_id" id="p{{ workid }}">Add&nbsp;to&nbsp;My&nbsp;Faves</span>
<span class="work_id" id="p{{ workid }}">Add&nbsp;to&nbsp;Faves</span>
</div>
{% endif %}
{% else %}{% if work in wishlist %}
@ -34,9 +34,9 @@
{% else %}
<div class="moreinfo add-wishlist">
{% if on_search_page %}
<span class="gb_id" id="p{{ googlebooks_id }}">Add&nbsp;to&nbsp;My&nbsp;Faves</span>
<span class="gb_id" id="p{{ googlebooks_id }}">Add&nbsp;to&nbsp;Faves</span>
{% else %}
<span class="work_id" id="p{{ workid }}">Add&nbsp;to&nbsp;My&nbsp;Faves</span>
<span class="work_id" id="p{{ workid }}">Add&nbsp;to&nbsp;Faves</span>
{% endif %}
</div>
{% endif %}{% endifequal %}{% endif %}{% endif %}

View File

@ -1,6 +1,7 @@
{% extends "basedocumentation.html" %}
{% block extra_extra_head %}
{{ block.super }}
<link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/themes/ui-lightness/jquery-ui.css" type="text/css" media="screen">
{{ form.media.css }}
<script type="text/javascript" src="{{ jquery_ui_home }}"></script>

View File

@ -1,6 +1,7 @@
{% extends "basedocumentation.html" %}
{% block title %}Ungluers supporting the {{ campaign }}{% endblock %}
{% block extra_extra_head %}
{{ block.super }}
<link rel="stylesheet" type="text/css" href="/static/css/vanilla.css" class="day" title="day" />
<style>
.ackbox {

View File

@ -4,6 +4,7 @@
{% block title %}Gifts{% endblock %}
{% block extra_extra_head %}
{{ block.super }}
<link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/themes/ui-lightness/jquery-ui.css" type="text/css" media="screen">
{{ transfer_form.media.css }}
<script type="text/javascript" src="{{ jquery_ui_home }}" ></script>

View File

@ -12,11 +12,11 @@
<div><span class="def">unglue</span> (v. t.) 5. To make your favorite books free to everyone on earth.</div>
<div><span class="def">unglue</span> (v. t.) 6. To reward authors and publishers for sharing books with the world.</div>
</div>
{%if request.user.is_authenticated %}<a class="my-setting nounderline" id="readon"><span>Learn more</span></a>{% endif %}
{%if request.user.is_authenticated or hide_learn_more %}<a class="my-setting nounderline" id="readon"><span>Learn more</span></a>{% endif %}
</div>
</div>
</div>
<div {%if request.user.is_authenticated %}id="user-block-hide" {% endif %}class="user-block-hide learnmore_block ">
<div {%if request.user.is_authenticated or hide_learn_more %}id="user-block-hide" {% endif %}class="user-block-hide learnmore_block ">
<h1 style="text-align: center; padding-top: 1em; width: 70%">3 ways <i>we</i> can make ebooks <i>free</i></h1>
<div class="quicktour panelview" >

View File

@ -1,6 +1,7 @@
{% extends "basedocumentation.html" %}
{% block title %} Library Admin {% endblock %}
{% block extra_extra_head %}
{{ block.super }}
<link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/themes/ui-lightness/jquery-ui.css" type="text/css" media="screen">
<style type="text/css">
.group-border {

View File

@ -1,7 +1,9 @@
{% extends "basedocumentation.html" %}
{% block title %}Your Unglue.it Account{% endblock %}
{% block extra_extra_head %}
{{ block.super }}
<link type="text/css" rel="stylesheet" href="/static/css/pledge.css" />
{% include "stripe_stuff.html" %}
<script>
var $j = jQuery.noConflict();

View File

@ -4,6 +4,7 @@
{% block title %}Campaign Management{% endblock %}
{% block extra_extra_head %}
{{ block.super }}
<style type="text/css">
textarea {
width: 90%;

View File

@ -1,6 +1,7 @@
{% extends "basedocumentation.html" %}
{% block extra_extra_head %}
{{ block.super }}
<link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/themes/ui-lightness/jquery-ui.css" type="text/css" media="screen">
{{ form.media.css }}
<script type="text/javascript" src="{{ jquery_ui_home }}" ></script>

View File

@ -1,6 +1,7 @@
{% extends "basedocumentation.html" %}
{% block extra_extra_head %}
{{ block.super }}
<link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/themes/ui-lightness/jquery-ui.css" type="text/css" media="screen">
{{ form.media.css }}
<script type="text/javascript" src="{{ jquery_ui_home }}" ></script>

View File

@ -1,6 +1,7 @@
{% extends "basedocumentation.html" %}
{% block title %}Tools for Rightsholders {% endblock %}
{% block extra_extra_head %}
{{ block.super }}
<link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/themes/ui-lightness/jquery-ui.css" type="text/css" media="screen">
<link href="/static/selectable/css/dj.selectable.css" type="text/css" media="all" rel="stylesheet" />
<script type="text/javascript" src="{{ jquery_ui_home }}"></script>

View File

@ -1,6 +1,7 @@
{% extends "basedocumentation.html" %}
{% block extra_extra_head %}
{{ block.super }}
<link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/themes/ui-lightness/jquery-ui.css" type="text/css" media="screen">
{{ form.media.css }}
<script type="text/javascript" src="{{ jquery_ui_home }}" ></script>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
.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;-webkit-border-radius:16px;border-radius:16px;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}.user-block{width:100%;clear:both}#user-block1{width:100%}#user-block1 a#readon{float:left}.user-block-hide .quicktour.last{background:0}.learnmore_block{float:left;width:100%;clear:both;border-top:solid 1px #8ac3d7;margin-top:20px}.learnmore_block .learnmore_row{border-bottom:dashed 2px #8ac3d7;clear:left;width:68%}.learnmore_block .arrow{color:#8ac3d7;line-height:48pt;float:left;padding-right:8px;padding-left:8px;padding-top:20px;font-size:24pt}.learnmore_block .quicktour{width:20%;float:left;font-style:italic;line-height:20px;font-size:13px;margin-top:0;text-align:center;min-height:64px}.learnmore_block .quicktour .highlight{font-weight:bold}.learnmore_block .quicktour .programlink{margin-top:20px}.learnmore_block .quicktour .panelback{margin-top:21px}.learnmore_block .quicktour .panelfront{font-size:48pt;line-height:48pt;font-style:normal}.learnmore_block .quicktour .panelfront .makeaskgive{position:relative;z-index:1;font-size:40pt;top:10px;right:10pt;text-shadow:4px 2px 4px white}.learnmore_block .quicktour .panelfront .qtbutton{position:relative;z-index:0;opacity:.8}.learnmore_block .quicktour .panelfront .make{line-height:10pt;color:red;font-size:12pt;top:0;left:50px}.learnmore_block .quicktour .panelfront .qtreadit{line-height:0;position:relative;height:34px}.learnmore_block .quicktour .panelfront .qtreadittext{top:-15px;left:50px;line-height:10pt}.learnmore_block .quicktour .panelfront input{line-height:10pt;display:inherit;font-size:10pt;padding:.7em 1em;top:-15px}.learnmore_block .quicktour.last{padding-left:10px;font-size:20px;width:28%;padding-top:20px}.learnmore_block .quicktour.last .signup{color:#8dc63f;font-weight:bold;margin-top:10px}.learnmore_block .quicktour.last .signup img{margin-left:5px;vertical-align:middle;margin-bottom:3px}.learnmore_block .quicktour.right{float:right}#block-intro-text div{display:none;line-height:25px;padding-bottom:10px}#block-intro-text div#active{display:inherit}
.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;-webkit-border-radius:16px;border-radius:16px;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}.user-block{width:100%;clear:both}#user-block1{width:100%}#user-block1 a#readon{float:left}.user-block-hide .quicktour.last{background:0}.learnmore_block{float:left;width:100%;clear:both;border-top:solid 1px #8ac3d7;margin-top:20px}.learnmore_block .learnmore_row{border-bottom:dashed 2px #8ac3d7;clear:left;width:68%}.learnmore_block .arrow{color:#8ac3d7;line-height:48pt;float:left;padding-right:8px;padding-left:8px;padding-top:20px;font-size:24pt}.learnmore_block .quicktour{width:20%;float:left;font-style:italic;line-height:20px;font-size:13px;margin-top:0;text-align:center;min-height:64px}.learnmore_block .quicktour .highlight{font-weight:bold}.learnmore_block .quicktour .programlink{margin-top:20px}.learnmore_block .quicktour .panelback{margin-top:21px}.learnmore_block .quicktour .panelfront{font-size:48pt;line-height:48pt;font-style:normal}.learnmore_block .quicktour .panelfront .makeaskgive{position:relative;z-index:1;font-size:40pt;top:10px;right:10pt;text-shadow:4px 2px 4px white}.learnmore_block .quicktour .panelfront .qtbutton{position:relative;z-index:0;opacity:.8}.learnmore_block .quicktour .panelfront .make{line-height:10pt;color:red;font-size:12pt;top:0;left:50px}.learnmore_block .quicktour .panelfront .qtreadit{line-height:0;position:relative;height:34px}.learnmore_block .quicktour .panelfront .qtreadittext{top:-15px;left:50px;line-height:10pt}.learnmore_block .quicktour .panelfront input{line-height:10pt;display:inherit;font-size:10pt;padding:.7em 1em;top:-15px}.learnmore_block .quicktour.last{padding-left:10px;font-size:20px;width:28%;padding-top:20px}.learnmore_block .quicktour.last .signup{color:#8dc63f;font-weight:bold;margin-top:10px}.learnmore_block .quicktour.last .signup img{margin-left:5px;vertical-align:middle;margin-bottom:3px}.learnmore_block .quicktour.right{float:right}input[type="submit"].qtbutton{float:none;margin:0}#block-intro-text div{display:none;line-height:25px;padding-bottom:10px}#block-intro-text div#active{display:inherit}

View File

@ -69,10 +69,6 @@
/* background */
@charset "utf-8";
*{
padding:0px;
margin:0px;
}
#main-wrapper{
height: 100%;
@ -232,6 +228,10 @@ div.panelview.side2 {
margin: 0px auto 10px auto;
padding: 5px 0 10px 0;
height:58px;
p{
margin:0;
}
}
/* White-background action buttons; vary by state of campaign */

View File

@ -94,6 +94,11 @@
padding: 0 31px 0 11px;
width: 111px;
}
div {
padding:0px;
margin:0px;
}
}
div.button {
@ -113,7 +118,7 @@
}
.js-rightcol-padd {
padding:0;
margin:0px;
}
h3.heading {
@ -127,7 +132,7 @@ ul.ungluingwhat {
margin:0 -10px;
li {
margin-bottom:7px;
margin-bottom:3px;
background:#fff;
padding: 10px;
display:block;
@ -150,8 +155,8 @@ ul.ungluingwhat {
margin-left: 5px;
width: 160px;
word-wrap: break-word;
font-size: @font-size-larger;
line-height: @font-size-larger*1.3;
font-size: @font-size-default;
line-height: @font-size-default*1.3;
a {
font-weight: normal;
}
@ -257,6 +262,7 @@ h3.module-title {
padding: 10px 0;
font-size: @font-size-header;
font-weight: normal;
margin: 0;
}
.landingheader {
@ -298,7 +304,7 @@ ul#as_seen_on {
margin: 15px 0;
position: relative;
height: 80px;
padding:0px;
li {
float: left;
list-style-type: none;
@ -326,7 +332,6 @@ ul#as_seen_on {
background: #fff;
font-size: @font-size-header;
padding: 1.5em;
&:before {
content: "";
position: absolute;
@ -340,6 +345,7 @@ ul#as_seen_on {
/* reduce the damage in FF3.0 */
display:block;
width:0;
}
&:after {
@ -358,8 +364,7 @@ ul#as_seen_on {
}
span {
margin-left: 1em;
padding-left: 1em;
&:before {
position: absolute;
top: .75em;

View File

@ -124,6 +124,11 @@
}
}
input[type="submit"].qtbutton{
float:none;
margin:0;
}
#block-intro-text div {
display: none;
line-height: 25px;