From: Radek Czajka <radekczajka@nowoczesnapolska.org.pl>
Date: Fri, 19 Sep 2014 14:26:01 +0000 (+0200)
Subject: Display fixes: shelf tags, search results.
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/c6d5dd71ad0d9bae811cc9002248d9399c7fdff7?ds=sidebyside

Display fixes: shelf tags, search results.
---

diff --git a/apps/wolnelektury_core/static/css/social/shelf_tags.css b/apps/wolnelektury_core/static/css/social/shelf_tags.css
deleted file mode 100755
index 8843af684..000000000
--- a/apps/wolnelektury_core/static/css/social/shelf_tags.css
+++ /dev/null
@@ -1,36 +0,0 @@
-.social-shelf-tags {
-    list-style: none;
-    padding: 0;
-    margin: 1em 0;
-    width: 30em;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    position:absolute;
-    margin-left: 15.4em;
-    top: 13.5em;
-    padding: .5em 0;
-    background: #fff;
-}
-
-.social-shelf-tags li {
-    display: inline-block;
-    margin-right:1em;
-    margin-bottom: .5em;
-}
-
-.social-shelf-tags a {
-    display: block;
-    padding: .3em 1em;
-    background: #ABDADE;
-    color: #08646b;
-    border-radius: 1em;
-}
-
-
-.social-shelf-tags:hover {
-    overflow: visible;
-    text-overflow: ellipsis;
-    white-space: normal;
-    z-index: 1000;
-}
diff --git a/apps/wolnelektury_core/static/scss/main.scss b/apps/wolnelektury_core/static/scss/main.scss
index 5a480073c..467e607bb 100644
--- a/apps/wolnelektury_core/static/scss/main.scss
+++ b/apps/wolnelektury_core/static/scss/main.scss
@@ -23,3 +23,5 @@
 @import "funding/funding";
 
 @import "polls/polls";
+
+@import "social/shelf_tags";
diff --git a/apps/wolnelektury_core/static/scss/main/search.scss b/apps/wolnelektury_core/static/scss/main/search.scss
index 2dac56ab0..d8a1e0622 100755
--- a/apps/wolnelektury_core/static/scss/main/search.scss
+++ b/apps/wolnelektury_core/static/scss/main/search.scss
@@ -28,17 +28,41 @@
 
 
 .search-result {
-    @include size(width, 975px);
+    @include size(border, 1px solid #ddd);
+    @include size(box-shadow, 2px 2px 2px #ddd);
+    @include size(margin, 1px);
+    background: white;
 
-    .book-box-body {
-        @include size(width, 310px);
+    @include min-screen($S_BOOK_SHORT_FULL) {
+        @include size(width, $W_BOOK_SHORT_FULL -4px);
+    }
+
+    @media screen and (min-width: 62.5em) {
+        @include size(width, 965px);
+        @include size(padding-right, 8px);
+    }
+
+    .book-box {
+        display: inline-block;
+
+        @include min-screen($S_BOOK_SHORT_FULL) {
+            @include size(width, $W_BOOK_SHORT_FULL - 4px);
+        }
+
+        .book-box-inner {
+            border: none;
+            box-shadow: none;
+            margin: 0;
+        }
     }
 }
 
 
 
 .book-list-header {
-    @include size(width, 975px);
+    @media screen and (min-width: 62.5em) {
+        @include size(width, 975px);
+    }
     padding: 0em;
     @include size(margin-left, -1px);
 
@@ -53,9 +77,10 @@
 }
 
 .snippets {
-    @include size(width, 440px);
-    float: right;
-    @include size(margin-top, -200px);
+    @media screen and (min-width: 62.5em) {
+        @include size(width, 440px);
+        float: right;
+    }
 
     .snippet-text {
         @include size(font-size, 12px);
diff --git a/apps/wolnelektury_core/static/scss/main/tag.scss b/apps/wolnelektury_core/static/scss/main/tag.scss
index 844d3dac9..d120a3f97 100755
--- a/apps/wolnelektury_core/static/scss/main/tag.scss
+++ b/apps/wolnelektury_core/static/scss/main/tag.scss
@@ -86,7 +86,7 @@
         display: inline-block;
         vertical-align: top;
         @include size(margin-bottom, 5.5px);
-        @include size(width, 385px);
+        @include size(max-width, 385px);
 
         ul {
             list-style: none;
diff --git a/apps/wolnelektury_core/static/scss/social/shelf_tags.scss b/apps/wolnelektury_core/static/scss/social/shelf_tags.scss
new file mode 100644
index 000000000..f20fba8b6
--- /dev/null
+++ b/apps/wolnelektury_core/static/scss/social/shelf_tags.scss
@@ -0,0 +1,40 @@
+.social-shelf-tags {
+    list-style: none;
+    padding: 0;
+    margin: 10px 0;
+
+    @include min-screen($S_BOOK_SHORT_FULL) {
+        position: absolute;
+        top: 134px;
+        left: 152px;
+        padding: 10px 10px 5px 10px;
+        margin: 10px 0;
+        width: 310px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+
+        &:hover {
+            overflow: visible;
+            text-overflow: ellipsis;
+            white-space: normal;
+            z-index: 1000;
+            background: #fff;
+            box-shadow: 0 0 2px #ddd;
+        }
+    }
+
+    li {
+        display: inline-block;
+        margin-right: .5em;
+        margin-bottom: .5em;
+
+        a {
+            display: block;
+            padding: .2em .9em;
+            background: #ABDADE;
+            color: #08646b;
+            border-radius: 1em;
+        }
+    }
+}
diff --git a/wolnelektury/settings/static.py b/wolnelektury/settings/static.py
index 7ea3d70e5..306e718b6 100644
--- a/wolnelektury/settings/static.py
+++ b/wolnelektury/settings/static.py
@@ -20,10 +20,9 @@ PIPELINE_CSS = {
     'main': {
         # styles both for mobile and for big screen
         'source_filenames': [
-            'css/jquery.countdown.css', 
+            'css/jquery.countdown.css',
 
             'sponsors/css/sponsors.css',
-            'css/social/shelf_tags.css',
 
             'uni_form/uni-form.css',
             'uni_form/default.uni-form.css',
@@ -58,8 +57,8 @@ PIPELINE_CSS = {
     },
     'player': {
         'source_filenames': [
-            'jplayer/jplayer.blue.monday.css', 
-            'player/player.css', 
+            'jplayer/jplayer.blue.monday.css',
+            'player/player.css',
         ],
         'output_filename': 'css/compressed/player.css',
     },
@@ -90,16 +89,16 @@ PIPELINE_JS = {
             'player/openplayer.js',
             'js/search.js',
             'funding/funding.js',
-            
+
             'uni_form/uni-form.js',
             ),
         'output_filename': 'js/base.min.js',
     },
     'player': {
         'source_filenames': [
-            'jplayer/jquery.jplayer.min.js', 
-            'jplayer/jplayer.playlist.min.js', 
-            'player/player.js', 
+            'jplayer/jquery.jplayer.min.js',
+            'jplayer/jplayer.playlist.min.js',
+            'player/player.js',
         ],
         'output_filename': 'js/player.min.js',
     },