Fix tag's style and emoji's style.

lodge · May 8, 2015 · 2cb2907 · 2cb2907
1 parent 64f0fb9
commit 2cb2907
Showing 1 changed file with 25 additions and 12 deletions.
diff --git a/app/assets/stylesheets/application.css.scss.erb b/app/assets/stylesheets/application.css.scss.erb
@@ -148,12 +148,6 @@ h6 {
   top: auto;
 }
 
-h1 {
-  .emoji {
-    vertical-align: middle;
-  }
-}
-
 .emoji {
   vertical-align: text-bottom;
 }
@@ -197,18 +191,25 @@ h1 {
 
 .markdown {
 
+  $markdown-font-size-h1: $font-size-h1 * 0.7;
+  $markdown-font-size-h2: $font-size-h2 * 0.7;
+  $markdown-font-size-h3: $font-size-h3 * 0.7;
+  $markdown-font-size-h4: $font-size-h4 * 0.7;
+  $markdown-font-size-h5: $font-size-h5 * 0.7;
+  $markdown-font-size-h6: $font-size-h6 * 0.7;
+
   line-height: 1.3em;
 
   h1, h2, h3, h4, h5, h6 {
     margin-bottom: 16px;
   }
 
-  h1 { font-size: $font-size-h1 * 0.7; }
-  h2 { font-size: $font-size-h2 * 0.7; }
-  h3 { font-size: $font-size-h3 * 0.7; }
-  h4 { font-size: $font-size-h4 * 0.7; }
-  h5 { font-size: $font-size-h5 * 0.7; }
-  h6 { font-size: $font-size-h6 * 0.7; }
+  h1 { font-size: $markdown-font-size-h1; }
+  h2 { font-size: $markdown-font-size-h2; }
+  h3 { font-size: $markdown-font-size-h3; }
+  h4 { font-size: $markdown-font-size-h4; }
+  h5 { font-size: $markdown-font-size-h5; }
+  h6 { font-size: $markdown-font-size-h6; }
 
   h1 { line-height: $font-size-h1 * 0.9; }
   h2 { line-height: $font-size-h2 * 0.9; }
@@ -217,6 +218,13 @@ h1 {
   h5 { line-height: $font-size-h5 * 0.9; }
   h6 { line-height: $font-size-h6 * 0.9; }
 
+  h1 .emoji { width: $markdown-font-size-h1; height: $markdown-font-size-h1; }
+  h2 .emoji { width: $markdown-font-size-h2; height: $markdown-font-size-h2; }
+  h3 .emoji { width: $markdown-font-size-h3; height: $markdown-font-size-h3; }
+  h4 .emoji { width: $markdown-font-size-h4; height: $markdown-font-size-h4; }
+  h5 .emoji { width: $markdown-font-size-h5; height: $markdown-font-size-h5; }
+  h6 .emoji { width: $markdown-font-size-h6; height: $markdown-font-size-h6; }
+
   h1 {
     background-color: rgba($gray-light, 0.6);
   }
@@ -316,3 +324,8 @@ h1 {
 
 @import "bootswatch/<%= ENV["LODGE_THEME"] %>/bootswatch";
 
+// twitter-tokenfield
+.twitter-typeahead .tt-input {
+  height: 20px;
+  padding: 5px;
+}