From: Marcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Date: Tue, 31 Jan 2012 12:20:49 +0000 (+0100)
Subject: Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/7b1886edd19944188aaa7e8726ceecc977851483?hp=9e020f2a463e49b2aa799d3d3305f82dd01bece1

Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
---

diff --git a/wolnelektury/static/css/base.css b/wolnelektury/static/css/base.css
index 298fd9af3..70bf83d38 100755
--- a/wolnelektury/static/css/base.css
+++ b/wolnelektury/static/css/base.css
@@ -27,7 +27,7 @@ a img {
 	border: 0;
 }
 a {
-    color: #1199a2; /* #01adba; */
+    color: #0d7e85; /*#1199a2;*/ /* #01adba; */
     text-decoration: none;
 }
 
diff --git a/wolnelektury/static/css/book_box.css b/wolnelektury/static/css/book_box.css
index 0ba168c9b..abf07de4f 100755
--- a/wolnelektury/static/css/book_box.css
+++ b/wolnelektury/static/css/book_box.css
@@ -110,7 +110,7 @@
 }
 .book-mini-box .author {
     font-size: 1.1em;
-    color: #707b7a;
+    color: #6d7877;
     display: block;
     overflow:hidden;
     text-overflow: ellipsis;
@@ -310,6 +310,7 @@ ul.inline-items li {
     background: none;
     margin: 0;
     padding: 0;
+    color: #757575;
 }
 
 .if-like a {
diff --git a/wolnelektury/static/css/cite.css b/wolnelektury/static/css/cite.css
index 5f6bb1cc1..e23dee157 100755
--- a/wolnelektury/static/css/cite.css
+++ b/wolnelektury/static/css/cite.css
@@ -36,9 +36,9 @@
     color: white;
     padding: 0;
     margin: 0;
-    background-image: url(/static/img/backdrop/boltron-3212284622.jpg);
+    background-image: url(/static/img/backdrop/horiavarlan-4268896468.jpg);
     background-size: 100%;
-    background-position: 50% 50%;
+    background-position: 50% 70%;
 }
 
 #big-cite .cite {
diff --git a/wolnelektury/static/css/header.css b/wolnelektury/static/css/header.css
index fc89f8223..bdc2bff7a 100755
--- a/wolnelektury/static/css/header.css
+++ b/wolnelektury/static/css/header.css
@@ -25,6 +25,9 @@
     color: #989898;
     background: #191919;
 }
+#header a {
+	color: #17CFDB;
+}
 
 #half-header {
     padding-bottom: 0;
@@ -60,11 +63,7 @@
 }
 #tagline span {
     font-size: 1.3em;
-    color: #ccc;
-}
-#tagline a,
-#user-info a {
-	color: #17cfdb;
+    color: #bbb;
 }
 
 #search-area {
@@ -120,26 +119,26 @@
 {
     font-family: Georgia;
     font-style: italic;
-    color: #888;
+    color: #767676;
 }
 
 #search.placeholder
 {
     font-family: Georgia;
     font-style: italic;
-    color: #888;
+    color: #767676;
 }
 
 #search:-moz-placeholder
 {
     font-family: Georgia;
     font-style: italic;
-    color: #888;
+    color: #767676;
 }
 
 #search-button {
     display: inline-block;
-    background: #02adb7;
+    background: #018189;
     color: white;
     padding: 0;
     margin: 0;
@@ -150,7 +149,7 @@
     font-size: 1em;
     height: 4.5em;
     border: none;
-    background: #02adb7;
+    background: #018189;
     color: white;
     width: 100%;
     padding: 0;
@@ -184,6 +183,7 @@ a.menu {
     /* must match grid-line */
     height: 3.1em;
     padding-top: 1.8em;
+    color: #0c7076;
 }
 a.menu span {
     font-size: 1.1em;
@@ -191,7 +191,7 @@ a.menu span {
 
 
 #lang-button {
-    color: #aaa;
+    color: #717171;
 }
 #lang-button:after {
     padding-left: 1em;
@@ -218,7 +218,7 @@ a.menu span {
 #lang-menu-items button {
     display: none;
     background: #f7f7f7;
-    color: #777;
+    color: #6f6f6f;
     cursor: pointer;
     width: 100%;
     border: solid #ddd;
diff --git a/wolnelektury/static/css/main_page.css b/wolnelektury/static/css/main_page.css
index e4daf5487..e52a28341 100755
--- a/wolnelektury/static/css/main_page.css
+++ b/wolnelektury/static/css/main_page.css
@@ -23,10 +23,13 @@
     background: #efefef;
 }
 #promo-box-title {
-    color: #02ADB7;
+    color: #0d777e;
     height: 2.75em;
     margin: 0;
 }
+#promo-box-title a {
+	color: #0d777e;
+}
 #promo-box-title span {
     font-size: 1.1em;
 }
@@ -36,7 +39,7 @@
 #promo-box-content {
     font-size: 1.2em;
     line-height: 1.55em;
-    color: #989898;
+    color: #6c6c6c;
 }
 
 .main-last {
@@ -58,7 +61,7 @@
     color: #989898;
 }
 .infopages-box h2 {
-    color: #02ADB7;
+    color: #017e85;
     height: 2.8em;
     padding-top: 2.5em;
 }
diff --git a/wolnelektury/static/css/social/shelf_tags.css b/wolnelektury/static/css/social/shelf_tags.css
index 812a1c96d..8843af684 100755
--- a/wolnelektury/static/css/social/shelf_tags.css
+++ b/wolnelektury/static/css/social/shelf_tags.css
@@ -23,7 +23,7 @@
     display: block;
     padding: .3em 1em;
     background: #ABDADE;
-    color: #0b838d;
+    color: #08646b;
     border-radius: 1em;
 }
 
diff --git a/wolnelektury/static/img/backdrop/horiavarlan-4268896468.jpg b/wolnelektury/static/img/backdrop/horiavarlan-4268896468.jpg
new file mode 100644
index 000000000..acc80b6e7
Binary files /dev/null and b/wolnelektury/static/img/backdrop/horiavarlan-4268896468.jpg differ
diff --git a/wolnelektury/templates/main_page.html b/wolnelektury/templates/main_page.html
index bcd2c75ca..988bad66d 100755
--- a/wolnelektury/templates/main_page.html
+++ b/wolnelektury/templates/main_page.html
@@ -71,8 +71,8 @@
 
 {% block add_footer %}
 <p>{% trans "Image used:" %} 
-<a href="http://www.flickr.com/photos/webtreatsetc/5647576127/">Blue Stripes</a>,
-webtreats@Flickr,
+<a href="http://www.flickr.com/photos/horiavarlan/4268896468/">Hardcover book gutter and pages</a>,
+Horia Varlan@Flickr,
 <a href="http://creativecommons.org/licenses/by/2.0/deed.pl">CC BY</a>.
 </p>
 {% endblock %}