Merge branch 'master' of https://github.com/mars2686/Kariakoo-Commodi…

…ties
jasnow · Jan 28, 2012 · 91baece · 91baece
2 parents dd49b7c + 4057d92
commit 91baece
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 4 deletions.
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -6,4 +6,5 @@
 //
 //= require jquery
 //= require jquery_ujs
+//= require twitter/bootstrap
 //= require_tree .
diff --git a/app/assets/javascripts/bootstrap.js.coffee b/app/assets/javascripts/bootstrap.js.coffee
@@ -0,0 +1,19 @@
+$ ->
+  $("body > .topbar").scrollSpy()
+$ ->
+  $(".tabs").tabs()
+$ ->
+  $("a[rel=twipsy]").twipsy live: true
+$ ->
+  $("a[rel=popover]").popover offset: 10
+$ ->
+  $(".topbar-wrapper").dropdown()
+$ ->
+  $(".alert-message").alert()
+$ ->
+  domModal = $(".modal").modal(
+    backdrop: true
+    closeOnEscape: true
+  )
+  $(".open-modal").click ->
+    domModal.toggle()  
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -3,5 +3,6 @@
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require_self
+ *= require twitter/bootstrap
  *= require_tree . 
 */
diff --git a/app/assets/stylesheets/bootstrap.css.less b/app/assets/stylesheets/bootstrap.css.less
@@ -0,0 +1,5 @@
+@import "twitter/bootstrap";
+
+// Baseline grid
+@basefont:          13px;
+@baseline:          18px;
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -1,12 +1,21 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Kanakoo</title>
-  <%= stylesheet_link_tag    "application" %>
-  <%= javascript_include_tag "application" %>
-  <%= csrf_meta_tags %>
+	<title>Kanakoo</title>
+	<%= stylesheet_link_tag		 "application" %>
+	<%= javascript_include_tag "application" %>
+	<%= csrf_meta_tags %>
 </head>
 <body>
+<div class="topbar">
+	<div class="topbar-inner">
+		<div class="container">
+			<h3>
+				<a href="/">Kariokee - The db you were waiting for!</a>
+			</h3>
+		</div>
+</div>
+</div>
 
 <%= yield %>