remove less dependency
This commit is contained in:
@@ -14,7 +14,7 @@ gem 'rack-cors', :require => 'rack/cors'
|
|||||||
group :assets do
|
group :assets do
|
||||||
gem 'sass-rails', '~> 3.2.3'
|
gem 'sass-rails', '~> 3.2.3'
|
||||||
gem 'coffee-rails', '~> 3.2.1'
|
gem 'coffee-rails', '~> 3.2.1'
|
||||||
gem 'twitter-bootstrap-rails'
|
#gem 'twitter-bootstrap-rails'
|
||||||
gem 'bootstrap-sass'
|
gem 'bootstrap-sass'
|
||||||
gem 'compass-rails'
|
gem 'compass-rails'
|
||||||
|
|
||||||
@@ -28,7 +28,7 @@ end
|
|||||||
gem 'jquery-rails'
|
gem 'jquery-rails'
|
||||||
gem 'haml-rails'
|
gem 'haml-rails'
|
||||||
gem 'slim-rails'
|
gem 'slim-rails'
|
||||||
gem 'less-rails'
|
#gem 'less-rails'
|
||||||
|
|
||||||
gem 'couch_potato' , :git => 'git://github.com/bterkuile/couch_potato.git'
|
gem 'couch_potato' , :git => 'git://github.com/bterkuile/couch_potato.git'
|
||||||
gem 'simply_stored' , :git => 'git://github.com/bterkuile/simply_stored.git'
|
gem 'simply_stored' , :git => 'git://github.com/bterkuile/simply_stored.git'
|
||||||
|
|||||||
@@ -70,7 +70,6 @@ GEM
|
|||||||
coffee-script-source
|
coffee-script-source
|
||||||
execjs
|
execjs
|
||||||
coffee-script-source (1.4.0)
|
coffee-script-source (1.4.0)
|
||||||
commonjs (0.2.6)
|
|
||||||
compass (0.12.2)
|
compass (0.12.2)
|
||||||
chunky_png (~> 1.2)
|
chunky_png (~> 1.2)
|
||||||
fssm (>= 0.2.7)
|
fssm (>= 0.2.7)
|
||||||
@@ -131,11 +130,6 @@ GEM
|
|||||||
kaminari-bootstrap (0.1.3)
|
kaminari-bootstrap (0.1.3)
|
||||||
kaminari (>= 0.13.0)
|
kaminari (>= 0.13.0)
|
||||||
rails
|
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)
|
libwebsocket (0.1.7.1)
|
||||||
addressable
|
addressable
|
||||||
websocket
|
websocket
|
||||||
@@ -248,10 +242,6 @@ GEM
|
|||||||
treetop (1.4.12)
|
treetop (1.4.12)
|
||||||
polyglot
|
polyglot
|
||||||
polyglot (>= 0.3.1)
|
polyglot (>= 0.3.1)
|
||||||
twitter-bootstrap-rails (2.1.7)
|
|
||||||
actionpack (>= 3.1)
|
|
||||||
execjs
|
|
||||||
railties (>= 3.1)
|
|
||||||
tzinfo (0.3.35)
|
tzinfo (0.3.35)
|
||||||
uglifier (1.3.0)
|
uglifier (1.3.0)
|
||||||
execjs (>= 0.3.0)
|
execjs (>= 0.3.0)
|
||||||
@@ -278,7 +268,6 @@ DEPENDENCIES
|
|||||||
haml-rails
|
haml-rails
|
||||||
jquery-rails
|
jquery-rails
|
||||||
kaminari-bootstrap
|
kaminari-bootstrap
|
||||||
less-rails
|
|
||||||
mini_magick
|
mini_magick
|
||||||
mustache
|
mustache
|
||||||
pry
|
pry
|
||||||
@@ -293,5 +282,4 @@ DEPENDENCIES
|
|||||||
slim-rails
|
slim-rails
|
||||||
steak
|
steak
|
||||||
thin
|
thin
|
||||||
twitter-bootstrap-rails
|
|
||||||
uglifier (>= 1.0.3)
|
uglifier (>= 1.0.3)
|
||||||
|
|||||||
@@ -13,6 +13,6 @@
|
|||||||
//= require jquery
|
//= require jquery
|
||||||
//= require jquery_ujs
|
//= require jquery_ujs
|
||||||
//= require jquery-ui
|
//= require jquery-ui
|
||||||
//= require twitter/bootstrap
|
//= require bootstrap
|
||||||
//= require_directory .
|
//= require_directory .
|
||||||
//= require_self
|
//= require_self
|
||||||
|
|||||||
@@ -12,7 +12,20 @@
|
|||||||
//= require jquery
|
//= require jquery
|
||||||
//= require jquery_ujs
|
//= require jquery_ujs
|
||||||
//= require jquery-ui
|
//= 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 mustache
|
||||||
//= require faye
|
//= require faye
|
||||||
//= require supplier/base
|
//= require supplier/base
|
||||||
|
|||||||
@@ -12,20 +12,20 @@
|
|||||||
//
|
//
|
||||||
//= require jquery
|
//= require jquery
|
||||||
//= require jquery_ujs
|
//= require jquery_ujs
|
||||||
// require twitter/bootstrap
|
// require bootstrap-transition
|
||||||
//= require twitter/bootstrap/bootstrap-transition
|
// require bootstrap-affix
|
||||||
//= require twitter/bootstrap/bootstrap-alert
|
// require bootstrap-alert
|
||||||
//= require twitter/bootstrap/bootstrap-modal
|
// require bootstrap-button
|
||||||
//= require twitter/bootstrap/bootstrap-dropdown
|
// require bootstrap-carousel
|
||||||
//= require twitter/bootstrap/bootstrap-scrollspy
|
// require bootstrap-collapse
|
||||||
//= require twitter/bootstrap/bootstrap-tab
|
// require bootstrap-dropdown
|
||||||
//= require twitter/bootstrap/bootstrap-tooltip
|
// require bootstrap-modal
|
||||||
//= require twitter/bootstrap/bootstrap-popover
|
// require bootstrap-scrollspy
|
||||||
//= require twitter/bootstrap/bootstrap-button
|
// require bootstrap-tab
|
||||||
//= require twitter/bootstrap/bootstrap-collapse
|
// require bootstrap-tooltip
|
||||||
// require twitter/bootstrap/bootstrap-carousel
|
// require bootstrap-popover
|
||||||
//= require twitter/bootstrap/bootstrap-typeahead
|
// require bootstrap-typeahead
|
||||||
//= require twitter/bootstrap/bootstrap-affix
|
//= require bootstrap
|
||||||
//= require qwaiter
|
//= require qwaiter
|
||||||
//= require supplier/order
|
//= require supplier/order
|
||||||
//= require mustache
|
//= require mustache
|
||||||
|
|||||||
+6
-8
@@ -1,13 +1,11 @@
|
|||||||
@import "twitter/bootstrap/bootstrap";
|
@import "bootstrap"
|
||||||
body {
|
body
|
||||||
padding-top: 60px;
|
padding-top: 60px !important
|
||||||
}
|
@import "bootstrap-responsive"
|
||||||
|
|
||||||
@import "twitter/bootstrap/responsive";
|
|
||||||
|
|
||||||
// Set the correct sprite paths
|
// Set the correct sprite paths
|
||||||
@iconSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings.png');
|
//@iconSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings.png');
|
||||||
@iconWhiteSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings-white.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)
|
// 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
|
// Note: If you use asset_path() here, your compiled boostrap_and_overrides.css will not
|
||||||
@@ -9,6 +9,6 @@
|
|||||||
<td class="actions">
|
<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 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>
|
<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"> </span></a>
|
||||||
</td>
|
</td>
|
||||||
<tr>
|
<tr>
|
||||||
|
|||||||
Reference in New Issue
Block a user