/about/ pages need appropriate styling and should not conflict if user clicks on About in header

pull/1/head
Andromeda Yelton 2012-08-28 13:47:29 -04:00
parent 13171f6472
commit 863bfe5856
13 changed files with 85 additions and 17 deletions

View File

@ -1,7 +1,9 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
<div class="nonlightbox">
<div id="lightbox_content"> <div id="lightbox_content">
<div class="clearfix about_page">
<p> <p>
Do you have a <b>book you love so much</b> you'd like to give it to the world? These are the books that <span class="ungluer"></span> is helping to give to the world, right now. Do you have a <b>book you love so much</b> you'd like to give it to the world? These are the books that <span class="ungluer"></span> is helping to give to the world, right now.
</p> </p>
@ -20,4 +22,6 @@
{% include "about_lightbox_footer.html" %} {% include "about_lightbox_footer.html" %}
</div> </div>
</div>
</div>
{% endblock %} {% endblock %}

View File

@ -1,7 +1,9 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
<div class="nonlightbox">
<div id="lightbox_content"> <div id="lightbox_content">
<div class="clearfix about_page">
<p> <p>
Do you have a <b>book you love so much</b> you'd like to give it to the world? At Unglue.it, you can. Do you have a <b>book you love so much</b> you'd like to give it to the world? At Unglue.it, you can.
</p> </p>
@ -20,4 +22,6 @@
{% include "about_lightbox_footer.html" %} {% include "about_lightbox_footer.html" %}
</div> </div>
</div>
</div>
{% endblock %} {% endblock %}

View File

@ -1,7 +1,9 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
<div class="nonlightbox">
<div id="lightbox_content"> <div id="lightbox_content">
<div class="clearfix about_page">
<p> <p>
<b>What if you could</b> give a book to everyone on earth? Get an ebook and read it on any device, in any format, forever? Give an ebook to your library, for them to share? Own DRM-free ebooks, legally? Read free ebooks, and know their creators had been fairly paid? <b>What if you could</b> give a book to everyone on earth? Get an ebook and read it on any device, in any format, forever? Give an ebook to your library, for them to share? Own DRM-free ebooks, legally? Read free ebooks, and know their creators had been fairly paid?
</p> </p>
@ -20,4 +22,6 @@
{% include "about_lightbox_footer.html" %} {% include "about_lightbox_footer.html" %}
</div> </div>
</div>
</div>
{% endblock %} {% endblock %}

View File

@ -1,7 +1,9 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
<div class="nonlightbox">
<div id="lightbox_content"> <div id="lightbox_content">
<div class="clearfix about_page">
<p> <p>
Imagine if <b>you could give your favorite book</b> to everyone on earth. Imagine if they all had a copy that they could read anywhere, anytime, on their favorite devices, with no DRM. That they could share with their friends, freely and legally. And imagine that your favorite book's creators still got paid. Imagine if <b>you could give your favorite book</b> to everyone on earth. Imagine if they all had a copy that they could read anywhere, anytime, on their favorite devices, with no DRM. That they could share with their friends, freely and legally. And imagine that your favorite book's creators still got paid.
</p> </p>
@ -20,4 +22,6 @@
{% include "about_lightbox_footer.html" %} {% include "about_lightbox_footer.html" %}
</div> </div>
</div>
</div>
{% endblock %} {% endblock %}

View File

@ -1,7 +1,9 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
<div class="nonlightbox">
<div id="lightbox_content"> <div id="lightbox_content">
<div class="clearfix about_page">
<p> <p>
Imagine if <b>you could give your favorite book</b> to everyone on earth. Imagine if they all had a copy that they could read anywhere, anytime, on their favorite devices, with no DRM. That they could share with their friends, freely and legally. And imagine that your favorite book's creators still got paid. Imagine if <b>you could give your favorite book</b> to everyone on earth. Imagine if they all had a copy that they could read anywhere, anytime, on their favorite devices, with no DRM. That they could share with their friends, freely and legally. And imagine that your favorite book's creators still got paid.
</p> </p>
@ -20,4 +22,6 @@
{% include "about_lightbox_footer.html" %} {% include "about_lightbox_footer.html" %}
</div> </div>
</div>
</div>
{% endblock %} {% endblock %}

View File

@ -1,8 +1,10 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
<div class="nonlightbox">
<div id="lightbox_content"> <div id="lightbox_content">
<p> <div class="clearfix about_page">
<p>
Do you have a <b>book you love so much</b> you'd like to give it to the world? These are the books that <span class="ungluer"></span> wants to give to the world. Do you have a <b>book you love so much</b> you'd like to give it to the world? These are the books that <span class="ungluer"></span> wants to give to the world.
</p> </p>
<p> <p>
@ -20,4 +22,6 @@
{% include "about_lightbox_footer.html" %} {% include "about_lightbox_footer.html" %}
</div> </div>
</div>
</div>
{% endblock %} {% endblock %}

View File

@ -1,7 +1,9 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
<div class="nonlightbox">
<div id="lightbox_content"> <div id="lightbox_content">
<div class="clearfix about_page">
<p> <p>
Do you have a <b>book you love so much</b> you'd like to give it to the world? Do you have a <b>book you love so much</b> you'd like to give it to the world?
</p> </p>
@ -20,4 +22,6 @@
{% include "about_lightbox_footer.html" %} {% include "about_lightbox_footer.html" %}
</div> </div>
</div>
</div>
{% endblock %} {% endblock %}

View File

@ -403,10 +403,13 @@ ul.tabs li.active a {
#lightbox_content a { #lightbox_content a {
color: #6994a3; color: #6994a3;
} }
#lightbox_content .signuptoday a {
color: white;
}
#lightbox_content h2, #lightbox_content h2,
#lightbox_content h3, #lightbox_content h3,
#lightbox_content h4 { #lightbox_content h4 {
margin: 15px auto 5px auto; margin-top: 15px;
} }
#lightbox_content .ebook_download { #lightbox_content .ebook_download {
margin-bottom: 15px; margin-bottom: 15px;

View File

@ -97,10 +97,13 @@
#lightbox_content a { #lightbox_content a {
color: #6994a3; color: #6994a3;
} }
#lightbox_content .signuptoday a {
color: white;
}
#lightbox_content h2, #lightbox_content h2,
#lightbox_content h3, #lightbox_content h3,
#lightbox_content h4 { #lightbox_content h4 {
margin: 15px auto 5px auto; margin-top: 15px;
} }
#lightbox_content .ebook_download { #lightbox_content .ebook_download {
margin-bottom: 15px; margin-bottom: 15px;

View File

@ -222,10 +222,13 @@
#lightbox_content a { #lightbox_content a {
color: #6994a3; color: #6994a3;
} }
#lightbox_content .signuptoday a {
color: white;
}
#lightbox_content h2, #lightbox_content h2,
#lightbox_content h3, #lightbox_content h3,
#lightbox_content h4 { #lightbox_content h4 {
margin: 15px auto 5px auto; margin-top: 15px;
} }
#lightbox_content .ebook_download { #lightbox_content .ebook_download {
margin-bottom: 15px; margin-bottom: 15px;
@ -943,35 +946,47 @@ a.nounderline {
margin-left: 0; margin-left: 0;
padding: 9px; padding: 9px;
} }
#about_expandable p { #about_expandable .collapser_x {
margin-top: -27px;
margin-right: -27px;
}
#lightbox_content p {
padding: 9px 0; padding: 9px 0;
font-size: 15px; font-size: 15px;
line-height: 20px; line-height: 20px;
} }
#about_expandable p a { #lightbox_content p a {
font-size: 15px; font-size: 15px;
line-height: 20px; line-height: 20px;
} }
#about_expandable p b { #lightbox_content p b {
color: #8dc63f; color: #8dc63f;
} }
#about_expandable p.last { #lightbox_content p.last {
border-bottom: solid 2px #d6dde0; border-bottom: solid 2px #d6dde0;
margin-bottom: 5px; margin-bottom: 5px;
} }
#about_expandable .right_border { #lightbox_content .right_border {
border-right: solid 1px #d6dde0; border-right: solid 1px #d6dde0;
float: left; float: left;
padding: 9px; padding: 9px;
} }
#about_expandable .signuptoday { #lightbox_content .signuptoday {
float: right; float: right;
margin-top: 0; margin-top: 0;
clear: none; clear: none;
} }
#about_expandable .collapser_x { .nonlightbox .about_page {
margin-top: -27px; -moz-border-radius: 5px;
margin-right: -27px; -webkit-border-radius: 5px;
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
border: solid 5px #d6dde0;
width: 75%;
margin: 10px auto auto auto;
padding: 9px;
} }
.collapser_x { .collapser_x {
float: right; float: right;

View File

@ -16,6 +16,7 @@ $j(document).ready(function() {
$j('#js-rightcol').css({"opacity": "0.07"}); $j('#js-rightcol').css({"opacity": "0.07"});
$j('#js-header').css({"opacity": "0.07"}); $j('#js-header').css({"opacity": "0.07"});
$j('#js-header a').css({"cursor": "default"}); $j('#js-header a').css({"cursor": "default"});
$j('#js-page-wrap').css({"opacity": "0.07"});
$j('#footer').css({"opacity": "0.07"}); $j('#footer').css({"opacity": "0.07"});
$j('#about_expandable').fadeTo("slow", 1); $j('#about_expandable').fadeTo("slow", 1);
@ -44,6 +45,7 @@ $j(document).ready(function() {
$j('#js-rightcol').fadeTo("slow", 1); $j('#js-rightcol').fadeTo("slow", 1);
$j('#js-header').fadeTo("slow", 1); $j('#js-header').fadeTo("slow", 1);
$j('#js-header a').css({"cursor": "pointer"}); $j('#js-header a').css({"cursor": "pointer"});
$j('#js-page-wrap').fadeTo("slow", 1);
$j('#footer').fadeTo("slow", 1); $j('#footer').fadeTo("slow", 1);
$j('#about_expandable').css({"display": "none"}); $j('#about_expandable').css({"display": "none"});
}); });

View File

@ -7,6 +7,11 @@
#lightbox_content a { #lightbox_content a {
color: @medium-blue; color: @medium-blue;
}
#lightbox_content .signuptoday a {
color: white;
} }
#lightbox_content h2, #lightbox_content h3, #lightbox_content h4 { #lightbox_content h2, #lightbox_content h3, #lightbox_content h4 {

View File

@ -606,6 +606,13 @@ a.nounderline {
margin-left: 0; margin-left: 0;
padding: 9px; padding: 9px;
.collapser_x {
margin-top: -27px;
margin-right: -27px;
}
}
#lightbox_content {
p { p {
padding: 9px 0; padding: 9px 0;
font-size: @font-size-larger; font-size: @font-size-larger;
@ -638,10 +645,15 @@ a.nounderline {
clear: none; clear: none;
} }
.collapser_x { }
margin-top: -27px;
margin-right: -27px; // need to style /about/X pages such that they will not conflict with lightboxed About from header
} .nonlightbox .about_page {
.one-border-radius(5px);
border: solid 5px @blue-grey;
width: 75%;
margin: 10px auto auto auto;
padding: 9px;
} }
.collapser_x { .collapser_x {