diff --git a/frontend/templates/about_active.html b/frontend/templates/about_active.html index 3f4b12c7..7273c916 100644 --- a/frontend/templates/about_active.html +++ b/frontend/templates/about_active.html @@ -1,7 +1,9 @@ {% extends "base.html" %} {% block content %} +
+
{% endblock %} \ No newline at end of file diff --git a/frontend/templates/about_active_empty.html b/frontend/templates/about_active_empty.html index 97444782..e274756f 100644 --- a/frontend/templates/about_active_empty.html +++ b/frontend/templates/about_active_empty.html @@ -1,7 +1,9 @@ {% extends "base.html" %} {% block content %} +
+
{% endblock %} \ No newline at end of file diff --git a/frontend/templates/about_main.html b/frontend/templates/about_main.html index 3e9d976f..aeed6ea0 100644 --- a/frontend/templates/about_main.html +++ b/frontend/templates/about_main.html @@ -1,7 +1,9 @@ {% extends "base.html" %} {% block content %} +
+
{% endblock %} \ No newline at end of file diff --git a/frontend/templates/about_unglued.html b/frontend/templates/about_unglued.html index 6efd0151..73b42457 100644 --- a/frontend/templates/about_unglued.html +++ b/frontend/templates/about_unglued.html @@ -1,7 +1,9 @@ {% extends "base.html" %} {% block content %} +
+
{% endblock %} \ No newline at end of file diff --git a/frontend/templates/about_unglued_empty.html b/frontend/templates/about_unglued_empty.html index 82af66a8..1ca1cc20 100644 --- a/frontend/templates/about_unglued_empty.html +++ b/frontend/templates/about_unglued_empty.html @@ -1,7 +1,9 @@ {% extends "base.html" %} {% block content %} +
+
{% endblock %} \ No newline at end of file diff --git a/frontend/templates/about_wishlist.html b/frontend/templates/about_wishlist.html index bd0a7f56..46ab2b8d 100644 --- a/frontend/templates/about_wishlist.html +++ b/frontend/templates/about_wishlist.html @@ -1,8 +1,10 @@ {% extends "base.html" %} {% block content %} +
+
{% endblock %} \ No newline at end of file diff --git a/frontend/templates/about_wishlist_empty.html b/frontend/templates/about_wishlist_empty.html index c8e26a83..8db3b865 100644 --- a/frontend/templates/about_wishlist_empty.html +++ b/frontend/templates/about_wishlist_empty.html @@ -1,7 +1,9 @@ {% extends "base.html" %} {% block content %} +
+
{% endblock %} \ No newline at end of file diff --git a/static/css/campaign.css b/static/css/campaign.css index f2ab96b1..4d40a79b 100755 --- a/static/css/campaign.css +++ b/static/css/campaign.css @@ -403,10 +403,13 @@ ul.tabs li.active a { #lightbox_content a { color: #6994a3; } +#lightbox_content .signuptoday a { + color: white; +} #lightbox_content h2, #lightbox_content h3, #lightbox_content h4 { - margin: 15px auto 5px auto; + margin-top: 15px; } #lightbox_content .ebook_download { margin-bottom: 15px; diff --git a/static/css/download.css b/static/css/download.css index 676f8e45..0848d2c7 100644 --- a/static/css/download.css +++ b/static/css/download.css @@ -97,10 +97,13 @@ #lightbox_content a { color: #6994a3; } +#lightbox_content .signuptoday a { + color: white; +} #lightbox_content h2, #lightbox_content h3, #lightbox_content h4 { - margin: 15px auto 5px auto; + margin-top: 15px; } #lightbox_content .ebook_download { margin-bottom: 15px; diff --git a/static/css/sitewide.css b/static/css/sitewide.css index 7fc6871e..d2367996 100644 --- a/static/css/sitewide.css +++ b/static/css/sitewide.css @@ -222,10 +222,13 @@ #lightbox_content a { color: #6994a3; } +#lightbox_content .signuptoday a { + color: white; +} #lightbox_content h2, #lightbox_content h3, #lightbox_content h4 { - margin: 15px auto 5px auto; + margin-top: 15px; } #lightbox_content .ebook_download { margin-bottom: 15px; @@ -943,35 +946,47 @@ a.nounderline { margin-left: 0; padding: 9px; } -#about_expandable p { +#about_expandable .collapser_x { + margin-top: -27px; + margin-right: -27px; +} +#lightbox_content p { padding: 9px 0; font-size: 15px; line-height: 20px; } -#about_expandable p a { +#lightbox_content p a { font-size: 15px; line-height: 20px; } -#about_expandable p b { +#lightbox_content p b { color: #8dc63f; } -#about_expandable p.last { +#lightbox_content p.last { border-bottom: solid 2px #d6dde0; margin-bottom: 5px; } -#about_expandable .right_border { +#lightbox_content .right_border { border-right: solid 1px #d6dde0; float: left; padding: 9px; } -#about_expandable .signuptoday { +#lightbox_content .signuptoday { float: right; margin-top: 0; clear: none; } -#about_expandable .collapser_x { - margin-top: -27px; - margin-right: -27px; +.nonlightbox .about_page { + -moz-border-radius: 5px; + -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 { float: right; diff --git a/static/js/hijax.js b/static/js/hijax.js index f9c5736b..f108e5cd 100644 --- a/static/js/hijax.js +++ b/static/js/hijax.js @@ -16,6 +16,7 @@ $j(document).ready(function() { $j('#js-rightcol').css({"opacity": "0.07"}); $j('#js-header').css({"opacity": "0.07"}); $j('#js-header a').css({"cursor": "default"}); + $j('#js-page-wrap').css({"opacity": "0.07"}); $j('#footer').css({"opacity": "0.07"}); $j('#about_expandable').fadeTo("slow", 1); @@ -44,6 +45,7 @@ $j(document).ready(function() { $j('#js-rightcol').fadeTo("slow", 1); $j('#js-header').fadeTo("slow", 1); $j('#js-header a').css({"cursor": "pointer"}); + $j('#js-page-wrap').fadeTo("slow", 1); $j('#footer').fadeTo("slow", 1); $j('#about_expandable').css({"display": "none"}); }); diff --git a/static/less/download.less b/static/less/download.less index d96f1a55..0067f38d 100644 --- a/static/less/download.less +++ b/static/less/download.less @@ -7,6 +7,11 @@ #lightbox_content a { color: @medium-blue; + +} + +#lightbox_content .signuptoday a { + color: white; } #lightbox_content h2, #lightbox_content h3, #lightbox_content h4 { diff --git a/static/less/sitewide.less b/static/less/sitewide.less index 20d5a395..bcb191f0 100644 --- a/static/less/sitewide.less +++ b/static/less/sitewide.less @@ -606,6 +606,13 @@ a.nounderline { margin-left: 0; padding: 9px; + .collapser_x { + margin-top: -27px; + margin-right: -27px; + } +} + +#lightbox_content { p { padding: 9px 0; font-size: @font-size-larger; @@ -638,10 +645,15 @@ a.nounderline { 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 {