added header into tag view, as well as a back/close tag button

jhardy · Jan 30, 2014 · cc7fff3 · cc7fff3
1 parent b947b49
commit cc7fff3
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 6 deletions.
diff --git a/app/css/main.css b/app/css/main.css
@@ -437,34 +437,74 @@ header {
   }
 }
 
-/* line 35, ../../sass/_header_title.scss */
+/* line 36, ../../sass/_header_title.scss */
+.title-wrapper .page-title {
+  display: inline;
+  margin-left: 5px;
+}
+@media all and (min-width: 1024px) {
+  /* line 36, ../../sass/_header_title.scss */
+  .title-wrapper .page-title {
+    margin-left: 10px;
+  }
+}
+/* line 43, ../../sass/_header_title.scss */
+.title-wrapper .to-home {
+  display: inline;
+  font-size: 2.25em;
+  font-weight: 300;
+  color: #bbb9b7;
+  margin-right: 5px;
+  position: relative;
+  top: -2px;
+}
+@media all and (min-width: 768px) {
+  /* line 43, ../../sass/_header_title.scss */
+  .title-wrapper .to-home {
+    font-size: 2.625em;
+  }
+}
+@media all and (min-width: 1024px) {
+  /* line 43, ../../sass/_header_title.scss */
+  .title-wrapper .to-home {
+    font-size: 3.125em;
+    margin-right: 10px;
+    top: -2px;
+  }
+}
+/* line 62, ../../sass/_header_title.scss */
+.title-wrapper .to-home:hover {
+  color: #706c69;
+}
+
+/* line 68, ../../sass/_header_title.scss */
 .page-description {
   font-size: 0.875em;
   color: #706c69;
   margin-bottom: 0;
   line-height: 1.5;
 }
 @media all and (min-width: 768px) {
-  /* line 35, ../../sass/_header_title.scss */
+  /* line 68, ../../sass/_header_title.scss */
   .page-description {
     font-size: 1em;
   }
 }
 @media all and (min-width: 1024px) {
-  /* line 35, ../../sass/_header_title.scss */
+  /* line 68, ../../sass/_header_title.scss */
   .page-description {
     font-size: 1.125em;
   }
 }
-/* line 49, ../../sass/_header_title.scss */
+/* line 82, ../../sass/_header_title.scss */
 .page-description a {
   color: #7ca4ab;
   -webkit-transition: color 200ms linear;
   -moz-transition: color 200ms linear;
   -o-transition: color 200ms linear;
   transition: color 200ms linear;
 }
-/* line 53, ../../sass/_header_title.scss */
+/* line 86, ../../sass/_header_title.scss */
 .page-description a:hover {
   color: #c6538c;
 }

diff --git a/app/js/main.js b/app/js/main.js
@@ -67,7 +67,9 @@ $(function() {
     e.stopPropagation();
     $modalTarp.fadeIn(fadeSpeed);
     $projectModal.addClass('modal-open');
-    $('body').css('position','fixed');
+    if ($(window).width() < 768) {
+      $('body').css('position','fixed');
+    }
   });
 
   // Fade out project instruction

diff --git a/sass/_header_title.scss b/sass/_header_title.scss
@@ -32,6 +32,39 @@ header {
   }
 }
 
+.title-wrapper {
+  .page-title {
+    display: inline;
+    margin-left: 5px;
+    @include mq(large) {
+      margin-left: 10px;
+    }
+  }
+  .to-home {
+    display: inline;
+    font-size: px2em(36px);
+    font-weight: 300;
+    color: lighten($text-color, 30%);
+    margin-right: 5px;
+    position: relative;
+    top: -2px;
+
+    @include mq(medium) {
+      font-size: px2em(42px);
+    }
+
+    @include mq(large) {
+      font-size: px2em(50px);
+      margin-right: 10px;
+      top: -2px;
+    }
+
+    &:hover {
+      color: $text-color;
+    }
+  }
+}
+
 .page-description {
   font-size: px2em(14px);
   color: $text-color;

diff --git a/views/tag.haml b/views/tag.haml
@@ -20,6 +20,12 @@
 
     = haml :_sache_bar
 
+    .container
+      %header
+        .title-wrapper
+          %a{:href => "/", :class => "to-home"} &times;
+          %h2{:class => "page-title"} Tag Name
+
     = haml :_extension
 
     = haml :_footer