Merge d1fdd85 into 3b0e13d

kandanapp · Apr 17, 2014 · 0428bb6 · 0428bb6
2 parents 3b0e13d + d1fdd85
commit 0428bb6
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -37,6 +37,7 @@ group :assets do
   gem 'eco'
   gem 'uglifier'
   gem 'bootstrap-sass'
+  gem 'sass', '3.2.13'
   gem 'gemoji'
 end
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -251,7 +251,7 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    sass (3.3.4)
+    sass (3.2.13)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
@@ -336,6 +336,7 @@ DEPENDENCIES
   rails (= 3.2.16)
   remotipart
   rspec-rails
+  sass (= 3.2.13)
   sass-rails
   shoulda-matchers
   simplecov

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -22,3 +22,4 @@
 //= require lib/jquery.atwho
 //= require lib/jquery.caret
 //= require lib/jquery.inputHistory
+//= require bootstrap
diff --git a/app/assets/stylesheets/_variables.sass b/app/assets/stylesheets/_variables.sass
@@ -11,7 +11,7 @@ $header-bg-1: #566569
 $header-bg-2: #3f494b
 
 $sidebar-bg: $neutral-color
-$sidebar-width: 230px
+$sidebar-width: 240px
 
 $medium: 768px
 $large: 1024px

diff --git a/app/views/layouts/_messages.html.erb b/app/views/layouts/_messages.html.erb
@@ -0,0 +1,11 @@
+<% unless controller.controller_name == 'channels' || controller.controller_name == 'main' %>
+  <!-- Rails flash messages styled for Bootstrap -->
+  <% flash.each do |name, msg| %>
+    <% if msg.is_a?(String) %>
+      <div class="alert alert-<%=name == :notice ? "success" : "danger"%> fade in" >
+        <button class="close" data-dismiss="alert">&times;</button>
+        <%= msg %>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -23,6 +23,7 @@
   <% end %>
   <article class="main-area">
     <%= render "layouts/header" %>
+    <%= render "layouts/messages" %>
     <%= yield %>
   </article>
   <%= yield :end %>