Font Awesome, jbuilder templates, getting rid of beatparser

app/assets/stylesheets/album-track.css.scss

@@ -59,7 +59,7 @@
       border-radius: 50px;
 
       i {
-        margin: 3px 0 0 -1px;
+        margin: 6px 0 0 -2px;
       }
     }
 
@@ -102,6 +102,7 @@
             margin: 0;
             padding: 0;
             color: #808080;
+            text-shadow: none;
 
             .artist-page {
               color: #808080;
@@ -132,6 +133,10 @@
       top: 3px;
       right: 5px;
       display: none;
+
+      i {
+        margin-left: -3px;
+      }
     }
 
     // li:hover

app/assets/stylesheets/application.css.scss

@@ -1,5 +1,7 @@
 @import "bourbon";
-@import "bootstrap";
+@import "bootstrap_custom";
+@import "font-awesome";
+
 @import "noise";
 @import "buttons";
 @import "autocomplete";
@@ -7,6 +9,8 @@
 @import "album-track";
 @import "player";
 @import "auth";
+@import "popup";
+@import "tour";
 
 @import url(http://fonts.googleapis.com/css?family=Lobster+Two:400,400italic,700);
 @import url(http://fonts.googleapis.com/css?family=Source+Sans+Pro);

app/assets/stylesheets/auth.css.scss

@@ -1,3 +1,14 @@
-.navbar .auth {
-  margin: 14px 10px 0 15px;
+.navbar {
+  .preferences {
+    margin: 14px 10px 0 15px;
+    font-size: 27px;
+    color: #e0e0e0;
+    text-shadow: 0 0 2px rgba(255, 255, 255, .6);
+      text-decoration: none;
+
+      &:hover {
+        color: #fafafa;
+        text-shadow: 0 0 4px rgba(255, 255, 255, .9);
+      }
+  }
 }

app/assets/stylesheets/bootstrap_custom.css.scss

@@ -0,0 +1,51 @@
+@import "bootstrap/variables"; // Modify this for custom colors, font-sizes, etc
+@import "bootstrap/mixins";
+
+// CSS Reset
+@import "bootstrap/reset";
+
+// Grid system and page structure
+@import "bootstrap/scaffolding";
+@import "bootstrap/grid";
+@import "bootstrap/layouts";
+
+// Base CSS
+@import "bootstrap/type";
+@import "bootstrap/code";
+@import "bootstrap/forms";
+// @import "bootstrap/tables";
+
+// Components: common
+// @import "bootstrap/sprites";
+// @import "bootstrap/dropdowns";
+// @import "bootstrap/wells";
+@import "bootstrap/component-animations";
+// @import "bootstrap/close";
+
+// Components: Buttons & Alerts
+@import "bootstrap/buttons";
+// @import "bootstrap/button-groups";
+@import "bootstrap/alerts"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less
+
+// Components: Nav
+@import "bootstrap/navs";
+@import "bootstrap/navbar";
+// @import "bootstrap/breadcrumbs";
+// @import "bootstrap/pagination";
+// @import "bootstrap/pager";
+
+// Components: Popovers
+@import "bootstrap/modals";
+@import "bootstrap/tooltip";
+@import "bootstrap/popovers";
+
+// Components: Misc
+// @import "bootstrap/thumbnails";
+// @import "bootstrap/labels-badges";
+// @import "bootstrap/progress-bars";
+// @import "bootstrap/accordion";
+// @import "bootstrap/carousel";
+@import "bootstrap/hero-unit";
+
+// Utility classes
+@import "bootstrap/utilities"; // Has to be last to override when necessary

app/assets/stylesheets/buttons.css.scss

@@ -16,6 +16,7 @@
   background-position: 0 0 !important;
   color: #fafafa;
   text-shadow: 0 1px 1px rgba(0, 0, 0, .35);
+
   &:hover {
     color: #ffffff;
   }

app/assets/stylesheets/player.css.scss

@@ -6,7 +6,17 @@
     margin: 3px 0 0 -103px;
 
     a {
-      margin: 5px 6px 0 -9px;
+      @include inline-block;
+      margin: 11px 10px 0 0;
+      font-size: 27px;
+      color: #e0e0e0;
+      text-shadow: 0 0 2px rgba(255, 255, 255, .6);
+      text-decoration: none;
+
+      &:hover {
+        color: #fafafa;
+        text-shadow: 0 0 4px rgba(255, 255, 255, .9);
+      }
     }
 
     .pause {

app/assets/stylesheets/popup.css.scss

@@ -0,0 +1,19 @@
+.fullscreen {
+  display: none;
+  position: absolute;
+  z-index: 9999;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, .7);
+}
+.popup {
+  position: absolute;
+  z-index: 99999;
+  top: 50%;
+  left: 50%;
+  width: 640px;
+  height: 360px;
+  margin: -240px 0 0 -380px;
+}

app/assets/stylesheets/tour.css.scss

@@ -0,0 +1,13 @@
+.tour .step {
+  display: none;
+}
+.tour .step-1 {
+  display: block;
+}
+.popover {
+  z-index: 99999;
+
+  p {
+    margin: 8px 0;
+  }
+}