From: Radek Czajka Date: Tue, 12 Nov 2013 11:57:43 +0000 (+0100) Subject: Merge branch 'master' into rwd X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/7f0caf88dd3aac2e4d5bb4ee064137e03ecd4f03?hp=32d67bcd63571d61f090b613aba48ec4c710ae1a Merge branch 'master' into rwd Conflicts: apps/wolnelektury_core/templates/superbase.html --- diff --git a/.gitignore b/.gitignore index 6714e2301..3224d626b 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,9 @@ dev.sqlite # Compress output /static +# SCSS output +/apps/wolnelektury_core/static/css/main/*.css + # Python garbage *.pyc .coverage diff --git a/apps/catalogue/templates/catalogue/book_detail.html b/apps/catalogue/templates/catalogue/book_detail.html index 4c14158ef..bf8a726f1 100644 --- a/apps/catalogue/templates/catalogue/book_detail.html +++ b/apps/catalogue/templates/catalogue/book_detail.html @@ -17,7 +17,9 @@ {% work_list book_children %} -

{% trans "See also" %}:

+
+

{% trans "See also" %}:

{% related_books book %} +
{% endblock %} diff --git a/apps/catalogue/templates/catalogue/book_list.html b/apps/catalogue/templates/catalogue/book_list.html index ddeb3ce3f..00088a58e 100644 --- a/apps/catalogue/templates/catalogue/book_list.html +++ b/apps/catalogue/templates/catalogue/book_list.html @@ -17,16 +17,16 @@ -
- {% trans "Table of Content" %} - {{ rendered_nav }} +
+

{% trans "Table of Content" %}

+
+ {{ rendered_nav }} +
-
+
{% block book_list %} {{ rendered_book_list }} {% endblock %}
- + {% trans "↑ top ↑" %} {% endblock %} diff --git a/apps/catalogue/templates/catalogue/book_short.html b/apps/catalogue/templates/catalogue/book_short.html index 73e5cb8fb..c8fb9520b 100644 --- a/apps/catalogue/templates/catalogue/book_short.html +++ b/apps/catalogue/templates/catalogue/book_short.html @@ -2,23 +2,10 @@ {% load catalogue_tags social_tags %} {% load thumbnail %}
-
+
+
-
- {% if book.cover %} - {% if main_link %}{% endif %} - Cover - {% if main_link %}{% endif %} - {% endif %} - {% block cover-area-extra %}{% endblock %} -
@@ -40,7 +27,7 @@
-
+
{% for name, slug in related.tags.author %} {{ name }}{% if not forloop.last %}, {% endif %}{% endfor %}{% for title, slug in related.parents %}, @@ -53,29 +40,46 @@
+
+ {% if book.cover %} + {% if main_link %}{% endif %} + Cover + {% if main_link %}{% endif %} + {% endif %} + {% block cover-area-extra %}{% endblock %} +
{% spaceless %} + {% trans "Epoch" %}:  {% for name, slug in related.tags.epoch %} {{ name }} - {% if not forloop.last %}, {% endif %} + {% if not forloop.last %}, {% endif %} {% endfor %} - + + {% trans "Kind" %}:  {% for name, slug in related.tags.kind %} {{ name }} - {% if not forloop.last %}, {% endif %} + {% if not forloop.last %}, {% endif %} {% endfor %} - + + {% trans "Genre" %}:  {% for name, slug in related.tags.genre %} {{ name }} - {% if not forloop.last %}, {% endif %} + {% if not forloop.last %}, {% endif %} {% endfor %} - + {% endspaceless %}
@@ -85,12 +89,12 @@ {% block book-box-extra-info %}{% endblock %} {% block box-append %} {% endblock %} +
{% block right-column %} {% endblock %}
diff --git a/apps/catalogue/templates/catalogue/menu.html b/apps/catalogue/templates/catalogue/menu.html index 4fe776925..2da629d74 100644 --- a/apps/catalogue/templates/catalogue/menu.html +++ b/apps/catalogue/templates/catalogue/menu.html @@ -1,10 +1,14 @@ {% load i18n static %} + + {% trans "Catalogue of the library" %} + {% trans "Catalogue" %} + diff --git a/apps/wolnelektury_core/static/css/antiscreen.css b/apps/wolnelektury_core/static/css/antiscreen.css deleted file mode 100644 index 5a8e34c59..000000000 --- a/apps/wolnelektury_core/static/css/antiscreen.css +++ /dev/null @@ -1,149 +0,0 @@ -/* - * Style for handheld devices. Should cancel screen.css. - */ - -a { - display: inline-block; - padding: .5em; -} - -.left-column { - width: auto !important; - float: none !important; -} -.right-column { - float: none !important; - width: auto !important; -} - -.hidden-box ul { - width: 20em !important; - column-width: auto !important; - -moz-column-width: auto !important; - -webkit-column-width: auto !important; -} - -#header-content, div#main-content, div#half-header-content, #footer-content { - width: auto !important; - margin: 0 !important; -} - -#promo-box { - float: none !important; - margin-top: 0 !important; -} - -#promo-box-body { - height: auto !important; -} - -#big-cite .vip { - float: none !important; - text-align: left !important; - width: auto !important; -} - -#big-cite .cite-body { - margin-left: 0 !important; -} - -#big-cite .source { - margin-left: 0 !important; -} - - -.book-wide-box { - width: auto !important; -} -.book-wide-box .book-box-body { - width: auto !important; -} - - -#tagged-object-list .left-column, #tagged-object-list .right-column { - width: auto !important; -} - - - - -.inline-body { - width: auto !important; -} - - -.search-result { - width: auto !important; -} - - -.book-list-header { - width: auto !important; -} - -.book-wide-box .right-column { - width: auto !important; - margin-top: 0 !important; -} - -.book-wide-box #theme-list-wrapper { - margin-bottom: 0 !important; -} - -.snippets { - width: auto !important; - float: none !important; - margin-top: 0 !important; -} - - -/* HEADER */ - -#header { - height: auto !important; - padding-top: 0 !important; -} -#logo { - position: static !important; -} -#user-info { - float: none !important; - padding: 1em 0 !important; -} - -#tagline { - display: block !important; - margin-left: 0 !important; -} - -#search-area { - margin-left: 0 !important; - width: auto !important; -} - -#search-field { - width: auto !important; - padding-right: 0.5em !important; -} - -#search { - width: auto !important; -} - -#search-button { - float: none !important; -} - -#promo-box { - width: auto; -} - -/* Book list */ - -#book-list-nav { - border-left: none !important; - padding: 0 !important; - position: static !important; - right: 0 !important; - width: auto !important; -} diff --git a/apps/wolnelektury_core/static/css/auth.css b/apps/wolnelektury_core/static/css/auth.css deleted file mode 100644 index 2979d0d98..000000000 --- a/apps/wolnelektury_core/static/css/auth.css +++ /dev/null @@ -1,67 +0,0 @@ -#auth-page #main-content p { - font-size: 1.2em; -} -#auth-page #main-content h2 { - font-size: 2em; - margin-top: 1em; -} - -.uniForm { - font-size: 1.2em; -} -.uniForm fieldset { - border: none; - margin: .5em 0; -} -.uniForm .ctrlHolder { - margin: .5em 0; -} - -.inlineLabels label { - width: 8em; - display: inline-block; -} -.inlineLabels .buttonHolder, .inlineLabels .formHint { - margin-left: 8em; -} - - - -.email_list .verified { - display: inline-block; - margin-left: 2em; - font-style: italic; -} -.email_list .unverified { - display: inline-block; - margin-left: 2em; - color: #717171; - font-style: italic; -} -.email_list .primary { - display: inline-block; - margin-left: 2em; - font-weight: bold; -} -.socialaccount_provider { - display: inline-block; - background-repeat: no-repeat; - color: transparent; - height: 40px; - width: 40px; - vertical-align: middle; -} -.socialaccount_provider.google { - background-image: url(/static/img/auth/google.png); -} - - -.socialaccount_providers { - margin: 1em 0; - padding: 0; -} -.socialaccount_providers li { - display: inline; - list-style: none; - margin-right: 1em; -} \ No newline at end of file diff --git a/apps/wolnelektury_core/static/css/base.css b/apps/wolnelektury_core/static/css/base.css deleted file mode 100755 index 3496937ea..000000000 --- a/apps/wolnelektury_core/static/css/base.css +++ /dev/null @@ -1,184 +0,0 @@ -html { - margin: 0; - padding: 0; -} - -body { - margin: 0; - background: #f7f7f7; - font-size: .625em; - font-family: Georgia; - /*line-height: 1.4em;*/ -} - -a img { - border: 0; -} - -a { - color: #0d7e85; /*#1199a2;*/ /* #01adba; */ - text-decoration: none; -} - -/* jquery UI overrides us */ -.ui-menu .ui-menu-item a { - color: #0d7e85 !important; - line-height: 1.636em !important; -} - -.ui-widget { - font-family: Georgia !important; - font-size: 1em !important; -} - -.ui-widget-content { - background: #EEEEEE !important; /* #E2E2E2 ? */ - border-radius: 0px !important; -} - - -h1 { - font-size: 3.5em; - font-weight: normal; - margin-top: .4em -} -h1 a { - color: inherit; -} - -ul.plain { - list-style:none; - margin: 0; - padding: 0; -} - -.normal-text { - font-size: 1.3em; - line-height: 1.3em; -} - -h2 { - font-size: 2em; - font-weight: normal; -} - -h2.plain { - margin: 0; - font-size: 1em; -} - -h3 { - font-size: 1.5em; - font-weight: normal; -} - -.mono { - font-family: "Andale Mono", "Lucida Sans Typewriter", "Courier New"; -/* font-weight: bold; */ -} - -.accent1 { - color: #191919; -} - -.accent2 { - color: #242424; -} - -.accent3 { - color: #575c63; -} - - -.accent4 { - color: #707b7a; -} - -.contrast { - #1199a2; -} - -/* #281d1c */ - -.clearboth { - clear: both; -} - -.white-box { - border: 1px solid #ddd; - padding: 1em; - background: #fff; - -moz-box-shadow: 2px 2px 2px #ddd; - -webkit-box-shadow: 2px 2px 2px #ddd; - box-shadow: 2px 2px 2px #ddd; -} - -.page-desc { - margin-left: 1.5em; -} - -.inline-tag-lists p span:first-child { - color: #281d1c; -} - -.inline-tag-lists { - font-size: 1.1em; -} - -.theme-list-link:after { - padding-left: 1em; - content: url("/static/img/arrow-teal.png"); - vertical-align: middle; -} -.theme-list-link { - font-size: 1.1em; -} -.hidden-box-wrapper { - position: relative; -} -.hidden-box { - position: absolute; - left: 0; - display: none; - border: 1px solid #ddd; - padding: 1em 1em .5em 1em; - background: #fff; - -moz-box-shadow: 2px 2px 2px #ddd; - -webkit-box-shadow: 2px 2px 2px #ddd; - box-shadow: 2px 2px 2px #ddd; - z-index: 500; -} -.hidden-box ul { - list-style: none; - padding: 0; - margin: 0; - font-size: 1.1em; -} -.hidden-box li { - margin-bottom: .5em; -} - - -.pagination { - display: block; - font-size: 1.2em; - padding: .5em; - text-align:center; -} - -#footer { - color: #767676; - margin-top: 5em; - padding-top:3em; - background: #fff; - border-top: 1px solid #ddd; -} -#footer p { - margin: .25em 0; -} - -/* just on search page */ -.top-tag-list { - margin-top: 2.2em; - margin-bottom: 1.6em; -} diff --git a/apps/wolnelektury_core/static/css/book_box.css b/apps/wolnelektury_core/static/css/book_box.css deleted file mode 100755 index 190ddd773..000000000 --- a/apps/wolnelektury_core/static/css/book_box.css +++ /dev/null @@ -1,345 +0,0 @@ -.book-mini-box, .Book-item { - display: inline-block; - vertical-align: top; -} - -.book-wide-box, .book-box { - margin: 0; - vertical-align: top; -} - -.book-box { - width: 48.75em; -} - -.book-mini-box { - width: 16.15em; -} - -.book-wide-box { - /** This is a fullpage box, it must be aligned with the top menu. - This corresponds to a .1em margin below **/ - margin-left: -0.1em; -} - -/* - * A mini-box wraps it's contents (image + label) in an - * other boxes have an inner box as a wrapper. - */ - -.book-box-inner { - /* min, so it can grow */ - min-height: 19.75em; - margin: .5em; -} - -.book-mini-box a, .book-box-inner { - display: block; - color: black; - border: 1px solid #ddd; -/* height: 20em; */ - padding: .8em 1em; - margin: .1em; - background: #fff; - -moz-box-shadow: 2px 2px 2px #ddd; - -webkit-box-shadow: 2px 2px 2px #ddd; - box-shadow: 2px 2px 2px #ddd; -} - -.book-mini-box a { - height: 27.1em; - margin: .1em; - overflow: hidden; -} - - -.book-wide-box .book-box-inner { - /* min, so it can grow */ - min-height: 24.4em; -} - -.search-result .book-box-body { - width: 31em; -} - -.book-list-header { - padding: 0em; - margin-left: -0.1em; -} - -.book-list-header .book-box-inner { - min-height: 1em; -} - -.book-list-header p { - font-size: 2.4em; - margin: 0.5em; -} - - -/* - * ingenous float containment hack - * http://www.mikepadgett.com/technology/technical/alternative-to-the-pie-clearfix-hack/ - */ -/* -.search-result .book-box-inner { - height: 1%; - overflow: hidden; -} -*/ - -.book-mini-box img.cover, -.book-box img.cover, -.book-wide-box img.cover, -.search-result img.cover { - width: 13.9em; - height: 19.3em; -} -.book-mini-box img.cover { - margin-bottom: 1.8em; -} -.book-box-inner .cover-area, -.book-wide-box .cover-area -{ - float: left; - margin-right: 1.5em; -} - -.book-mini-box .desc { - margin-left:0em; -} -.book-mini-box .author { - font-size: 1.1em; - color: #6d7877; - display: block; - overflow:hidden; - text-overflow: ellipsis; - white-space: nowrap; -} -.book-mini-box .title { - font-size: 1.4em; - color: #242424; -} - - -.book-box-body { - height: 17em; - overflow:hidden; - position: relative; -} - -.book-wide-box .book-box-body { - min-height: 17em; -} - -.book-box-head { - min-height: 7em; - padding-top: 1.4em; - margin-bottom: 1em; -} -.book-box-head a { - color: black; -} -.book-box-head .author { - font-size: 1.1em; - max-width: 24em; -} -.book-box-head .title { - font-size: 2.4em; - height: 2.4em; - overflow:hidden; - margin-top: .3em; -} -.book-box-body .tags { - font-size: 1.1em; -} -.book-box-tag { - margin-right: .5em; - margin-left: .4em; -} -.book-box-download { - position: relative; -} - -.book-box-download a { - position: relative; - z-index: 101; -} - -.book-box-formats { - display: none; - position: absolute; - - width: 16.363em; - border: 1px solid #ddd; - padding: 3.454em 1.727em .818em 1.727em; - background: #fff; - -moz-box-shadow: 2px 2px 2px #ddd; - -webkit-box-shadow: 2px 2px 2px #ddd; - box-shadow: 2px 2px 2px #ddd; - - z-index: 100; - top: -1.454em; - left: -1.727em; -} -.book-box-formats span { - display: block; -} - -.book-box-download .book-box-formats span:first-child { - margin-top: 1.454em; -} - -.book-box-download:hover .book-box-formats, -.book-box-download.hover .book-box-formats { - display: block; -} - -.book-box-tools { - width: 46em; - font-size: 1.1em; -} - -.book-wide-box { - min-width: 48.75em; -} -.book-wide-box .book-box-tools { - margin-left: 14em; - width: 32em; -} - -.book-wide-box #theme-list-wrapper { - margin-left: 15.4em; - margin-bottom: 3em; - width: 30em; -} - - - -.book-box-read a:before { - content: url("/static/img/read.png"); - font-size: 2.25em; - margin-right: .15em; - vertical-align: middle; - font-weight: normal; -} - -.book-box-download a.downarrow:before { - content: url("/static/img/download.png"); - font-size: 2.25em; - margin-right: .15em; - vertical-align: middle; - font-weight: normal; -} - -.book-box-audiobook a:before { - content: url("/static/img/listen.png"); - font-size: 2.25em; - margin-right: .15em; - vertical-align: middle; - font-weight: normal; -} - -ul.book-box-tools { - margin: 0; - padding: 0; -} - -.book-box-tools li { - display: inline-block; -} - -.book-box-read { - width: 11.5em; -} -.book-box-download { - width: 8.5em; -} -.book-box-audiobook { - width: 7em; -} - -ul.inline-items, ul.inline-items li { - margin: 0; - padding: 0; -} - -ul.inline-items li { - display: inline-block; -} - -.book-wide-box .other-tools { - float: left; - width: 14.5em; - margin: 5em 0 0 1.5em; - -} - -.book-wide-box .other-download { - float: left; - width: 22em; - margin: 5em 1.5em 0em 1.5em; -} -.book-wide-box .other-tools h2, -.book-wide-box .other-download h2, -.book-wide-box .other-tools ul, -.book-wide-box .other-download ul { - font-size: 1.1em; -} -.book-wide-box .other-tools h2, -.book-wide-box .other-download h2 { - margin: 0; -} - - - -.book-wide-box .license-icon { - display:block; - margin-top: .5em -} - - -.star { - font-size: 2.25em; - margin-right: .5em; - position: absolute; - right: 0; -} -.star button::-moz-focus-inner { - padding: 0; - border: 0 -} -.if-unlike button { - font-size: 1em; - font-family: inherit; - border: 0; - background: none; - margin: 0; - padding: 0; - color: #757575; -} - -.if-like a { - display:block; - text-align:right; - padding: 0; -} - -.like .if-unlike { - display: none; -} - -.unlike .if-like { - display: none; -} - -.snippets .snippet-text { - background: #f7f7f7; - font-size: 1.2em; - margin: 1.083em 0em; - padding: 1em; -} - -.snippets .anchor { - display: none; -} diff --git a/apps/wolnelektury_core/static/css/catalogue.css b/apps/wolnelektury_core/static/css/catalogue.css deleted file mode 100755 index 5f52f248c..000000000 --- a/apps/wolnelektury_core/static/css/catalogue.css +++ /dev/null @@ -1,161 +0,0 @@ -.work-list { - margin: 0; - padding: 0; - list-style: none; -} - -.work-item { - margin: 0; - padding: 0; -} - -.books .work-item { - display: inline-block; -} - - -/* listing of all books */ -#book-list { - padding-left: 50px; -} -/* FIXME: MEDIA? - * -#book-list-nav { - position: absolute; - right: 50px; - width: 200px; - border-left: 1px #cfcfcf solid; - padding: 10px; - font-size: 1.2em; -} - */ - -#book-list-nav ul { - list-style-type: none; - margin: 5px; - padding: 0; -} - -.book-list-show-index { - display: none; - margin: 0; - padding: 0; -} - - -#book-a-list #book-list ol { - padding-left: 1em; - margin: 0.3em 0 1.2em 0; - list-style: none; -} - -#book-a-list #book-list h2 { - font-size: 1em; - margin: 0; -} - -#book-a-list #book-list h2 a { - color: black; -} - -#book-list-up { - position: fixed; - bottom: 50px; - right: 50px; - border-left: 1px #cfcfcf solid; - padding: 10px; - background-color: white; -} - - - -.catalogue-catalogue h2 { - font-size: 2em; - margin: 0; -} -.catalogue-catalogue ul { - column-width: 30em; - -moz-column-width: 30em; - -webkit-column-width: 30em; -} - - -#description { - margin-bottom: 2em; - cursor: pointer; -} -#description dl { - margin-top: 0; -} -#description dt { - display: inline; - font-weight: bold; - margin: 0; -} -#description dd { - display: inline; - margin: 0; -} -#description p { - margin-top: 0; -} -#description .meta { - list-style: none; - padding: 0; - margin: 0; -} -#description .meta li { - text-align:right; - color: #666; - font-size: .9em; -} - -.inline-header { - display: inline-block; - vertical-align: top; - width: 7em; -} -.inline-body { - display: inline-block; - vertical-align: top; - margin-bottom: .5em; -} -.inline-body ul { - list-style: none; - padding: 0; - margin: 0; -} -.inline-body li { - display: inline-block; - margin-right: 1em; -} - - -.see-also { - margin-left: 8em; - float: left; - width: 14.3em; -} -.download { - margin-left: 2em; - float: left; -} - -.see-also, .download { - margin-top: 2em; - margin-bottom: 2em; -} -.see-also h2, .download h2 { - font-size: 1.1em; - margin: 0; -} -.see-also ul, .download ul { - list-style: none; - padding: 0; - margin: 0; - font-size: 1.1em; -} - -.left-column .see-also { - margin-left: 0; -} diff --git a/apps/wolnelektury_core/static/css/cite.css b/apps/wolnelektury_core/static/css/cite.css deleted file mode 100755 index d397da2ee..000000000 --- a/apps/wolnelektury_core/static/css/cite.css +++ /dev/null @@ -1,136 +0,0 @@ -.cite { - display: block; - color: black; - background: white; - padding: 3em 2em .1em 8em; -} -.book-wide-box .cite-body, -#tagged-object-list .cite-body - { - font-size: 1.8em; - line-height: 1.3em; -} -.book-wide-box .source, -#tagged-object-list .source -{ - color: #444; - font-size: 1.1em; - margin-top: 1.6em; -} -.cite .vip { - margin: 0; - color: #575C63; - font-size: 1.1em; -} - - - -#big-cite { - background-color: #444; - color: white; - padding: 0; - margin: 0; - background-image: url(/static/img/backdrop/book-drawer2.jpg); - background-size: 100%; - background-position: 50% 68%; - background-repeat: no-repeat; -} - -#big-cite .cite { - padding: 4.6em 4em 4.8em 0; - background: none; - color: white; -} - -#big-cite h2 { - margin: 0; - font-size: 1.1em; - color: #575c63; -} - - -#big-cite .cite-body { - margin: .05em .05em .05em 1em; -} -#big-cite .cite-body span { - font-size: 3em; - line-height: 1.16em; -} - -#big-cite .vip { - margin-left: 1em; - margin-top: .25em; -} - -#big-cite .vip span { - font-size:1.1em; -} - -#big-cite .cite-body span, -#big-cite .vip span, -#big-cite .source span -{ - color: white; - background-color: rgb(0, 0, 0); - background-color: rgba(0, 0, 0, 0.6); - /* For IE 5.5 - 7*/ - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000); - /* For IE 8*/ - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000)"; -} -/* a long cite displays smaller */ -#big-cite .cite-small .cite-body span { - font-size: 2em; -} - - -#big-cite .source { - margin: 1.6em 0.2em 1.6em 1em; -} -#big-cite .source span { - font-size: 1.2em; -} - - - - - -.cite blockquote p { - margin: 0; -} - -.cite blockquote { - padding: 0; - margin: 0; -} - -.book-wide-box .cite { - position: relative; - top: -1em; - right: -1em; - background-color: #f7f7f7; - vertical-align: middle; - width: 39.5em; - margin: 0; - padding: 1em; -} - - -.Fragment-item .fragment { - color: black; - display: block; -} -.Fragment-item .toggle { - font-size: 1.1em; - display:block; - padding: .5em 0; -} -.Fragment-item { - margin-bottom: 2em; - /* white-box */ - border: 1px solid #ddd; - background: #fff; - -moz-box-shadow: 2px 2px 2px #ddd; - -webkit-box-shadow: 2px 2px 2px #ddd; - box-shadow: 2px 2px 2px #ddd; -} diff --git a/apps/wolnelektury_core/static/css/core.css b/apps/wolnelektury_core/static/css/core.css deleted file mode 100644 index 514f8af3a..000000000 --- a/apps/wolnelektury_core/static/css/core.css +++ /dev/null @@ -1,3 +0,0 @@ -@import url(screen.css); -@import url(antiscreen.css) handheld; -@import url(antiscreen.css) only screen and (max-device-width:480px); diff --git a/apps/wolnelektury_core/static/css/dialogs.css b/apps/wolnelektury_core/static/css/dialogs.css deleted file mode 100755 index d83116ba6..000000000 --- a/apps/wolnelektury_core/static/css/dialogs.css +++ /dev/null @@ -1,117 +0,0 @@ -.cuteform { - font-size: 1.1em; -} -.cuteform ol, .cuteform ul { - padding: 0; - margin: 0; - list-style: none; - font-style: 1.1em; -} - -.cuteform ol li, .cuteform ul li { - margin-top: 0.7em; -} - -.cuteform label { - display: block; -} - -.cuteform span.help-text { - display: block; - font-size: 0.8em; - color: #999; -} - -.cuteform .error { - color: #BF3024; - display: block; -} -.cuteform .errorlist { - color: #BF3024; -} - - -.jqmOverlay { background-color: #000; } - - -.dialog-window { - position: absolute; - display: none; - background-color: transparent; - margin-top: -0.5em; - margin-left: 1em; - width: 20em; -} - -.dialog-window div.header { - font-size: 1.1em; - width: 4em; - background-color: #FFF; - border-right: 0.3em solid #DDD; - padding: 0.5em 1em 0.5em 1em; - right: 0; - left: auto; - float: right; - text-align: center; -} - - -.dialog-window div.target { - background-color: #FFF; - color: black; - border-right: 0.3em solid #DDD; - border-bottom: 0.3em solid #DDD; - padding: 1em; - clear: both; -} - -.dialog-window h1 { - font-size: 1.2em; -} - -.dialog-window textarea, .dialog-window input { - width: 100%; -} - -.hidelabels label { - display: block; - width: 1px; - height: 1px; - overflow:hidden; -} - - - -#login-window { - width: 26em; -} -#register-window { - width: 26em; -} -#context-login-window { - width: 26em; -} - -#suggest-window { - width: 26em; -} - -#suggest-window textarea { - height: 6em; -} - -#suggest-publishing-window { - width: 29em; -} - -#suggest-publishing-window textarea { - height: 3em; -} - -#custom-pdf-window { - width: 24em; -} - -#custom-pdf-window label { - display: inline; -} diff --git a/apps/wolnelektury_core/static/css/form.css b/apps/wolnelektury_core/static/css/form.css deleted file mode 100644 index 65d0482ef..000000000 --- a/apps/wolnelektury_core/static/css/form.css +++ /dev/null @@ -1 +0,0 @@ -form table th{vertical-align:top;text-align:left;font-weight:normal}form table td{padding-bottom:1em}form table .required th:after{content:" *"}form table .errorlist{color:red;margin:0;padding:0;list-style:none}form table .helptext{color:#888;font-size:.9em;font-style:italic} \ No newline at end of file diff --git a/apps/wolnelektury_core/static/css/form.scss b/apps/wolnelektury_core/static/css/form.scss deleted file mode 100644 index 42e867595..000000000 --- a/apps/wolnelektury_core/static/css/form.scss +++ /dev/null @@ -1,26 +0,0 @@ -form table { - th { - vertical-align: top; - text-align: left; - font-weight: normal; - } - td { - padding-bottom: 1em; - } - - .required th:after { - content: " *"; - } - - .errorlist { - color: red; - margin: 0; - padding: 0; - list-style: none; - } - .helptext { - color: #888; - font-size: .9em; - font-style: italic; - } -} diff --git a/apps/wolnelektury_core/static/css/header.css b/apps/wolnelektury_core/static/css/header.css deleted file mode 100755 index f1bd0df94..000000000 --- a/apps/wolnelektury_core/static/css/header.css +++ /dev/null @@ -1,251 +0,0 @@ -#header-bg { - z-index: -1; - background: #191919; - position: absolute; - width: 50%; - height: 9.4em; -} - -#header { - padding-bottom: 0; - color: #989898; - background: #191919; - position: relative; -} -#header a { - color: #17CFDB; -} - -#half-header { - padding-bottom: 0; -} - -#half-header-content { - background: #191919; - color: #989898; -} - -#logo a, #logo img { - display: block; -} - -#tagline { - margin-left: 1.5em; -} - -#tagline span { - font-size: 1.3em; - color: #bbb; -} - -#user-info { - margin: 0; -} - -#search-area { - margin: 0; - background: #444; - color: white; -} - -#search-field { - display: inline-block; - padding-left: .5em; - padding-top: 0.5em; - padding-bottom: 0; -} - -#search { - font-size: 1.3em; - padding: 0; - /*height: 3.3em; - width: 62.6em; - padding-left: .5em; - -webkit-border-radius: .5em; - -moz-border-radius: .5em; - border: none; - border-radius: .5em; - -webkit-box-shadow:0 0 .5em #444 inset; - -moz-box-shadow:0 0 .5em #444 inset; - box-shadow: 0 0 .5em #444 inset;*/ - height: 2.54em; - padding-left: 1em; - -webkit-border-radius: .38em; - -moz-border-radius: .38em; - border: none; - border-radius: .38em; - -webkit-box-shadow:0 0 .38em #444 inset; - -moz-box-shadow:0 0 .38em #444 inset; - box-shadow: 0 0 .5em #444 inset; - line-height: 2.5em; - - font-family: Georgia; - background-color: #fff; - color: #000; - z-index: 200; - position: relative; -} - -/* styling search placeholder */ - -#search:-webkit-input-placeholder -{ - font-family: Georgia; - font-style: italic; - color: #767676; -} - -#search.placeholder -{ - font-family: Georgia; - font-style: italic; - color: #767676; -} - -#search:-moz-placeholder -{ - font-family: Georgia; - font-style: italic; - color: #767676; -} - -#search-button { - display: inline-block; - background: #018189; - color: white; - padding: 0; - margin: 0; - width: 9.4em; -} -#search-button button { - font-size: 1em; - height: 4.5em; - border: none; - background: #018189; - color: white; - width: 100%; - padding: 0; -} - -#search-button button span { - font-size: 1.1em; - position:relative; -} - - -#nav-line { - background-color: #e2e2e2; - height: 4.9em; -} - -ul#menu { - list-style: none; - padding: 0; - margin: 0 0 0 .6em; -} - -li.menu { - background-color: #e2e2e2; - float: left; -} -a.menu { - display: block; - padding-left: 1.4em; - padding-right: 1.4em; - /* must match grid-line */ - height: 3.1em; - padding-top: 1.8em; - color: #0c7076; -} -#menu a.hidden-box-trigger:hover { - border-bottom: 3px solid white; - margin-bottom: -3px; -} -a.menu span { - font-size: 1.1em; -} - - -#lang-button { - color: #717171; -} -#lang-button:after { - padding-left: 1em; - content: url("/static/img/arrow-gray.png"); - vertical-align: middle; -} -#lang-menu { - position: relative; - float: right; - display: block; - padding-left: 2.5em; - padding-right: 2em; - /* must match grid-line */ - height: 3.3em; - padding-top: 1.6em; - background: #f7f7f7; -} -#lang-menu .lang-flag { - font-size: 1.3em; -} - -#lang-menu-items { - z-index: 9999; -} - -#lang-menu-items button { - display: none; - background: #f7f7f7; - color: #6f6f6f; - cursor: pointer; - width: 100%; - border: solid #ddd; - border-width: 0 0 1px 0; - padding: .5em 0; - margin: 0; - font-size: 1.3em; -} - -#lang-menu:hover button, -#lang-menu.hover button { - display: block; -} - -#lang-menu:hover #lang-menu-items, -#lang-menu.hover #lang-menu-items { - position: absolute; - width: 100%; - padding: 0; - left: 0; - /* must match grid-line height */ - top: 3.9em; -} - -#lang-menu .active { - color: #000; -} - -.search-hint-label { - display: inline-block; - width: 25em; - font-size: 1.1em; - line-height: 1.636em; -} - -.search-hint-category { - font-size: 1.1em; - line-height: 1.636em; - -} - - - -#user-menu { - left: 0; - top: 2em; - width: 15em; - line-height:1.6em; -} -#user-menu a { - color: #0D7E85; -} diff --git a/apps/wolnelektury_core/static/css/ie.css b/apps/wolnelektury_core/static/css/ie.css deleted file mode 100644 index ff6b41242..000000000 --- a/apps/wolnelektury_core/static/css/ie.css +++ /dev/null @@ -1,9 +0,0 @@ -#logo { - margin-top: 2.7em; - width: 17em; - height: 10em; - overflow: hidden; -} -#logo a { - padding-top: 3em; -} diff --git a/apps/wolnelektury_core/static/css/main/_tools.scss b/apps/wolnelektury_core/static/css/main/_tools.scss new file mode 100755 index 000000000..b3441eff7 --- /dev/null +++ b/apps/wolnelektury_core/static/css/main/_tools.scss @@ -0,0 +1,29 @@ +@mixin size-px($name, $size) { + #{$name}: $size + px; + #{$name}: ($size / 16) + rem; +} + +@mixin mono { + font-family: "Andale Mono", "Lucida Sans Typewriter", "Courier New"; +} + +@mixin hidden-label { + display: block; + width: 1px; + height: 1px; + overflow:hidden; +} + +@mixin white-box { + border-color: #ddd; + border-style: solid; + @include size-px(border-width, 1); + background: #fff; + + -moz-box-shadow: 2px 2px 2px #ddd; + -webkit-box-shadow: 2px 2px 2px #ddd; + box-shadow: 2px 2px 2px #ddd; + -moz-box-shadow: .125rem .125rem .125rem #ddd; + -webkit-box-shadow: .125rem .125rem .125rem #ddd; + box-shadow: .125rem .125rem .125rem #ddd; +} diff --git a/apps/wolnelektury_core/static/css/main/auth.scss b/apps/wolnelektury_core/static/css/main/auth.scss new file mode 100755 index 000000000..8a88e12bb --- /dev/null +++ b/apps/wolnelektury_core/static/css/main/auth.scss @@ -0,0 +1,48 @@ +@import "tools"; + +.email_list { + .verified { + display: inline-block; + margin-left: 2em; + font-style: italic; + } + .unverified { + display: inline-block; + margin-left: 2em; + color: #717171; + font-style: italic; + } + .primary { + display: inline-block; + margin-left: 2em; + font-weight: bold; + } +} + +.socialaccount_provider { + display: inline-block; + background-repeat: no-repeat; + color: transparent; + + @include size-px(height, 40); + @include size-px(width, 40); + vertical-align: middle; + + &.google { + background-image: url(/static/img/auth/google.png); + } +} + + +.socialaccount_providers { + margin: 0; + @include size-px(margin-top, 10); + @include size-px(margin-bottom, 10); + padding: 0; + + li { + display: inline; + list-style: none; + @include size-px(margin-right, 10); + } +} diff --git a/apps/wolnelektury_core/static/css/main/base.scss b/apps/wolnelektury_core/static/css/main/base.scss new file mode 100755 index 000000000..0926569fc --- /dev/null +++ b/apps/wolnelektury_core/static/css/main/base.scss @@ -0,0 +1,104 @@ +@import "tools"; + + +/* Basic layout */ +html, body { + margin: 0; + padding: 0; +} + + +.clearboth { + clear: both; +} + + + +/* Basic colors and fonts */ +body { + font-family: Georgia; + background: #f7f7f7; + color: black; + + @include size-px(font-size, 13); +} + +a { + color: #0d7e85; + text-decoration: none; + + img { + border: 0; + } +} + +h1 { + @include size-px(font-size, 35); + font-weight: normal; + @include size-px(margin-top, 14); + + a { + color: inherit; + } +} + +h2 { + @include size-px(font-size, 20); + font-weight: normal; +} + +h3 { + @include size-px(font-size, 15); + font-weight: normal; +} + + +.normal-text { + line-height: 1.3em; +} + +.white-box { + @include size-px(padding, 10); + @include white-box; +} + + +ul.plain { + list-style:none; + margin: 0; + padding: 0; +} + + +.theme-list-link { + @include mono; + @include size-px(font-size, 11); + + &:after { + @include size-px(padding-left, 11); + content: url("/static/img/arrow-teal.png"); + vertical-align: middle; + } +} + + +.left-column, .right-column { + @include size-px(max-width, 600); +} +@media screen and (min-width: 62.5em) { + .left-column { + @include size-px(width, 470); + float: left; + } + .right-column { + @include size-px(width, 470); + float:right; + } +} + +.pagination { + display: block; + @include size-px(font-size, 12); + @include size-px(padding, 6); + text-align:center; +} diff --git a/apps/wolnelektury_core/static/css/main/book_box.scss b/apps/wolnelektury_core/static/css/main/book_box.scss new file mode 100755 index 000000000..02de7a230 --- /dev/null +++ b/apps/wolnelektury_core/static/css/main/book_box.scss @@ -0,0 +1,455 @@ +@import "tools"; + +@mixin inner-box { + display: block; + color: black; + @include size-px(margin, 1); + @include size-px(padding-top, 8); + @include size-px(padding-bottom, 8); + @include size-px(padding-left, 10); + @include size-px(padding-right, 10); + + @include white-box; +} + +.book-mini-box img.cover { + @include size-px(height, 193); + @include size-px(width, 139); +} + + +.cover-area { + float: left; + @include size-px(margin-right, 15); + @include size-px(margin-bottom, 5); + + + @media screen and (min-width: 32em) { + position: absolute; + top: 0; + left: 0; + margin-right: 0; + } + + img.cover { + @include size-px(height, 193 / 2); + @include size-px(width, 139 / 2); + + @media screen and (min-width: 20em) { + @include size-px(height, 193); + @include size-px(width, 139); + } + } +} + +.book-mini-box { + @include size-px(width, 161.5); + display: inline-block; + vertical-align: top; + + a { + @include inner-box; + @include size-px(height, 271); + @include size-px(margin, 1); + overflow: hidden; + } + img.cover { + @include size-px(margin-bottom, 18); + } + .desc { + margin-left: 0; + } + .author { + @include size-px(font-size, 11); + @include mono; + color: #6d7877; + display: block; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + .title { + @include size-px(font-size, 14); + color: #242424; + } +} + + + +.work-list { + margin: 0; + padding: 0; + list-style: none; + + .Book-item { + @media screen and (min-width: 32em) { + display: inline-block; + } + vertical-align: top; + } +} + + +.book-box { + margin: 0; + vertical-align: top; + + @media screen and (min-width: 32em) { + @include size-px(width, 487.5); + } + + .book-box-inner { + position: relative; + @include inner-box; + @include size-px(min-height, 197.5); + } +} + + +.book-wide-box { + margin: 0; + vertical-align: top; + + @media screen and (min-width: 62.5em) { + @include size-px(width, 975); + } + + .book-box-inner { + position: relative; + @include size-px(min-height, 244); + @include inner-box; + @include size-px(margin-left, 0); + @include size-px(margin-right, 0); + + .book-left-column { /* FIXME */ + @include size-px(max-width, 600); + + @media screen and (min-width: 62.5em) { + float: left; + @include size-px(width, 536); + } + } + + .license-icon { + display: block; + @include size-px(margin-top, 5); + } + + @media screen and (min-width: 62.5em) { + .book-box-head, + .tags, + .book-box-tools { + @include size-px(width, 382); + } + } + + #theme-list-wrapper { + @include size-px(margin-left, 154); + margin-bottom: 0; + @include size-px(width, 300); + + p { + @include size-px(margin-top, 10); + @include size-px(margin-bottom, 10); + } + } + + .right-column { + @include size-px(margin-top, 16); + + @media screen and (min-width: 62.5em) { + @include size-px(width, 415); + // Eat the padding + @include size-px(margin-top, -8); + @include size-px(margin-right, -10); + } + + .other-tools, + .other-download { + float: left; + @include size-px(width, 145); + @include size-px(margin-top, 50); + @include size-px(margin-bottom, 0); + @include size-px(margin-left, 5); + @include size-px(margin-right, 0); + @include size-px(font-size, 11); + + h2 { + margin: 0; + @include size-px(font-size, 11); + @include mono; + } + } + .other-download { + @include size-px(margin-left, 15); + @include size-px(width, 220); + } + } + } +} + + +.book-box-body { + margin-bottom: 1em; + @media screen and (min-width: 32em) { + margin-bottom: 0; + @include size-px(height, 170); + } + position: relative; + + .book-box-head { + @include size-px(padding-top, 14); + @include size-px(margin-bottom, 10); + + @media screen and (min-width: 32em) { + @include size-px(min-height, 70); + @include size-px(width, 310); + float: right; + } + + a { + color: black; + } + .author { + @include size-px(font-size, 11); + @include mono; + line-height: 1.2em; + max-height: 2.4em; + overflow: hidden; + + @media screen and (min-width: 32em) { + @include size-px(max-width, 264); + } + } + .title { + @include size-px(font-size, 24); + line-height: 1.2em; + @include size-px(margin-top, 7.2); + margin-bottom: .5em; + + @media screen and (min-width: 32em) { + margin-bottom: 0; + height: 2.4em; + overflow: hidden; + } + } + } + + .tags { + @include size-px(font-size, 11); + line-height: 1.2em; + + @media screen and (min-width: 32em) { + @include size-px(width, 310); + float: right; + clear: right; + max-height: 4.8em; + overflow: hidden; + } + + .category { + display: block; + margin-top: .5em; + margin-bottom: .5em; + + @media screen and (min-width: 32em) { + display: inline; + } + + .mono { + @include mono; + } + + .book-box-tag { + @include size-px(margin-left, 4.4); + @include size-px(margin-right, 5.5); + } + } + } + +} + + + +.book-box-tools { + @include size-px(font-size, 11); + margin: 0; + padding: 0; + list-style: none; + + clear: left; + + @media screen and (min-width: 20em) { + clear: none; + @include size-px(margin-left, 139 + 15); + } + + @media screen and (min-width: 32em) { + @include size-px(width, 310); + float: right; + clear: right; + } + + li { + @include mono; + + @media screen and (min-width: 32em) { + display: inline-block; + } + } + + .book-box-read { + @media screen and (min-width: 32em) { + @include size-px(width, 126.5); + } + + a { + @include mono; + } + + a:before { + content: url("/static/img/read.png"); + @include size-px(font-size, 25); + @include size-px(margin-right, 3.71); + vertical-align: middle; + font-weight: normal; + } + } + + .book-box-download { + position: relative; + + @media screen and (min-width: 32em) { + @include size-px(width, 93.5); + } + + a { + position: relative; + z-index: 101; + + &.downarrow { + color: black; + + @media screen and (min-width: 32em) { + color: #0D7E85; + } + + &:before { + content: url("/static/img/download.png"); + @include size-px(font-size, 25); + @include size-px(margin-right, 3.71); + vertical-align: middle; + font-weight: normal; + } + } + } + + .book-box-formats { + @include size-px(padding-left, 25); + + @media screen and (min-width: 32em) { + display: none; + position: absolute; + + @include size-px(width, 180); + @include size-px(padding-top, 38); + @include size-px(padding-bottom, 9); + @include size-px(padding-left, 19); + @include size-px(padding-right, 19); + + @include white-box; + + z-index: 100; + + @include size-px(top, -16); + @include size-px(left, -19); + } + + span { + display: block; + @include size-px(margin-top, 16); + + @media screen and (min-width: 32em) { + @include size-px(margin-top, 0); + + &:first-child { + @include size-px(margin-top, 16); + } + } + } + } + + &:hover .book-box-formats, + &.hover .book-box-formats { + display: block; + } + } + + .book-box-audiobook { + @media screen and (min-width: 32em) { + @include size-px(width, 77); + } + + a:before { + content: url("/static/img/listen.png"); + @include size-px(font-size, 25); + @include size-px(margin-right, 3.71); + vertical-align: middle; + font-weight: normal; + } + + } +} + + + + +.star { + @include size-px(font-size, 22.5); + @include size-px(margin-right, 11.25); + position: absolute; + right: 0; + + button::-moz-focus-inner { + padding: 0; + border: 0 + } + .if-unlike button { + font-size: 1em; + font-family: inherit; + border: 0; + background: none; + margin: 0; + padding: 0; + color: #757575; + } + .if-like a { + display:block; + text-align:right; + padding: 0; + } +} +.like .if-unlike { + display: none; +} +.unlike .if-like { + display: none; +} + + +#book-detail .see-also { + h1 { + @include size-px(height, 32); + margin: 0; + @include size-px(padding-top, 19); + @include size-px(padding-left, 10); + + @include size-px(font-size, 11); + @include mono; + font-weight: normal; + + @media screen and (min-width: 33em) { + @include size-px(padding-left, 19); + } + } +} diff --git a/apps/wolnelektury_core/static/css/main/book_list.scss b/apps/wolnelektury_core/static/css/main/book_list.scss new file mode 100755 index 000000000..fc2c1343b --- /dev/null +++ b/apps/wolnelektury_core/static/css/main/book_list.scss @@ -0,0 +1,102 @@ +/* listing of all books */ + +@import "tools"; + +#book-a-list { + #book-list-nav { + @include size-px(border-width, 0); + @include size-px(border-bottom-width, 1); + border-style: solid; + border-color: #CFCFCF; + @include size-px(padding, 9.75); + line-height: 2em; + + @media screen and (min-width: 30em) { + @include size-px(border-bottom-width, 0); + @include size-px(border-left-width, 1); + float: right; + width: 50%; + } + + @media screen and (min-width: 62.5em) { + line-height: 1.3em; + } + + h2 { + cursor: pointer; + + &:after { + @include size-px(padding-left, 10); + content: url("/static/img/arrow-gray.png"); + vertical-align: top; + } + + @media screen and (min-width: 30em) { + font-size: 1em; + margin: 0; + cursor: regular; + + &:after { + display: none; + } + } + } + + #book-list-nav-index { + display: none; + @media screen and (min-width: 30em) { + display: block !important; + } + } + + ul { + list-style-type: none; + @include size-px(margin, 5); + padding: 0; + } + .book-list-show-index { + display: none; + } + } + + #book-list { + @include size-px(padding-left, 5); + line-height: 2em; + + @media screen and (min-width: 62.5em) { + @include size-px(padding-left, 50); + line-height: 1.3em; + } + + ol { + @include size-px(padding-left, 13); + @include size-px(margin-top, 4); + @include size-px(margin-bottom, 15.6); + @include size-px(margin-left, 0); + @include size-px(margin-right, 0); + list-style: none; + } + h2 { + @include size-px(font-size, 13); + margin: 0; + a { + color: black; + } + } + } + + #book-list-up { + display: block; + position: fixed; + @include size-px(bottom, 50); + @include size-px(right, 50); + @include size-px(border-left-width, 1); + border-left-style: solid; + border-left-color: #CFCFCF; + @include size-px(padding-top, 20); + @include size-px(padding-bottom, 20); + @include size-px(padding-left, 10); + @include size-px(padding-right, 10); + background-color: white; + } +} diff --git a/apps/wolnelektury_core/static/css/main/catalogue.scss b/apps/wolnelektury_core/static/css/main/catalogue.scss new file mode 100755 index 000000000..4a08b4657 --- /dev/null +++ b/apps/wolnelektury_core/static/css/main/catalogue.scss @@ -0,0 +1,31 @@ +/* listing of all books */ + +@import "tools"; + +.catalogue-catalogue { + ul { + column-width: 25em; + -moz-column-width: 25em; + -webkit-column-width: 25em; + + @include size-px(padding-left, 10); + + @media screen and (min-width: 20em) { + @include size-px(padding-left, 40); + } + + li { + margin-bottom: 1em; + + @media screen and (min-width: 62.5em) { + margin-bottom: .5em; + } + } + } + + h2 { + @include size-px(font-size, 26); + margin: 0; + @include size-px(padding, 26); + } +} diff --git a/apps/wolnelektury_core/static/css/main/cite.scss b/apps/wolnelektury_core/static/css/main/cite.scss new file mode 100755 index 000000000..d15faaaa9 --- /dev/null +++ b/apps/wolnelektury_core/static/css/main/cite.scss @@ -0,0 +1,50 @@ +@import "tools"; + +.cite { + display: block; + color: black; + background: white; + @include size-px(padding-top, 30); + @include size-px(padding-bottom, 1); + @include size-px(padding-left, 80); + @include size-px(padding-right, 20); + + .vip { + margin: 0; + color: #575C63; + @include size-px(font-size, 11); + } + + .cite-body { + @include size-px(font-size, 18); + line-height: 1.3em; + } + + blockquote { + padding: 0; + margin: 0; + + p { + margin: 0; + } + } + + .source + { + color: #444; + @include mono; + @include size-px(font-size, 11); + @include size-px(margin-top, 16); + } +} + + + + +.book-wide-box .cite { + background-color: #f7f7f7; + vertical-align: middle; + @include size-px(width, 395); + margin: 0; + @include size-px(padding, 10); +} diff --git a/apps/wolnelektury_core/static/css/main/dialogs.scss b/apps/wolnelektury_core/static/css/main/dialogs.scss new file mode 100755 index 000000000..a5316774a --- /dev/null +++ b/apps/wolnelektury_core/static/css/main/dialogs.scss @@ -0,0 +1,140 @@ +@import "tools"; + +.dialog-window { + position: absolute; + display: none; + background-color: transparent; + @include size-px(margin-top, -5); + @include size-px(margin-left, 10); + @include size-px(width, 200); + + @media screen and (max-width: 29.999999em) { + left: 0 !important; + right: 0; + @include size-px(margin-left, 0); + width: auto; + } + + div.header { + @include mono; + @include size-px(font-size, 11); + width: 4em; + background-color: #FFF; + padding: 1em; + right: 0; + left: auto; + float: right; + text-align: center; + + @media screen and (min-width: 30em) { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-right: 0.3em solid #DDD; + } + } + + div.target { + background-color: #FFF; + color: black; + border-bottom: 0.3em solid #DDD; + padding: 1em 10px; + clear: both; + + @media screen and (min-width: 30em) { + border-right: 0.3em solid #DDD; + padding-left: 1em; + padding-right: 1em; + } + } + + h1 { + @include size-px(font-size, 12); + font-weight: normal; + margin-top: .4em; + } + + textarea, input { + width: 100%; + } +} + + + + + + + +.cuteform { + @include size-px(font-size, 11); + + ol, ul { + padding: 0; + margin: 0; + list-style: none; + @include size-px(font-size, 11); + + li { + margin-top: 0.7em; + } + } + + label { + display: block; + } + + span.help-text { + display: block; + font-size: 0.8em; + color: #999; + } + + .error { + color: #BF3024; + display: block; + } + + .errorlist { + color: #BF3024; + } +} + + +.jqmOverlay { background-color: #000; } + + + +.hidelabels label { + @include hidden-label; +} + + +@media screen and (min-width: 30em) { + #login-window { + @include size-px(width, 260); + } + #register-window { + width: 26em; + } + #context-login-window { + width: 26em; + } + #suggest-window { + width: 26em; + } + #suggest-publishing-window { + width: 29em; + } + #custom-pdf-window { + width: 24em; + } +} + +#suggest-window textarea { + height: 6em; +} +#suggest-publishing-window textarea { + height: 3em; +} +#custom-pdf-window label { + display: inline; +} diff --git a/apps/wolnelektury_core/static/css/main/footer.scss b/apps/wolnelektury_core/static/css/main/footer.scss new file mode 100755 index 000000000..cc37b13da --- /dev/null +++ b/apps/wolnelektury_core/static/css/main/footer.scss @@ -0,0 +1,30 @@ +@import "tools"; + +#footer-wrapper { + @include size-px(margin-top, 50); + @include size-px(padding-top, 30); + background: #fff; + color: #767676; + border-top-style: solid; + border-top-color: #ddd; + @include size-px(border-top-width, 1); +} + +footer#main { + @include size-px(font-size, 10); + @include size-px(margin-left, 5); + @include size-px(margin-right, 5); + + @media screen and (min-width: 62.5em) { + @include size-px(width, 975); + margin: auto; + } + + p { + @include size-px(margin-top, 2.5); + @include size-px(margin-bottom, 2.5); + margin-left: 0; + margin-right: 0; + } +} + diff --git a/apps/wolnelektury_core/static/css/main/form.scss b/apps/wolnelektury_core/static/css/main/form.scss new file mode 100755 index 000000000..42e867595 --- /dev/null +++ b/apps/wolnelektury_core/static/css/main/form.scss @@ -0,0 +1,26 @@ +form table { + th { + vertical-align: top; + text-align: left; + font-weight: normal; + } + td { + padding-bottom: 1em; + } + + .required th:after { + content: " *"; + } + + .errorlist { + color: red; + margin: 0; + padding: 0; + list-style: none; + } + .helptext { + color: #888; + font-size: .9em; + font-style: italic; + } +} diff --git a/apps/wolnelektury_core/static/css/main/fragment.scss b/apps/wolnelektury_core/static/css/main/fragment.scss new file mode 100755 index 000000000..f82d50a4e --- /dev/null +++ b/apps/wolnelektury_core/static/css/main/fragment.scss @@ -0,0 +1,19 @@ +@import "tools"; + +.Fragment-item { + @include size-px(margin-bottom, 20); + @include white-box; + + .fragment { + color: black; + display: block; + } + .toggle { + @include size-px(font-size, 11); + display: block; + @include size-px(padding-top, 5); + @include size-px(padding-bottom, 5); + @include size-px(padding-left, 0); + @include size-px(padding-right, 0); + } +} diff --git a/apps/wolnelektury_core/static/css/main/header.scss b/apps/wolnelektury_core/static/css/main/header.scss new file mode 100755 index 000000000..3bf6fcea3 --- /dev/null +++ b/apps/wolnelektury_core/static/css/main/header.scss @@ -0,0 +1,217 @@ +@import "tools"; + +$header_bg: #191919; + + +#header-wrapper { + position: relative; + + /* Upper-half both sides dark background */ + &:before { + content: " "; + display: block; + z-index: -1; + position: absolute; + top: 0; + @include size-px(bottom, 45); + left: 0; + width: 100%; + background-color: $header_bg; + } + + /* Left-side dark background */ + &:after { + content: " "; + display: block; + z-index: -1; + position: absolute; + top: 0; + bottom: 0; + left: 0; + width: 50%; + background-color: $header_bg; + } +} + + +header#main { + @include size-px(line-height, 20); /* Make links easier to click when wrapped. */ + background-color: $header_bg; + color: #bbb; + + @media screen and (min-width: 62.5em) { + position: relative; + @include size-px(height, 94); + @include size-px(width, 975); + margin: auto; + } + + a { + color: #17CFDB; + } + + #logo { + display: block; + @include size-px(height, 94); + @include size-px(width, 94); + + @media screen and (min-width: 24em) { + float: left; + } + + img { + display: block; + } + } + + #tagline { + margin-top: 0; + @include size-px(margin-left, 5); + @include size-px(margin-right, 5); + padding-top: 0; + @include size-px(font-size, 11); + + @media screen and (min-width: 24em) { + @include size-px(padding-top, 6); + @include size-px(font-size, 13); + text-align: right; + } + + @media screen and (min-width: 62.5em) { + position: absolute; + @include size-px(top, 10); + @include size-px(left, 255); + @include size-px(margin-left, 0); + } + } + + #user-info { + margin-top: 0; + @include size-px(margin-left, 5); + @include size-px(margin-right, 5); + padding-top: 0; + @include mono; + @include size-px(font-size, 10); + position: relative; + + @media screen and (min-width: 24em) { + @include size-px(padding-top, 15); + text-align: right; + } + @media screen and (min-width: 62.5em) { + position: absolute; + top: 0; + right: 0; + @include size-px(margin-left, 0); + @include size-px(margin-right, 0); + } + + /* We want submenu on far left on small screens. */ + .hidden-box-wrapper { + position: static; + @media screen and (min-width: 24em) { + position: relative; + } + } + + #user-menu { + display: none; + + text-align: left; + line-height:1.6em; + left: 0; + right: 0; + top: 2em; + + @media screen and (min-width: 15em) { + right: auto; + width: 15em; + } + + a { + color: #0D7E85; + } + } + } + + form#search-area { + position: relative; + clear: both; + @include size-px(height, 45); + background: #444444; + color: white; + + @media screen and (min-width: 62.5em) { + position: absolute; + @include size-px(top, 49); + @include size-px(left, 240); + @include size-px(right, 0); + } + + #search-field { + position: absolute; + @include size-px(top, 5); + @include size-px(left, 5); + @include size-px(right, 113); + + label { + @include hidden-label; + } + input#search { + z-index: 200; + position: relative; + @include size-px(height, 33); + width: 100%; + padding: 0; + @include size-px(padding-left, 13); + @include size-px(line-height, 32.5); + + border: none; + @include size-px(border-radius, 5); + box-shadow: 0 0 0.5em #444444 inset; + + font-family: Georgia; + @include size-px(font-size, 13); + background-color: white; + color: black; + + /* styling search placeholder */ + &::placeholder + { + font-family: Georgia; + font-style: italic; + color: #767676; + } + &::-webkit-input-placeholder + { + font-family: Georgia; + font-style: italic; + color: #767676; + } + &::-moz-placeholder + { + font-family: Georgia; + font-style: italic; + color: #767676; + } + } + } + button { + display: inline-block; + position: absolute; + top: 0; + right: 0; + @include size-px(height, 45); + @include size-px(width, 94); + margin: 0; + padding: 0; + + border: none; + + @include mono; + @include size-px(font-size, 11); + background: #018189; + color: white; + } + } +} diff --git a/apps/wolnelektury_core/static/css/main/hidden.scss b/apps/wolnelektury_core/static/css/main/hidden.scss new file mode 100755 index 000000000..a5596882d --- /dev/null +++ b/apps/wolnelektury_core/static/css/main/hidden.scss @@ -0,0 +1,55 @@ +@import "tools"; + +.hidden-box-wrapper { + position: relative; + + .hidden-box { + position: absolute; + left: 0; + display: none; + padding: 1em 1em .5em 1em; + @include white-box; + + z-index: 500; + + ul { + list-style: none; + padding: 0; + margin: 0; + @include size-px(font-size, 11); + + @include size-px(column-width, 132); + @include size-px(-moz-column-width, 132); + @include size-px(-webkit-column-width, 132); + + @media screen and (min-width: 24em) { + @include size-px(width, 320); + } + + @media screen and (min-width: 34em) { + @include size-px(width, 480); + } + + @media screen and (min-width: 62.5em) { + @include size-px(width, 528); + } + + + + li { + margin-bottom: 1em; + + @media screen and (min-width: 62.5em) { + margin-bottom: .5em; + } + } + } + } +} + +@media screen and (min-width: 24em) { + #menu-collections ul { + @include size-px(width, 180); + } +} + diff --git a/apps/wolnelektury_core/static/css/main/main_content.scss b/apps/wolnelektury_core/static/css/main/main_content.scss new file mode 100755 index 000000000..7d1aad43b --- /dev/null +++ b/apps/wolnelektury_core/static/css/main/main_content.scss @@ -0,0 +1,10 @@ +@import "tools"; + +#main-content { + position: relative; + + @media screen and (min-width: 62.5em) { + @include size-px(width, 975); + margin: auto; + } +} diff --git a/apps/wolnelektury_core/static/css/main/main_page.scss b/apps/wolnelektury_core/static/css/main/main_page.scss new file mode 100755 index 000000000..6f45bf67a --- /dev/null +++ b/apps/wolnelektury_core/static/css/main/main_page.scss @@ -0,0 +1,272 @@ +@import "tools"; + +#big-cite { + background-color: #444; + color: white; + padding: 0; + margin: 0; + background-size: 100%; + background-position: 50% 68%; + background-repeat: repeat-y; + + background-image: url(/static/img/backdrop/book-drawer2.jpg); + + @media screen and (min-width: 62.5em) { + background-image: url(/static/img/backdrop/book-drawer2.jpg); + } + + .cite { + @include size-px(padding-top, 46); + @include size-px(padding-bottom, 48); + @include size-px(padding-left, 0); + @include size-px(padding-right, 10); + background: none; + color: white; + + @media screen and (min-width: 30em) { + @include size-px(padding-right, 40); + } + + .vip { + @include size-px(margin-left, 10); + @include size-px(margin-top, 2.5); + @include size-px(margin-bottom, 5); + @include size-px(font-size, 11); + + @media screen and (min-width: 16em) { + padding-left: 10%; + @include size-px(margin-left, -18); + } + + @media screen and (min-width: 62.5em) { + float: left; + padding-left: 0; + @include size-px(margin-left, 16); + text-align: right; + @include size-px(width, 147); + } + } + + .cite-body { + @include size-px(margin, .5); + @include size-px(font-size, 20); + line-height: 1.16em; + + @media screen and (min-width: 30em) { + @include size-px(font-size, 30); + } + } + + .source { + @include size-px(margin-top, 16); + @include size-px(margin-bottom, 16); + @include size-px(margin-right, 2); + @include size-px(font-size, 12); + } + + /* Make cite body and source slide to the left. */ + .cite-body, .source { + @include size-px(margin-left, 10); + + @media screen and (min-width: 16em) { + padding-left: 21.9%; + @include size-px(margin-left, -38); + } + + @media screen and (min-width: 62.5em) { + padding-left: 0; + @include size-px(margin-left, 175); + } + } + + /* Semi-transparent background. */ + .cite-body span, + .vip span, + .source span { + color: white; + background-color: rgb(0, 0, 0); + background-color: rgba(0, 0, 0, 0.6); + /* For IE 5.5 - 7*/ + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000); + /* For IE 8*/ + -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000)"; + } + } + + /* a long cite displays smaller */ + .cite-small .cite-body { + @include size-px(font-size, 16); + @media screen and (min-width: 30em) { + @include size-px(font-size, 20); + } + } + + h2 { + margin: 0; + @include size-px(font-size, 11); + color: #575c63; + } +} + + +#promo-box { + @include size-px(margin-top, 16); + + @media screen and (min-width: 33em) { + float: right; + @include size-px(margin-top, -51); + @include size-px(width, 320); + } + + h1 { + @include size-px(padding-top, 20); + @include size-px(height, 31); + margin: 0; + padding-bottom: 0; + @include size-px(padding-left, 10); + @include size-px(padding-right, 5); + background: #191919; + color: white; + @include mono; + @include size-px(font-size, 13); + font-weight: normal; + + @media screen and (min-width: 33em) { + @include size-px(padding-left, 25); + @include size-px(padding-right, 25); + } + } + + #promo-box-body { + @include size-px(padding-top, 20); + @include size-px(padding-bottom, 20); + @include size-px(padding-left, 5); + @include size-px(padding-right, 5); + border-bottom-style: solid; + border-bottom-color: #efefef; + @include size-px(border-bottom-width, 2); + background: #efefef; + + @media screen and (min-width: 33em) { + @include size-px(padding-left, 28); + @include size-px(padding-right, 28); + } + + @media screen and (min-width: 62.5em) { + @include size-px(height, 300); + } + + a { + display: block; + color: #6c6c6c; + } + p { + margin-top: 0; + @include size-px(font-size, 12); + line-height: 1.55em; + color: #6c6c6c; + } + h2, h3 { + color: #0d777e; + @include size-px(font-size, 11); + @include size-px(height, 27.5); + margin: 0; + @include mono; + font-weight: normal; + + &:after { + content: " >"; + } + } + } +} + + +#main-last { + h1 { + @include size-px(height, 32); + margin: 0; + @include size-px(padding-top, 19); + @include size-px(padding-left, 10); + + @include size-px(font-size, 11); + @include mono; + font-weight: normal; + + @media screen and (min-width: 33em) { + @include size-px(padding-left, 19); + } + + a { + color: black; + + &:after { + content: " >"; + } + } + } + .book-mini-box:nth-child(3) { + @media screen and (min-width: 30em) { + margin-right: 3em; + } + @media screen and (min-width: 33em) { + margin-right: 0; + } + } +} + + +.infopages-box { + margin: 0; + @include size-px(margin-top, 5); + padding-top: 0; + padding-bottom: 0; + @include size-px(padding-left, 5); + @include size-px(padding-right, 5); + vertical-align: top; + color: #989898; + + @media screen and (min-width: 20em) { + display: inline-block; + @include size-px(width, 206); + @include size-px(padding-left, 17); + @include size-px(padding-right, 17); + } + + h1 { + @include size-px(height, 28); + margin: 0; + @include size-px(padding-top, 25); + @include size-px(font-size, 11); + color: #017e85; + font-weight: normal; + @include mono; + } + + a { + color: black; + } + + ol, ul { + @include size-px(font-size, 11); + list-style: none; + padding: 0; + margin: 0; + line-height: 1.45em; + + li { + @include size-px(margin-bottom, 8); + @media screen and (min-width: 62.5em) { + @include size-px(margin-bottom, 2.5); + } + } + } + + .social-links { + @include size-px(margin-top, 10); + + a { + @include size-px(margin-right, 6); + } + } +} diff --git a/apps/wolnelektury_core/static/css/main/menu.scss b/apps/wolnelektury_core/static/css/main/menu.scss new file mode 100755 index 000000000..496b805e9 --- /dev/null +++ b/apps/wolnelektury_core/static/css/main/menu.scss @@ -0,0 +1,194 @@ +@import "tools"; + +#nav-line { + background-color: #e2e2e2; + position: relative; + + @media screen and (min-width: 62.5em) { + @include size-px(width, 975); + margin: auto; + } + + #show-menu { + display: block; + float: left; + @include size-px(line-height, 13); + @include size-px(padding-top, 18); + @include size-px(padding-bottom, 18); + @include size-px(padding-left, 13); + @include size-px(padding-right, 13); + color: #0c7076; + @include size-px(font-size, 11); + @include mono; + + .long { + display: none; + + &:after { + @include size-px(padding-left, 10); + content: url("/static/img/arrow-gray.png"); + vertical-align: top; + } + } + + @media screen and (min-width: 20em) { + .long { display: inline; } + .short { display: none; } + } + + @media screen and (min-width: 53em) { + display: none; + } + } + + ul#menu { + list-style: none; + padding: 0; + margin: 0; + + display: none; + position: absolute; + top: 49px; + left: 0; + right: 10px; + z-index: 400; + + @media screen and (min-width: 24em) { + right: auto; + } + + @media screen and (min-width: 53em) { + display: block !important; + position: static; + @include size-px(margin-left, 6); + } + + li.menu { + background-color: #e2e2e2; + + @media screen and (min-width: 53em) { + float: left; + } + + a.menu { + display: block; + @include size-px(line-height, 13); + @include size-px(padding-top, 18); + @include size-px(padding-bottom, 15); + + @include size-px(border-bottom-width, 3); + border-bottom-style: solid; + border-bottom-color: #e2e2e2; + + @include size-px(padding-left, 13); + @include size-px(padding-right, 13); + color: #0c7076; + @include size-px(font-size, 11); + @include mono; + } + + a.hidden-box-trigger:hover { + border-bottom-color: white; + } + } + } + + #lang-menu { + display: block; + float: right; + + @include size-px(padding-left, 25); + @include size-px(padding-right, 20); + background: #f7f7f7; + @include mono; + + @media screen and (min-width: 15em) { + position: relative; + } + + #lang-button { + display:block; + @include size-px(line-height, 17); + @include size-px(padding-top, 16); + @include size-px(padding-bottom, 16); + + @include size-px(font-size, 10); + color: #717171; + + .label { + display: none; + + @media screen and (min-width: 62.5em) { + display: inline; + } + + &:after { + @include size-px(padding-left, 10); + content: url("/static/img/arrow-gray.png"); + vertical-align: top; + } + } + + .lang-flag { + @include size-px(font-size, 13); + @include size-px(line-height, 15); + } + } + + #lang-menu-items { + z-index: 9999; + + button { + @include mono; + display: none; + background: #f7f7f7; + color: #6f6f6f; + cursor: pointer; + width: 100%; + margin: 0; + padding: 0; + + @include size-px(padding-top, 10); + @include size-px(padding-bottom, 10); + + @media screen and (min-width: 62.5em) { + @include size-px(padding-top, 5); + @include size-px(padding-bottom, 5); + } + + border-style: solid; + border-color: #ddd; + border-width: 0; + @include size-px(border-bottom-width, 1); + + @include size-px(font-size, 13); + + &.active { + color: #000; + } + } + } + + &:hover, &.hover { + #lang-menu-items { + position: absolute; + padding: 0; + left: 0; + right: 0; + + @media screen and (min-width: 15em) { + left: auto; + @include size-px(width, 180); + @include size-px(top, 49); + } + @media screen and (min-width: 62.5em) { + width: 100%; + } + + button { + display: block; + } + } + } + } +} diff --git a/apps/wolnelektury_core/static/css/main/search.scss b/apps/wolnelektury_core/static/css/main/search.scss new file mode 100755 index 000000000..2b96361b0 --- /dev/null +++ b/apps/wolnelektury_core/static/css/main/search.scss @@ -0,0 +1,90 @@ +@import "tools"; + +/* jquery UI overrides us */ +.ui-menu .ui-menu-item a { + color: #0d7e85 !important; + line-height: 1.636em !important; +} + +.ui-widget { + font-family: Georgia !important; + font-size: 10px !important; + font-size: .625rem !important; +} + +.ui-widget-content { + background: #EEEEEE !important; /* #E2E2E2 ? */ + border-radius: 0px !important; +} + + + +.inline-tag-lists p span:first-child { + color: #281d1c; +} + +/* just on search page */ +.top-tag-list { + @include size-px(margin-top, 22); + @include size-px(margin-bottom, 16); +} + + +.search-result { + @include size-px(width, 975); + + .book-box-body { + @include size-px(width, 310); + } +} + + + +.book-list-header { + @include size-px(width, 975); + padding: 0em; + @include size-px(margin-left, -1); + + .book-box-inner { + min-height: 1em; + } + + p { + @include size-px(font-size, 24); + @include size-px(margin, 5); + } +} + +.snippets { + @include size-px(width, 440); + float: right; + @include size-px(margin-top, -200); + + .snippet-text { + @include size-px(font-size, 12); + @include size-px(margin-top, 13); + @include size-px(margin-bottom, 13); + @include size-px(margin-left, 0); + @include size-px(margin-right, 0); + @include size-px(padding, 12); + background: #f7f7f7; + } + + .anchor { + display: none; + } +} + + +.search-hint-label { + display: inline-block; + @include size-px(font-size, 11); + @include size-px(width, 275); + line-height: 1.636em; +} + +.search-hint-category { + @include size-px(font-size, 11); + line-height: 1.636em; +} + diff --git a/apps/wolnelektury_core/static/css/main/tag.scss b/apps/wolnelektury_core/static/css/main/tag.scss new file mode 100755 index 000000000..a06e0b59f --- /dev/null +++ b/apps/wolnelektury_core/static/css/main/tag.scss @@ -0,0 +1,104 @@ +@import "tools"; + +.page-desc { + @include size-px(margin-left, 15); +} + +#tagged-object-list { + @media screen and (min-width: 62.5em) { + .left-column, .right-column { + @include size-px(width, 480); + } + } + + .see-also, .download { + float: left; + @include size-px(margin-top, 20); + @include size-px(margin-bottom, 20); + + h2 { + @include mono; + @include size-px(font-size, 11); + margin: 0; + } + + ul { + @include size-px(font-size, 11); + list-style: none; + padding: 0; + margin: 0; + } + } + + .see-also { + @include size-px(margin-left, 80); + @include size-px(width, 143); + } + .download { + @include size-px(margin-left, 20); + } + + .left-column .see-also { + margin-left: 0; + } +} + +#description { + @include size-px(margin-bottom, 26); + cursor: pointer; + + dl { + margin-top: 0; + } + dt { + display: inline; + font-weight: bold; + margin: 0; + } + dd { + display: inline; + margin: 0; + } + p { + margin-top: 0; + } + #description .meta { + list-style: none; + padding: 0; + margin: 0; + } + #description .meta li { + text-align: right; + color: #666; + @include size-px(font-size, 11.7); + } +} + +.inline-tag-lists { + @include size-px(font-size, 11); + + .inline-header { + @include mono; + display: inline-block; + vertical-align: top; + @include size-px(width, 77); + } + + .inline-body { + display: inline-block; + vertical-align: top; + @include size-px(margin-bottom, 5.5); + @include size-px(width, 385); + + ul { + list-style: none; + padding: 0; + margin: 0; + + li { + display: inline-block; + @include size-px(margin-right, 11); + } + } + } +} diff --git a/apps/wolnelektury_core/static/css/main_page.css b/apps/wolnelektury_core/static/css/main_page.css deleted file mode 100755 index 4bf75ea23..000000000 --- a/apps/wolnelektury_core/static/css/main_page.css +++ /dev/null @@ -1,101 +0,0 @@ - -#promo-box-header { - padding-top: 2em; - height: 3.1em; - padding-bottom: 0; - padding-left: 2.5em; - padding-right: 2.5em; - background: #191919; - color: white; -} -#promo-box-header h2 { - font-size: 1.3em; - margin: 0; -} -#promo-box-body { - border-bottom: 2px solid #efefef; - padding: 2em 2.8em; - background: #efefef; -} -#promo-box h3 { - color: #0d777e; - font-size: 1.1em; - height: 2.5em; /* 2.75@1.1 */ - margin: 0; - font-family: "Andale Mono", "Lucida Sans Typewriter", "Courier New"; - font-weight: normal; -} -#promo-box h3:after { - content: " >"; -} -#promo-box a { - color: #0d777e; -} -#promo-box-body a { - display: block; - color: #6c6c6c; -} -#promo-box-body p { - margin-top: 0; - font-size: 1.2em; - line-height: 1.55em; - color: #6c6c6c; -} - -.main-last { - padding-top: 1.9em; - height: 3.2em; - padding-left: 1.9em; - margin: 0; - font-size: 1em; -} -.main-last span { - font-size: 1.1em; - color: black; -} -.main-last span:after { - content: " >"; -} - - -.infopages-box { - width: 20.6em; - display: inline-block; - margin: .5em 0 0 0; - padding: 0 1.7em; - vertical-align: top; - color: #989898; -} -.infopages-box h2 { - color: #017e85; - height: 2.8em; - padding-top: 2.5em; - font-size: 1em; - margin: 0; -} -.infopages-box h2 span { - font-size: 1.1em; -} -.infopages-box a { - color: black; -} - -.infopages-box ol, .infopages-box ul { - font-size: 1.1em; - list-style: none; - padding: 0; - margin: 0; - line-height: 1.45em; -} - -.infopages-box li { - margin-bottom: .25em; -} - -.infopages-box .social-links { - margin-top: 1em; -} - -.infopages-box .social-links a { - margin-right: .6em; -} diff --git a/apps/wolnelektury_core/static/css/picture_box.css b/apps/wolnelektury_core/static/css/picture_box.css index 83022eb77..e77ced239 100755 --- a/apps/wolnelektury_core/static/css/picture_box.css +++ b/apps/wolnelektury_core/static/css/picture_box.css @@ -1,3 +1,5 @@ +/* This need reviewing and updating before any pictures are published. */ + .picture-mini-box, .picture-box { display: inline-block; margin: 0; diff --git a/apps/wolnelektury_core/static/css/screen.css b/apps/wolnelektury_core/static/css/screen.css deleted file mode 100644 index 8522996dc..000000000 --- a/apps/wolnelektury_core/static/css/screen.css +++ /dev/null @@ -1,153 +0,0 @@ -/* - * Should only be applied for big-screen pc-like devices. - */ - -.left-column { - width: 47em; - float: left; -} -.right-column { - float:right; - width: 47em; -} - -.hidden-box ul { - width: 48em; - column-width: 12em; - -moz-column-width: 12em; - -webkit-column-width: 12em; -} - -#menu-collections ul { - width: 18em; -} - - -#header-content, div#main-content, div#half-header-content, #footer-content { - width: 97.5em; - margin: auto; -} - -#promo-box { - float: right; - margin-top: -5.1em; -} - -#promo-box-body { - height: 30em; -} - -#big-cite .vip { - float:left; - text-align:right; - width: 14.7em; -} - -#big-cite .cite-body { - margin-left: 17.5em; -} - -#big-cite .source { - margin-left: 17.5em; -} - - -.book-wide-box { - width: 97.5em; -} -.book-wide-box .book-box-body { - width: 38.2em; -} - - -#tagged-object-list .left-column, #tagged-object-list .right-column { - width: 48em; -} - - - - -.inline-body { - width: 35em; -} - - -.search-result { - width: 97.5em; -} - - -.book-list-header { - width: 97.5em; -} - -.book-wide-box .right-column { - width: 41.5em; - margin-top: -23em; -} - -.book-wide-box #theme-list-wrapper { - margin-bottom: 0; -} - -.snippets { - width: 44em; - float: right; - margin-top: -20em; -} - - -/* HEADER */ - -#header { - height: 3em; - padding-top: 1.9em; -} - -#logo { - position: absolute; - top: 0; -} - -#user-info { - float: right; - padding: 0; -} - -#tagline { - display: inline-block; - margin-left: 25.5em; -} - -#search-area { - margin-left: 24em; - width: 73.5em; -} - -#search-field { - width: 63.1em; - padding-right: 0; -} - -#search { - width: 47.47em; -} - -#search-button { - float: right; -} - -#promo-box { - width: 32em; -} - - -/* Book list */ - -#book-list-nav { - border-left: 1px solid #CFCFCF; - padding: .75em; - position: absolute; - right: 4em; - width: 25em; -} diff --git a/apps/wolnelektury_core/static/css/simple.css b/apps/wolnelektury_core/static/css/simple.css index 6b8a54cc9..f723889a2 100755 --- a/apps/wolnelektury_core/static/css/simple.css +++ b/apps/wolnelektury_core/static/css/simple.css @@ -1,3 +1,5 @@ +/* Legacy simple style for some very old pages. */ + html { margin: 0; } diff --git a/apps/wolnelektury_core/static/js/base.js b/apps/wolnelektury_core/static/js/base.js index 9676d5b4c..7db29ab24 100755 --- a/apps/wolnelektury_core/static/js/base.js +++ b/apps/wolnelektury_core/static/js/base.js @@ -101,6 +101,14 @@ })(); +$('#show-menu').click(function(event) { + event.preventDefault(); + $('#menu').toggle('slow'); +}); +$('#book-list-nav h2').click(function(event) { + event.preventDefault(); + $('#book-list-nav-index').toggle(); +}); $('#themes-list-toggle').click(function(event) { diff --git a/apps/wolnelektury_core/templates/main_page.html b/apps/wolnelektury_core/templates/main_page.html index a751022e1..54ca0031f 100755 --- a/apps/wolnelektury_core/templates/main_page.html +++ b/apps/wolnelektury_core/templates/main_page.html @@ -7,47 +7,47 @@ {% block ogtitle %}{% trans "Wolne Lektury internet library" %}{% endblock %} {% block body %} -
{% render_cite cite %} -
+ {% spaceless %} -
-

- {% trans "What's new?" %} -

-
- {% chunk "promo" %} -
-
+
+

{% trans "What's new?" %}

+
+ {% chunk "promo" %} +
+
-

{% trans "Recent publications" %}

+
+

{% trans "Recent publications" %}

{% cache 60 last-published-on-main %} {% for book in last_published %} {% book_mini book %} {% endfor %} {% endcache %} +
-
-

{% trans "News" %}

+
+

{% trans "News" %}

{# 135 is the id of new publications category of our master blog. perhaps this URL should go to settings. #} {% cache 1800 latest-blog-posts %} {% latest_blog_posts "http://nowoczesnapolska.org.pl/feed/?cat=-135" %} {% endcache %} -
+ -
-

{% trans "Utilities" %}

+
+

{% trans "Utilities" %}

-
+ -
-

{% trans "Information" %}

+
+

{% trans "Information" %}

-
+ {% endspaceless %} diff --git a/apps/wolnelektury_core/templates/superbase.html b/apps/wolnelektury_core/templates/superbase.html index e97ede609..9ee206f57 100644 --- a/apps/wolnelektury_core/templates/superbase.html +++ b/apps/wolnelektury_core/templates/superbase.html @@ -5,6 +5,7 @@ {% load catalogue_tags funding_tags reporting_stats sponsor_tags %} + @@ -17,17 +18,10 @@ {% block title %}{% trans "Wolne Lektury" %} :: {% block titleextra %}{% endblock %}{% endblock %} - + - {% compressed_css "all" %} - - - {#% compressed_css "handheld" %#} - - + href="{% static 'opensearch.xml' %}" /> + {% compressed_css "main" %} {% block extrahead %} {% endblock %} @@ -35,45 +29,26 @@ {% block bodycontent %} {% funding link=1 closeable=1 add_class="funding-top-header" %} -
- -