Merge pull request #70 from crowdint/chore/fix-post-page

[#84604518][3pts] Adds comments per paragraph
crowdint · Mar 25, 2015 · cda9ae6 · cda9ae6
2 parents 7a54861 + cf7378e
commit cda9ae6
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 13 deletions.
diff --git a/app/assets/stylesheets/modules/categories.scss b/app/assets/stylesheets/modules/categories.scss
@@ -2,6 +2,27 @@
   float: left;
   margin: 50px 0 0 5%;
   width: 10%;
+  &.for-post {
+    position: absolute;
+    @include mq-tablet(){
+      background-color: $blog-color;
+      display: block;
+      float: none;
+      margin: 0;
+      position: static;
+      text-align: center;
+      width: 100%;
+      select {
+        background-color: #007466;
+        border: none;
+        color: white;
+        font-family: 'Roboto Light';
+        font-size: 20px;
+        margin: 0.5em auto;
+        text-decoration: underline;
+      }
+    }
+  }
 
   h1, h2, a {
     color: $darkgray;
@@ -17,7 +38,18 @@
     margin: 60px 0 20px;
   }
 
-  .category { line-height: 30px; }
+  .categories-mobile {
+    display: none;
+    @include mq-tablet(){
+      display: block;
+    }
+  }
+
+  .categories-desktop {
+    @include mq-tablet(){
+      display: none;
+    }
+  }
 
   @include mq-tablet(){ display: none; }
 }
diff --git a/app/assets/stylesheets/modules/menu-header.scss b/app/assets/stylesheets/modules/menu-header.scss
@@ -2,6 +2,7 @@
   margin: 0 auto;
   padding: 25px 5% 0;
   text-align: center;
+  overflow: auto;
   @include mq-tablet() {
     max-width: 768px;
     padding: 25px 20px 0;

diff --git a/app/views/crowdblog/posts/_disqus.html.slim b/app/views/crowdblog/posts/_disqus.html.slim
@@ -9,12 +9,6 @@ javascript:
   dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
   (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
 
-  if ($(document).width() > tabletSize) {
-    $(document).ready(function() {
-      $('.body p').inlineDisqussions({ highlighted: true });
-    });
-  }
-
 a href="http://disqus.com" class="dsq-brlink"
   | blog comments powered by
   span class="logo-disqus" Disqus
diff --git a/app/views/crowdblog/posts/index.html.slim b/app/views/crowdblog/posts/index.html.slim
@@ -1,9 +1,10 @@
 = render 'application/we_share' if @page == 1
 .categories
-  = link_to root_path do
-    h2.category-home Blog Home
-  h1.categories-title We write about
-  = render @categories, index_view: true
+  .categories-desktop
+    = link_to root_path do
+      h2.category-home Blog Home
+    h1.categories-title We write about
+    = render @categories, index_view: true
 .archive
   = link_to main_app.archive_path do
     h2 Blog Archive

diff --git a/app/views/crowdblog/posts/show.html.slim b/app/views/crowdblog/posts/show.html.slim
@@ -1,6 +1,6 @@
-.categories
+.categories.for-post
   .categories-desktop
-    h1.title We write about
+    h1.categories-title We write about
     = render partial: 'crowdblog/categories/category_details', collection: @categories, as: :category
   .categories-mobile
     = select_tag :category,