remove less dependency

This commit is contained in:
2012-12-05 13:16:05 +01:00
parent a184a6d551
commit 5ba5762d9f
8 changed files with 38 additions and 39 deletions
+2 -2
View File
@@ -14,7 +14,7 @@ gem 'rack-cors', :require => 'rack/cors'
group :assets do
gem 'sass-rails', '~> 3.2.3'
gem 'coffee-rails', '~> 3.2.1'
gem 'twitter-bootstrap-rails'
#gem 'twitter-bootstrap-rails'
gem 'bootstrap-sass'
gem 'compass-rails'
@@ -28,7 +28,7 @@ end
gem 'jquery-rails'
gem 'haml-rails'
gem 'slim-rails'
gem 'less-rails'
#gem 'less-rails'
gem 'couch_potato' , :git => 'git://github.com/bterkuile/couch_potato.git'
gem 'simply_stored' , :git => 'git://github.com/bterkuile/simply_stored.git'
-12
View File
@@ -70,7 +70,6 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.4.0)
commonjs (0.2.6)
compass (0.12.2)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
@@ -131,11 +130,6 @@ GEM
kaminari-bootstrap (0.1.3)
kaminari (>= 0.13.0)
rails
less (2.2.2)
commonjs (~> 0.2.6)
less-rails (2.2.6)
actionpack (>= 3.1)
less (~> 2.2.0)
libwebsocket (0.1.7.1)
addressable
websocket
@@ -248,10 +242,6 @@ GEM
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
twitter-bootstrap-rails (2.1.7)
actionpack (>= 3.1)
execjs
railties (>= 3.1)
tzinfo (0.3.35)
uglifier (1.3.0)
execjs (>= 0.3.0)
@@ -278,7 +268,6 @@ DEPENDENCIES
haml-rails
jquery-rails
kaminari-bootstrap
less-rails
mini_magick
mustache
pry
@@ -293,5 +282,4 @@ DEPENDENCIES
slim-rails
steak
thin
twitter-bootstrap-rails
uglifier (>= 1.0.3)
+1 -1
View File
@@ -13,6 +13,6 @@
//= require jquery
//= require jquery_ujs
//= require jquery-ui
//= require twitter/bootstrap
//= require bootstrap
//= require_directory .
//= require_self
+14 -1
View File
@@ -12,7 +12,20 @@
//= require jquery
//= require jquery_ujs
//= require jquery-ui
//= require twitter/bootstrap
// require bootstrap-transition
// require bootstrap-affix
// require bootstrap-alert
// require bootstrap-button
// require bootstrap-carousel
// require bootstrap-collapse
// require bootstrap-dropdown
// require bootstrap-modal
// require bootstrap-scrollspy
// require bootstrap-tab
// require bootstrap-tooltip
// require bootstrap-popover
// require bootstrap-typeahead
//= require bootstrap
//= require mustache
//= require faye
//= require supplier/base
+14 -14
View File
@@ -12,20 +12,20 @@
//
//= require jquery
//= require jquery_ujs
// require twitter/bootstrap
//= require twitter/bootstrap/bootstrap-transition
//= require twitter/bootstrap/bootstrap-alert
//= require twitter/bootstrap/bootstrap-modal
//= require twitter/bootstrap/bootstrap-dropdown
//= require twitter/bootstrap/bootstrap-scrollspy
//= require twitter/bootstrap/bootstrap-tab
//= require twitter/bootstrap/bootstrap-tooltip
//= require twitter/bootstrap/bootstrap-popover
//= require twitter/bootstrap/bootstrap-button
//= require twitter/bootstrap/bootstrap-collapse
// require twitter/bootstrap/bootstrap-carousel
//= require twitter/bootstrap/bootstrap-typeahead
//= require twitter/bootstrap/bootstrap-affix
// require bootstrap-transition
// require bootstrap-affix
// require bootstrap-alert
// require bootstrap-button
// require bootstrap-carousel
// require bootstrap-collapse
// require bootstrap-dropdown
// require bootstrap-modal
// require bootstrap-scrollspy
// require bootstrap-tab
// require bootstrap-tooltip
// require bootstrap-popover
// require bootstrap-typeahead
//= require bootstrap
//= require qwaiter
//= require supplier/order
//= require mustache
@@ -1,13 +1,11 @@
@import "twitter/bootstrap/bootstrap";
body {
padding-top: 60px;
}
@import "twitter/bootstrap/responsive";
@import "bootstrap"
body
padding-top: 60px !important
@import "bootstrap-responsive"
// Set the correct sprite paths
@iconSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings.png');
@iconWhiteSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings-white.png');
//@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)
// Note: If you use asset_path() here, your compiled boostrap_and_overrides.css will not
+1 -1
View File
@@ -9,6 +9,6 @@
<td class="actions">
<button id="list-is-helped-button-{{id}}" class="btn btn-info {{^needs_help}}hide{{/needs_help}}" onclick="Qsupplier.mark_list_as_helped('{{id}}')">Question answered!</button>
<button class="btn btn-warning" onclick="Qsupplier.close_list('{{id}}')">Close!</button>
<a href="/supplier/lists/{{id}}" class="btn icon-list"></a>
<a href="/supplier/lists/{{id}}" class="btn"><span class="icon-list">&nbsp;</span></a>
</td>
<tr>