fix-assets.patch

diff --git app/assets/stylesheets/application.css.scss app/assets/stylesheets/application.css.scss
index 7202805..4f3504b 100644
--- app/assets/stylesheets/application.css.scss
+++ app/assets/stylesheets/application.css.scss
@@ -7,68 +7,5 @@
 @import "base/media-queries";
 @import "ui/icons";
 
-/*********************************************************************
-*  Common Styles
-*********************************************************************/
-
-@import "layout/common";
-
-/*********************************************************************
-*  Header
-*********************************************************************/
-
-@import "layout/header";
-
-/*********************************************************************
-*  Profile Bar
-*********************************************************************/
-
-@import "ui/profilebar";
-
-/*********************************************************************
-*  Home
-*********************************************************************/
-
-@import "layout/home";
-
-/*********************************************************************
-*  Footer
-*********************************************************************/
-
-@import "layout/footer";
-
-/*********************************************************************
-*  Video
-*********************************************************************/
-
-@import "ui/videoitem";
-
-/*********************************************************************
-*  Screencast List
-*********************************************************************/
-
-@import "layout/screencast_list";
-
-/*********************************************************************
-*  Screencast Show
-*********************************************************************/
-
-@import "layout/login";
-
-/*********************************************************************
-*  Screencast new
-*********************************************************************/
-
-@import "layout/screencast_new";
-
-/*********************************************************************
-*  Login
-*********************************************************************/
-
-@import "layout/screencast_show";
-
-/*********************************************************************
-*  User Profile
-*********************************************************************/
-
-@import "layout/profile";
+@import "layout/*";
+@import "ui/*";
diff --git app/assets/stylesheets/layout/_common.scss app/assets/stylesheets/layout/_common.scss
index e598ffc..05a5721 100644
--- app/assets/stylesheets/layout/_common.scss
+++ app/assets/stylesheets/layout/_common.scss
@@ -1,3 +1,5 @@
+@import "../base/*";
+
 body {
   background: $color-yellow;
   font-family: $base-font-family;
diff --git app/assets/stylesheets/layout/_footer.scss app/assets/stylesheets/layout/_footer.scss
index e502ed1..54fec2f 100644
--- app/assets/stylesheets/layout/_footer.scss
+++ app/assets/stylesheets/layout/_footer.scss
@@ -1,3 +1,5 @@
+@import "../base/*";
+
 .footer {
   height: 62px;
   .dedication {
diff --git app/assets/stylesheets/layout/_header.scss app/assets/stylesheets/layout/_header.scss
index f3d2f37..cf7a52c 100644
--- app/assets/stylesheets/layout/_header.scss
+++ app/assets/stylesheets/layout/_header.scss
@@ -1,3 +1,5 @@
+@import "../base/*";
+
 #forkme {
 	display: none;
 }
diff --git app/assets/stylesheets/layout/_home.scss app/assets/stylesheets/layout/_home.scss
index 32cf422..3a04eea 100644
--- app/assets/stylesheets/layout/_home.scss
+++ app/assets/stylesheets/layout/_home.scss
@@ -1,3 +1,5 @@
+@import "../base/*";
+
 /*********************************************************************
 *  Home Signed In
 *********************************************************************/
diff --git app/assets/stylesheets/layout/_login.scss app/assets/stylesheets/layout/_login.scss
index 0afa63e..2c110cb 100644
--- app/assets/stylesheets/layout/_login.scss
+++ app/assets/stylesheets/layout/_login.scss
@@ -1,3 +1,5 @@
+@import "../base/*";
+
 // Login
 
 .login-form-container {
diff --git app/assets/stylesheets/layout/_profile.scss app/assets/stylesheets/layout/_profile.scss
index 751dbb8..29f2858 100644
--- app/assets/stylesheets/layout/_profile.scss
+++ app/assets/stylesheets/layout/_profile.scss
@@ -1,3 +1,6 @@
+@import "bootstrap";
+@import "../base/*";
+
 .profile {
 	padding-top: 35px;
 	background: #e5e3d3;
diff --git app/assets/stylesheets/layout/_screencast_list.scss app/assets/stylesheets/layout/_screencast_list.scss
index e3f1f9c..ae0fd7c 100644
--- app/assets/stylesheets/layout/_screencast_list.scss
+++ app/assets/stylesheets/layout/_screencast_list.scss
@@ -1,3 +1,5 @@
+@import "../base/*";
+
 .sub-header {
 	height: 120px;
 }
diff --git app/assets/stylesheets/layout/_screencast_new.scss app/assets/stylesheets/layout/_screencast_new.scss
index a6a0b9e..dd43a8d 100644
--- app/assets/stylesheets/layout/_screencast_new.scss
+++ app/assets/stylesheets/layout/_screencast_new.scss
@@ -1,3 +1,5 @@
+@import "../base/*";
+
 .new-cast {
   min-height: 1024px;
   padding-top: 35px;
@@ -23,4 +25,4 @@
     box-shadow: none;
     transition: none;
   }
-}
\ No newline at end of file
+}
diff --git app/assets/stylesheets/layout/_screencast_show.scss app/assets/stylesheets/layout/_screencast_show.scss
index 5c7e7ea..ba9d9f1 100644
--- app/assets/stylesheets/layout/_screencast_show.scss
+++ app/assets/stylesheets/layout/_screencast_show.scss
@@ -1,3 +1,5 @@
+@import "../base/*";
+
 .screencast-header {
 	padding: 30px 14px;
 	.show-all {