stylesheets are basically now being served from sprockets

Gemfile

@@ -107,6 +107,15 @@ gem 'sass'
 gem 'will_paginate'
 gem 'client_side_validations'
 
+# assets
+
+group :assets do
+  gem 'sass-rails'
+  gem 'uglifier'
+end
+
+gem 'jquery-rails'
+
 # web
 
 gem 'faraday'

Gemfile.lock

@@ -145,6 +145,8 @@ GEM
     erubis (2.7.0)
     eventmachine (1.0.0.beta.4)
     excon (0.12.0)
+    execjs (1.3.0)
+      multi_json (~> 1.0)
     factory_girl (2.6.4)
       activesupport (>= 2.3.9)
     factory_girl_rails (1.7.0)
@@ -219,7 +221,14 @@ GEM
       rspec (>= 1.3.1)
       selenium-webdriver (>= 0.1.3)
     jasmine-core (1.1.0)
+<<<<<<< HEAD
     json (1.6.6)
+=======
+    jquery-rails (1.0.19)
+      railties (~> 3.0)
+      thor (~> 0.14)
+    json (1.6.5)
+>>>>>>> stylesheets are basically now being served from sprockets
     jsonpath (0.5.0)
       multi_json
     jwt (0.1.4)
@@ -390,6 +399,11 @@ GEM
     s3 (0.3.11)
       proxies (~> 0.2.0)
     sass (3.1.15)
+    sass-rails (3.1.6)
+      actionpack (~> 3.1.0)
+      railties (~> 3.1.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3.2)
     selenium-webdriver (2.16.0)
       childprocess (>= 0.2.5)
       ffi (~> 1.0.9)
@@ -425,6 +439,9 @@ GEM
     typhoeus (0.3.3)
       mime-types
     tzinfo (0.3.32)
+    uglifier (1.2.3)
+      execjs (>= 0.3.0)
+      multi_json (>= 1.0.2)
     unicorn (4.2.0)
       kgio (~> 2.6)
       rack
@@ -486,6 +503,7 @@ DEPENDENCIES
   i18n-inflector-rails (~> 1.0)
   jammit-s3
   jasmine (~> 1.1.2)
+  jquery-rails
   json
   jwt
   linecache (= 0.46)
@@ -528,6 +546,7 @@ DEPENDENCIES
   ruby-debug19
   ruby-oembed (~> 0.8.7)
   sass
+  sass-rails
   selenium-webdriver (~> 2.16.0)
   settingslogic!
   sqlite3
@@ -535,6 +554,7 @@ DEPENDENCIES
   timecop
   twitter (= 2.0.2)
   typhoeus
+  uglifier
   unicorn (~> 4.2.0)
   webmock
   whenever

public/stylesheets/sass/application.sass → app/assets/stylesheets/application.css.sass

-//   licensed under the Affero General Public License version 3 or later.  See
-//   the COPYRIGHT file.
+//= require_self
+//= require ui
 
-@import 'mixins'
+@import '_mixins.css.scss'
 
 /* ====== media ====== */
 .media
@@ -684,7 +684,7 @@ form p.checkbox_select
 *:-moz-placeholder
   @include placeholder_styles
 
-#file-upload 
+#file-upload
   input
     :height 100%
     :width 100%
@@ -777,7 +777,7 @@ form p.checkbox_select
     :position absolute !important
     :right 6px
     :cursor pointer
-    
+
 
     input[type='file']
       :cursor pointer

app/assets/stylesheets/blueprint.css

+/*
+//= require vendor/blueprint/screen
+*/
\ No newline at end of file

app/assets/stylesheets/bootstrap.css

+/*
+*= require vendor/bootstrap
+*= require vendor/bootstrap-responsive
+*/
\ No newline at end of file

app/assets/stylesheets/default.css

+/*
+*= require media-box
+*= require loader
+*= require lightbox
+*= require autocomplete
+*= require mentions
+*= require tags
+*= require hovercard
+
+*= require vendor/interim-bootstrap
+*= require vendor/facebox
+*= require vendor/fileuploader
+*= require vendor/autoSuggest
+*/
\ No newline at end of file

public/stylesheets/sass/hovercard.scss → app/assets/stylesheets/hovercard.css.scss

-@import "mixins";
+@import "_mixins.css.scss";
 
 #hovercard {
   @include border-radius(2px);

public/stylesheets/sass/lightbox.scss → app/assets/stylesheets/lightbox.css.scss

 //   licensed under the Affero General Public License version 3 or later.  See
 //   the COPYRIGHT file.
 
-@import 'mixins';
+@import '_mixins.css.scss';
 
 #lightbox{
   z-index: 1003;

public/stylesheets/sass/login.scss → app/assets/stylesheets/login.css.scss

+//= require_self
+
 //   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 //   licensed under the Affero General Public License version 3 or later.  See
 //   the COPYRIGHT file.
 
-@import "mixins";
+@import "_mixins.css.scss";
 
 #login {
   width: 400px;

public/stylesheets/sass/mentions.scss → app/assets/stylesheets/mentions.css.scss

 
-@import 'mixins';
+@import '_mixins.css.scss';
 
 .mentions-input-box {
   background: #fff;

public/stylesheets/sass/mobile.scss → app/assets/stylesheets/mobile.css.scss

-@import "mixins";
+//= require_self
+//= require vendor/bootstrap
+//= require vendor/bootstrap-responsive
+
+@import "_mixins.css.scss";
 
 $blue: #3f8fba;
 

public/stylesheets/sass/new-templates.scss → app/assets/stylesheets/new-templates.css.scss

-/* variables */
+//= require_self
 
+/* variables */
 $light-grey: #999;
 $pane-width: 420px;
 
@@ -808,4 +809,4 @@ text-rendering: optimizelegibility;
 
 .headline p{
   @include media-text();
-}
\ No newline at end of file
+}

public/stylesheets/sass/rtl.sass → app/assets/stylesheets/rtl.css.sass

+//= require_self
+
 body
   :direction rtl
   :text-align right