Merge pull request #5342 from AugierLe42e/sass-to-scss

Refactor application.css and bootstrap-headerfix.css

Changelog.md

@@ -58,6 +58,7 @@ The keys will still be available in the root level within the 0.5 release. The o
 * Convert some cukes to rspec tests [#5289](https://github.com/diaspora/diaspora/pull/5289)
 * Hidden overflow for long names on tag pages [#5279](https://github.com/diaspora/diaspora/pull/5279)
 * Always reshare absolute root of a post [#5276](https://github.com/diaspora/diaspora/pull/5276)
+* Convert remaining SASS stylesheets to SCSS [#5342](https://github.com/diaspora/diaspora/pull/5342)
 
 ## Bug fixes
 * orca cannot see 'Add Contact' button [#5158](https://github.com/diaspora/diaspora/pull/5158)

app/assets/stylesheets/bootstrap-headerfix.sass

-// A temporary fix for displaying the header in the single post view.
-// Should be removed once everything uses Bootstrap.
-
-header
-  .container
-    width: 950px
-    .header-nav
-      span
-        a
-          font-weight: bold
-          font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif
-          font-size: 13px
-    li
-      font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif
-      font-size: 13px
-
-  #conversations_badge, #notification_badge
-    background: none
-  
-
-  #notification_badge.active
-    @include border-radius(0)
-
-  #global_search
-    form
-      input
-        height: 15px
-        color: black
-
-  #notification_dropdown
-    h4
-      margin: 0
-    .right
-      a
-        font-weight: bold
-    .notification_element
-      font-size: 13px
-      .timeago
-        border: medium none
-        cursor: text

app/assets/stylesheets/bootstrap-headerfix.scss

+// A temporary fix for displaying the header in the single post view.
+// Should be removed once everything uses Bootstrap.
+
+header {
+  .container {
+    width: 950px;
+    .header-nav {
+      span {
+        a {
+          font-weight: bold;
+          font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+          font-size: 13px;
+        }
+      }
+    }
+    li {
+      font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+      font-size: 13px;
+    }
+  }
+  #conversations_badge, #notification_badge {
+    background: none;
+  }
+  #notification_badge.active {
+    @include border-radius(0);
+  }
+  #global_search {
+    form {
+      input {
+        height: 15px;
+        color: black;
+      }
+    }
+  }
+  #notification_dropdown {
+    h4 {
+      margin: 0;
+    }
+    .right {
+      a {
+        font-weight: bold;
+      }
+    }
+    .notification_element {
+      font-size: 13px;
+      .timeago {
+        border: medium none;
+        cursor: text;
+      }
+    }
+  }
+}