Permalink
Browse files

css

  • Loading branch information...
1 parent f872463 commit 162b95d4a8d61c995c3f11fe397a17fb11dc63c0 johndavid400 committed Apr 11, 2012
Showing with 45 additions and 25 deletions.
  1. +2 −1 Gemfile
  2. +10 −5 Gemfile.lock
  3. +4 −19 app/assets/javascripts/bootstrap.js.coffee
  4. +29 −0 app/assets/stylesheets/bootstrap_and_overrides.css.less
View
3 Gemfile
@@ -9,7 +9,8 @@ gem 'haml'
gem 'haml-rails', :group => :development
gem 'simple_form'
gem "paperclip", "~> 2.4"
-gem 'twitter-bootstrap-rails'
+#gem 'twitter-bootstrap-rails'
+gem 'twitter-bootstrap-rails', :git => 'git://github.com/seyhunak/twitter-bootstrap-rails.git'
gem 'jquery-rails'
# Gemfile in Rails >= 3.1
View
15 Gemfile.lock
@@ -10,6 +10,15 @@ GIT
workflow (= 0.8.0)
GIT
+ remote: git://github.com/seyhunak/twitter-bootstrap-rails.git
+ revision: b3a0888007525b7c6f9bdb5a7c3190f5edb62d18
+ specs:
+ twitter-bootstrap-rails (2.0.6)
+ actionpack (>= 3.1)
+ less-rails (~> 2.2.0)
+ railties (>= 3.1)
+
+GIT
remote: git://github.com/spree/spree_analytics
revision: 23767dfbe2751f922d9478c36417bbb59c5d51ea
specs:
@@ -344,10 +353,6 @@ GEM
polyglot (>= 0.3.1)
turn (0.8.2)
ansi (>= 1.2.2)
- twitter-bootstrap-rails (2.0.6)
- actionpack (>= 3.1)
- less-rails (~> 2.2.0)
- railties (>= 3.1)
tzinfo (0.3.33)
uglifier (1.2.4)
execjs (>= 0.3.0)
@@ -393,5 +398,5 @@ DEPENDENCIES
spree_robotics!
therubyracer
turn (= 0.8.2)
- twitter-bootstrap-rails
+ twitter-bootstrap-rails!
uglifier
View
23 app/assets/javascripts/bootstrap.js.coffee
@@ -1,19 +1,4 @@
-$ ->
- $("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()
+jQuery ->
+ $("a[rel=popover]").popover()
+ $(".tooltip").tooltip()
+ $("a[rel=tooltip]").tooltip()
View
29 app/assets/stylesheets/bootstrap_and_overrides.css.less
@@ -0,0 +1,29 @@
+@import "twitter/bootstrap/bootstrap";
+body { padding-top: 60px; }
+
+@import "twitter/bootstrap/responsive";
+
+// Set the correct sprite paths
+@iconSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings.png');
+@iconWhiteSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings-white.png');
+
+// Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines)
+@fontAwesomeEotPath: asset-path('fontawesome-webfont.eot');
+@fontAwesomeWoffPath: asset-path('fontawesome-webfont.woff');
+@fontAwesomeTtfPath: asset-path('fontawesome-webfont.ttf');
+@fontAwesomeSvgzPath: asset-path('fontawesome-webfont.svgz');
+@fontAwesomeSvgPath: asset-path('fontawesome-webfont.svg');
+
+// Font Awesome
+@import "fontawesome";
+
+// Your custom LESS stylesheets goes here
+//
+// Since bootstrap was imported above you have access to its mixins which
+// you may use and inherit here
+//
+// If you'd like to override bootstrap's own variables, you can do so here as well
+// See http://twitter.github.com/bootstrap/less.html for their names and documentation
+//
+// Example:
+// @linkColor: #ff0000;

0 comments on commit 162b95d

Please sign in to comment.