Cleanup for mobile build without errors
This commit is contained in:
@@ -45,7 +45,8 @@ gem 'couchbase-docstore'
|
|||||||
gem 'couchbase-structures', github: 'bterkuile/couchbase-structures'
|
gem 'couchbase-structures', github: 'bterkuile/couchbase-structures'
|
||||||
|
|
||||||
gem 'couch_potato' , github: 'bterkuile/couch_potato'
|
gem 'couch_potato' , github: 'bterkuile/couch_potato'
|
||||||
gem 'simply_stored', path: './../components/simply_stored' #, github: 'bterkuile/simply_stored'
|
#gem 'simply_stored', path: './../components/simply_stored' #, github: 'bterkuile/simply_stored'
|
||||||
|
gem 'simply_stored', github: 'bterkuile/simply_stored'
|
||||||
#gem 'orm_adapter', github: 'bterkuile/orm_adapter'
|
#gem 'orm_adapter', github: 'bterkuile/orm_adapter'
|
||||||
gem 'devise' #, '3.1.0' #, '2.0.4'
|
gem 'devise' #, '3.1.0' #, '2.0.4'
|
||||||
gem 'devise_simply_stored', github: 'bterkuile/devise_simply_stored'
|
gem 'devise_simply_stored', github: 'bterkuile/devise_simply_stored'
|
||||||
@@ -53,8 +54,9 @@ gem "omniauth-facebook"
|
|||||||
gem 'simple_form'
|
gem 'simple_form'
|
||||||
gem 'active_decorator' #, path: '/Users/bterkuile/companytools/development/rails/components/active_decorator'
|
gem 'active_decorator' #, path: '/Users/bterkuile/companytools/development/rails/components/active_decorator'
|
||||||
#gem 'cmtool', github: 'bterkuile/cmtool'
|
#gem 'cmtool', github: 'bterkuile/cmtool'
|
||||||
gem 'paperclip', '3.5.2' # cmtool
|
gem 'paperclip' #, '3.5.2' # cmtool
|
||||||
gem 'cmtool', path: './../cmtool'
|
#gem 'cmtool', path: './../cmtool'
|
||||||
|
gem 'cmtool', github: 'bterkuile/cmtool'
|
||||||
gem 'kaminari'
|
gem 'kaminari'
|
||||||
|
|
||||||
gem 'rqrcode'
|
gem 'rqrcode'
|
||||||
|
|||||||
+61
-55
@@ -1,3 +1,15 @@
|
|||||||
|
GIT
|
||||||
|
remote: git://github.com/bterkuile/cmtool.git
|
||||||
|
revision: 05fce4c40a0c90e7e859ee331c7e9756716c1239
|
||||||
|
specs:
|
||||||
|
cmtool (1.0.0)
|
||||||
|
bourbon
|
||||||
|
email_validator
|
||||||
|
haml-rails
|
||||||
|
jquery-rails
|
||||||
|
slim-rails
|
||||||
|
tinymce-rails
|
||||||
|
|
||||||
GIT
|
GIT
|
||||||
remote: git://github.com/bterkuile/couch_potato.git
|
remote: git://github.com/bterkuile/couch_potato.git
|
||||||
revision: 6fbcb3edcaf3edec63230308f123c1e03417967d
|
revision: 6fbcb3edcaf3edec63230308f123c1e03417967d
|
||||||
@@ -23,19 +35,9 @@ GIT
|
|||||||
devise_simply_stored (0.3.0)
|
devise_simply_stored (0.3.0)
|
||||||
devise
|
devise
|
||||||
|
|
||||||
PATH
|
GIT
|
||||||
remote: ./../cmtool
|
remote: git://github.com/bterkuile/simply_stored.git
|
||||||
specs:
|
revision: 7e29edef26f6e598c0804ba28929e2fad7045931
|
||||||
cmtool (1.0.0)
|
|
||||||
bourbon
|
|
||||||
email_validator
|
|
||||||
haml-rails
|
|
||||||
jquery-rails
|
|
||||||
slim-rails
|
|
||||||
tinymce-rails
|
|
||||||
|
|
||||||
PATH
|
|
||||||
remote: ./../components/simply_stored
|
|
||||||
specs:
|
specs:
|
||||||
simply_stored (1.0.0)
|
simply_stored (1.0.0)
|
||||||
activesupport
|
activesupport
|
||||||
@@ -88,7 +90,7 @@ GEM
|
|||||||
sass (~> 3.2)
|
sass (~> 3.2)
|
||||||
thor
|
thor
|
||||||
builder (3.2.2)
|
builder (3.2.2)
|
||||||
capybara (2.2.1)
|
capybara (2.4.1)
|
||||||
mime-types (>= 1.16)
|
mime-types (>= 1.16)
|
||||||
nokogiri (>= 1.3.3)
|
nokogiri (>= 1.3.3)
|
||||||
rack (>= 1.0.0)
|
rack (>= 1.0.0)
|
||||||
@@ -109,10 +111,10 @@ GEM
|
|||||||
coffee-script-source
|
coffee-script-source
|
||||||
execjs
|
execjs
|
||||||
coffee-script-source (1.7.0)
|
coffee-script-source (1.7.0)
|
||||||
connection_pool (1.2.0)
|
connection_pool (2.0.0)
|
||||||
cookiejar (0.3.2)
|
cookiejar (0.3.2)
|
||||||
couchbase (1.3.7)
|
couchbase (1.3.8)
|
||||||
connection_pool (~> 1.0, >= 1.0.0)
|
connection_pool (>= 1.0.0, <= 3.0.0)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
yaji (~> 0.3, >= 0.3.2)
|
yaji (~> 0.3, >= 0.3.2)
|
||||||
couchbase-docstore (0.3.0)
|
couchbase-docstore (0.3.0)
|
||||||
@@ -132,7 +134,7 @@ GEM
|
|||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
warden (~> 1.2.3)
|
warden (~> 1.2.3)
|
||||||
diff-lcs (1.2.5)
|
diff-lcs (1.2.5)
|
||||||
docile (1.1.3)
|
docile (1.1.5)
|
||||||
em-http-request (1.1.2)
|
em-http-request (1.1.2)
|
||||||
addressable (>= 2.3.4)
|
addressable (>= 2.3.4)
|
||||||
cookiejar
|
cookiejar
|
||||||
@@ -143,7 +145,7 @@ GEM
|
|||||||
eventmachine (>= 1.0.0.beta.4)
|
eventmachine (>= 1.0.0.beta.4)
|
||||||
email_validator (1.4.0)
|
email_validator (1.4.0)
|
||||||
activemodel
|
activemodel
|
||||||
ember-data-source (1.0.0.beta.7)
|
ember-data-source (1.0.0.beta.8)
|
||||||
ember-source
|
ember-source
|
||||||
ember-rails (0.15.0)
|
ember-rails (0.15.0)
|
||||||
active_model_serializers
|
active_model_serializers
|
||||||
@@ -159,10 +161,10 @@ GEM
|
|||||||
emblem-rails (0.2.1)
|
emblem-rails (0.2.1)
|
||||||
barber-emblem (~> 0.1.1)
|
barber-emblem (~> 0.1.1)
|
||||||
ember-rails (>= 0.14.0)
|
ember-rails (>= 0.14.0)
|
||||||
emblem-source (0.3.15)
|
emblem-source (0.3.16)
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
eventmachine (1.0.3)
|
eventmachine (1.0.3)
|
||||||
execjs (2.0.2)
|
execjs (2.2.1)
|
||||||
factory_girl (4.4.0)
|
factory_girl (4.4.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
factory_girl_rails (4.4.1)
|
factory_girl_rails (4.4.1)
|
||||||
@@ -178,12 +180,12 @@ GEM
|
|||||||
multi_json (>= 1.0.0)
|
multi_json (>= 1.0.0)
|
||||||
rack (>= 1.0.0)
|
rack (>= 1.0.0)
|
||||||
websocket-driver (>= 0.3.0)
|
websocket-driver (>= 0.3.0)
|
||||||
faye-websocket (0.7.3)
|
faye-websocket (0.7.4)
|
||||||
eventmachine (>= 0.12.0)
|
eventmachine (>= 0.12.0)
|
||||||
websocket-driver (>= 0.3.1)
|
websocket-driver (>= 0.3.1)
|
||||||
font-awesome-rails (4.1.0.0)
|
font-awesome-rails (4.1.0.0)
|
||||||
railties (>= 3.2, < 5.0)
|
railties (>= 3.2, < 5.0)
|
||||||
foundation-rails (5.2.2.0)
|
foundation-rails (5.3.0.1)
|
||||||
railties (>= 3.1.0)
|
railties (>= 3.1.0)
|
||||||
sass (>= 3.2.0)
|
sass (>= 3.2.0)
|
||||||
fuubar (1.3.3)
|
fuubar (1.3.3)
|
||||||
@@ -199,21 +201,21 @@ GEM
|
|||||||
haml (>= 3.1, < 5.0)
|
haml (>= 3.1, < 5.0)
|
||||||
railties (>= 4.0.1)
|
railties (>= 4.0.1)
|
||||||
handlebars-source (1.3.0)
|
handlebars-source (1.3.0)
|
||||||
hashie (2.1.1)
|
hashie (2.1.2)
|
||||||
hike (1.2.3)
|
hike (1.2.3)
|
||||||
http_parser.rb (0.6.0)
|
http_parser.rb (0.6.0)
|
||||||
i18n (0.6.9)
|
i18n (0.6.9)
|
||||||
jquery-rails (3.1.0)
|
jquery-rails (3.1.1)
|
||||||
railties (>= 3.0, < 5.0)
|
railties (>= 3.0, < 5.0)
|
||||||
thor (>= 0.14, < 2.0)
|
thor (>= 0.14, < 2.0)
|
||||||
jquery-ui-rails (4.2.1)
|
jquery-ui-rails (5.0.0)
|
||||||
railties (>= 3.2.16)
|
railties (>= 3.2.16)
|
||||||
js-routes (0.9.8)
|
js-routes (0.9.8)
|
||||||
railties (>= 3.2)
|
railties (>= 3.2)
|
||||||
sprockets-rails
|
sprockets-rails
|
||||||
json (1.8.1)
|
json (1.8.1)
|
||||||
jwt (1.0.0)
|
jwt (1.0.0)
|
||||||
kaminari (0.15.1)
|
kaminari (0.16.1)
|
||||||
actionpack (>= 3.0.0)
|
actionpack (>= 3.0.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
launchy (2.4.2)
|
launchy (2.4.2)
|
||||||
@@ -223,13 +225,13 @@ GEM
|
|||||||
mail (2.5.4)
|
mail (2.5.4)
|
||||||
mime-types (~> 1.16)
|
mime-types (~> 1.16)
|
||||||
treetop (~> 1.4.8)
|
treetop (~> 1.4.8)
|
||||||
map (6.5.3)
|
map (6.5.4)
|
||||||
method_source (0.8.2)
|
method_source (0.8.2)
|
||||||
mime-types (1.25.1)
|
mime-types (1.25.1)
|
||||||
mini_magick (3.7.0)
|
mini_magick (3.7.0)
|
||||||
subexec (~> 0.2.1)
|
subexec (~> 0.2.1)
|
||||||
mini_portile (0.6.0)
|
mini_portile (0.6.0)
|
||||||
minitest (5.3.4)
|
minitest (5.3.5)
|
||||||
multi_json (1.10.1)
|
multi_json (1.10.1)
|
||||||
multi_xml (0.5.5)
|
multi_xml (0.5.5)
|
||||||
multipart-post (2.0.0)
|
multipart-post (2.0.0)
|
||||||
@@ -252,19 +254,19 @@ GEM
|
|||||||
oauth2 (~> 0.9.3)
|
oauth2 (~> 0.9.3)
|
||||||
omniauth (~> 1.2)
|
omniauth (~> 1.2)
|
||||||
orm_adapter (0.5.0)
|
orm_adapter (0.5.0)
|
||||||
paperclip (3.5.2)
|
paperclip (4.1.1)
|
||||||
activemodel (>= 3.0.0)
|
activemodel (>= 3.0.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
cocaine (~> 0.5.3)
|
cocaine (~> 0.5.3)
|
||||||
mime-types
|
mime-types
|
||||||
polyglot (0.3.4)
|
polyglot (0.3.5)
|
||||||
pry (0.9.12.6)
|
pry (0.10.0)
|
||||||
coderay (~> 1.0)
|
coderay (~> 1.1.0)
|
||||||
method_source (~> 0.8)
|
method_source (~> 0.8.1)
|
||||||
slop (~> 3.4)
|
slop (~> 3.4)
|
||||||
pry-rails (0.3.2)
|
pry-rails (0.3.2)
|
||||||
pry (>= 0.9.10)
|
pry (>= 0.9.10)
|
||||||
quiet_assets (1.0.2)
|
quiet_assets (1.0.3)
|
||||||
railties (>= 3.1, < 5.0)
|
railties (>= 3.1, < 5.0)
|
||||||
rack (1.5.2)
|
rack (1.5.2)
|
||||||
rack-cors (0.2.9)
|
rack-cors (0.2.9)
|
||||||
@@ -289,22 +291,26 @@ GEM
|
|||||||
rest-client (1.6.7)
|
rest-client (1.6.7)
|
||||||
mime-types (>= 1.16)
|
mime-types (>= 1.16)
|
||||||
rqrcode (0.4.2)
|
rqrcode (0.4.2)
|
||||||
rspec (2.14.1)
|
rspec (3.0.0)
|
||||||
rspec-core (~> 2.14.0)
|
rspec-core (~> 3.0.0)
|
||||||
rspec-expectations (~> 2.14.0)
|
rspec-expectations (~> 3.0.0)
|
||||||
rspec-mocks (~> 2.14.0)
|
rspec-mocks (~> 3.0.0)
|
||||||
rspec-core (2.14.8)
|
rspec-core (3.0.2)
|
||||||
rspec-expectations (2.14.5)
|
rspec-support (~> 3.0.0)
|
||||||
diff-lcs (>= 1.1.3, < 2.0)
|
rspec-expectations (3.0.2)
|
||||||
rspec-mocks (2.14.6)
|
diff-lcs (>= 1.2.0, < 2.0)
|
||||||
rspec-rails (2.14.2)
|
rspec-support (~> 3.0.0)
|
||||||
|
rspec-mocks (3.0.2)
|
||||||
|
rspec-support (~> 3.0.0)
|
||||||
|
rspec-rails (3.0.1)
|
||||||
actionpack (>= 3.0)
|
actionpack (>= 3.0)
|
||||||
activemodel (>= 3.0)
|
|
||||||
activesupport (>= 3.0)
|
activesupport (>= 3.0)
|
||||||
railties (>= 3.0)
|
railties (>= 3.0)
|
||||||
rspec-core (~> 2.14.0)
|
rspec-core (~> 3.0.0)
|
||||||
rspec-expectations (~> 2.14.0)
|
rspec-expectations (~> 3.0.0)
|
||||||
rspec-mocks (~> 2.14.0)
|
rspec-mocks (~> 3.0.0)
|
||||||
|
rspec-support (~> 3.0.0)
|
||||||
|
rspec-support (3.0.2)
|
||||||
ruby-progressbar (1.5.1)
|
ruby-progressbar (1.5.1)
|
||||||
sass (3.2.19)
|
sass (3.2.19)
|
||||||
sass-rails (4.0.3)
|
sass-rails (4.0.3)
|
||||||
@@ -320,10 +326,10 @@ GEM
|
|||||||
multi_json
|
multi_json
|
||||||
simplecov-html (~> 0.8.0)
|
simplecov-html (~> 0.8.0)
|
||||||
simplecov-html (0.8.0)
|
simplecov-html (0.8.0)
|
||||||
slim (2.0.2)
|
slim (2.0.3)
|
||||||
temple (~> 0.6.6)
|
temple (~> 0.6.6)
|
||||||
tilt (>= 1.3.3, < 2.1)
|
tilt (>= 1.3.3, < 2.1)
|
||||||
slim-rails (2.1.4)
|
slim-rails (2.1.5)
|
||||||
actionpack (>= 3.0, < 4.2)
|
actionpack (>= 3.0, < 4.2)
|
||||||
activesupport (>= 3.0, < 4.2)
|
activesupport (>= 3.0, < 4.2)
|
||||||
railties (>= 3.0, < 4.2)
|
railties (>= 3.0, < 4.2)
|
||||||
@@ -339,7 +345,7 @@ GEM
|
|||||||
activesupport (>= 3.0)
|
activesupport (>= 3.0)
|
||||||
sprockets (~> 2.8)
|
sprockets (~> 2.8)
|
||||||
subexec (0.2.3)
|
subexec (0.2.3)
|
||||||
temple (0.6.7)
|
temple (0.6.8)
|
||||||
thin (1.6.2)
|
thin (1.6.2)
|
||||||
daemons (>= 1.0.9)
|
daemons (>= 1.0.9)
|
||||||
eventmachine (>= 1.0.0)
|
eventmachine (>= 1.0.0)
|
||||||
@@ -347,7 +353,7 @@ GEM
|
|||||||
thor (0.19.1)
|
thor (0.19.1)
|
||||||
thread_safe (0.3.4)
|
thread_safe (0.3.4)
|
||||||
tilt (1.4.1)
|
tilt (1.4.1)
|
||||||
tinymce-rails (4.0.26)
|
tinymce-rails (4.1.0)
|
||||||
railties (>= 3.1.1)
|
railties (>= 3.1.1)
|
||||||
treetop (1.4.15)
|
treetop (1.4.15)
|
||||||
polyglot
|
polyglot
|
||||||
@@ -357,12 +363,12 @@ GEM
|
|||||||
rspec (>= 2.0, < 4.0)
|
rspec (>= 2.0, < 4.0)
|
||||||
tzinfo (1.2.1)
|
tzinfo (1.2.1)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
uglifier (2.5.0)
|
uglifier (2.5.1)
|
||||||
execjs (>= 0.3.0)
|
execjs (>= 0.3.0)
|
||||||
json (>= 1.8.0)
|
json (>= 1.8.0)
|
||||||
warden (1.2.3)
|
warden (1.2.3)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
websocket-driver (0.3.3)
|
websocket-driver (0.3.4)
|
||||||
xpath (2.0.0)
|
xpath (2.0.0)
|
||||||
nokogiri (~> 1.3)
|
nokogiri (~> 1.3)
|
||||||
yaji (0.3.5)
|
yaji (0.3.5)
|
||||||
@@ -400,7 +406,7 @@ DEPENDENCIES
|
|||||||
map
|
map
|
||||||
mini_magick
|
mini_magick
|
||||||
omniauth-facebook
|
omniauth-facebook
|
||||||
paperclip (= 3.5.2)
|
paperclip
|
||||||
pry-rails
|
pry-rails
|
||||||
quiet_assets
|
quiet_assets
|
||||||
rack-cors
|
rack-cors
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
#= require jquery
|
||||||
|
#= require jquery_ujs
|
||||||
|
#= require foundation
|
||||||
|
#= require_self
|
||||||
|
$ ->
|
||||||
|
$(document).foundation()
|
||||||
@@ -12,7 +12,6 @@
|
|||||||
//
|
//
|
||||||
//= require jquery
|
//= require jquery
|
||||||
//= require jquery_ujs
|
//= require jquery_ujs
|
||||||
//= require jquery.ui.all
|
// require jquery-ui
|
||||||
//= require bootstrap
|
|
||||||
//= require_directory .
|
//= require_directory .
|
||||||
//= require_self
|
//= require_self
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
//= require jquery
|
//= require jquery
|
||||||
//= require jquery_ujs
|
//= require jquery_ujs
|
||||||
//= require jquery.ui.sortable
|
//= require jquery-ui/sortable
|
||||||
//= require vendor/modernizr
|
//= require modernizr
|
||||||
// require foundation FOUNDATION 5 JAVASCRIPT IMPLEMENTATIONS AND EMBER ARE NOT COMPATIBLE, FOUNDATION IS TOO SIMPLISTIC AT THE MOMENT AND DESTROYS DOM EVENTS
|
// require foundation FOUNDATION 5 JAVASCRIPT IMPLEMENTATIONS AND EMBER ARE NOT COMPATIBLE, FOUNDATION IS TOO SIMPLISTIC AT THE MOMENT AND DESTROYS DOM EVENTS
|
||||||
//= require js-routes
|
//= require js-routes
|
||||||
//= require translations
|
//= require translations
|
||||||
|
|||||||
@@ -12,9 +12,7 @@
|
|||||||
//
|
//
|
||||||
//= require jquery
|
//= require jquery
|
||||||
//= require jquery_ujs
|
//= require jquery_ujs
|
||||||
//= require jquery.ui.all
|
//= require jquery-ui
|
||||||
// require bootstrap
|
|
||||||
// require twitter/bootstrap
|
|
||||||
//= require_directory .
|
//= require_directory .
|
||||||
//= require_self
|
//= require_self
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
#= require foundation/foundation
|
#= require foundation/foundation
|
||||||
#= require foundation/foundation.offcanvas
|
#= require foundation/foundation.offcanvas
|
||||||
#= require moment
|
#= require moment
|
||||||
#= require jquery.ui.datepicker
|
#= require jquery-ui/datepicker
|
||||||
#= require translations
|
#= require translations
|
||||||
#= require js-routes
|
#= require js-routes
|
||||||
#= require_directory .
|
#= require_directory .
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
#= require ./app/application
|
#= require ./app/application
|
||||||
#= require foundation
|
#= require foundation
|
||||||
#= require moment
|
#= require moment
|
||||||
#= require jquery.ui.datepicker
|
#= require jquery-ui/datepicker
|
||||||
#= require translations
|
#= require translations
|
||||||
#= require js-routes
|
#= require js-routes
|
||||||
#= require_directory .
|
#= require_directory .
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,14 +0,0 @@
|
|||||||
/*
|
|
||||||
* This is a manifest file that'll be compiled into application.css, which will include all the files
|
|
||||||
* listed below.
|
|
||||||
*
|
|
||||||
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
|
|
||||||
* or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
|
|
||||||
*
|
|
||||||
* 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_directory .
|
|
||||||
* require 'bootstrap-devise-rails'
|
|
||||||
*= require_self
|
|
||||||
*/
|
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
//= require_self
|
||||||
|
//= require_directory .
|
||||||
|
@import 'foundation_and_overrides'
|
||||||
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
@import bootstrap
|
|
||||||
body
|
|
||||||
padding-top: 60px !important
|
|
||||||
@@ -11,5 +11,4 @@
|
|||||||
*= require_self
|
*= require_self
|
||||||
*= require_directory .
|
*= require_directory .
|
||||||
*= require 'theme1/application'
|
*= require 'theme1/application'
|
||||||
* require 'bootstrap-devise-rails'
|
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -1,286 +0,0 @@
|
|||||||
@import compass
|
|
||||||
@import mixins
|
|
||||||
|
|
||||||
// Contents:
|
|
||||||
// =General
|
|
||||||
// =Breadcrumbs
|
|
||||||
// =Headings
|
|
||||||
// =Navigation
|
|
||||||
// =Forms
|
|
||||||
// =Tables
|
|
||||||
// =Pagination
|
|
||||||
// =Misc
|
|
||||||
|
|
||||||
$color: #c6c6c6
|
|
||||||
$bg: #2f2f2f
|
|
||||||
$link: #0088cc
|
|
||||||
|
|
||||||
$warning: #faa732
|
|
||||||
$success: #5bb75b
|
|
||||||
$error: #fc5b5e
|
|
||||||
|
|
||||||
// ds original: #FB292D
|
|
||||||
$info: #3a87ad
|
|
||||||
|
|
||||||
$input-bg: #666666
|
|
||||||
|
|
||||||
// ds default: #444
|
|
||||||
$input-border: #111111
|
|
||||||
|
|
||||||
// default: white
|
|
||||||
$input-placeholder: #666666
|
|
||||||
$input-color: white
|
|
||||||
|
|
||||||
//=General ========================================
|
|
||||||
// Everything with the inset panel just extends .well
|
|
||||||
.well
|
|
||||||
+inset-panel-dark
|
|
||||||
|
|
||||||
body
|
|
||||||
background: $bg
|
|
||||||
color: $color
|
|
||||||
|
|
||||||
//=Breadcrumbs =======================================
|
|
||||||
.breadcrumb
|
|
||||||
@extend .well
|
|
||||||
border: 0
|
|
||||||
//over bs
|
|
||||||
li
|
|
||||||
text-shadow: 0 1px 0 #000
|
|
||||||
//over bs
|
|
||||||
|
|
||||||
//=Headings ======================================
|
|
||||||
.page-header
|
|
||||||
+horizontal-rule-dark
|
|
||||||
|
|
||||||
h1,h2,h3,h4,h5,h6
|
|
||||||
color: white
|
|
||||||
|
|
||||||
h6
|
|
||||||
color: #999
|
|
||||||
|
|
||||||
//=Navigation
|
|
||||||
.nav .dropdown-menu
|
|
||||||
|
|
||||||
.nav-tabs .open .dropdown-toggle,
|
|
||||||
.nav-pills .open .dropdown-toggle,
|
|
||||||
.nav > .open.active > a:hover
|
|
||||||
background-color: darken($bg, 5%)
|
|
||||||
border-color: $bg $bg transparent $bg
|
|
||||||
|
|
||||||
.nav > .dropdown.active > a:hover
|
|
||||||
color: #fff
|
|
||||||
|
|
||||||
.nav-tabs .active .dropdown-toggle .caret,
|
|
||||||
.nav-pills .active .dropdown-toggle .caret
|
|
||||||
border-top-color: #fff
|
|
||||||
|
|
||||||
.nav-tabs
|
|
||||||
border-bottom: 1px solid #666
|
|
||||||
& > .active > a,
|
|
||||||
& > .active > a:hover
|
|
||||||
background-color: $bg
|
|
||||||
color: #fff
|
|
||||||
border-color: #666 #666 transparent #666
|
|
||||||
& > li > a:hover
|
|
||||||
border-color: $bg $bg #666666 $bg
|
|
||||||
background-color: darken($bg, 5%)
|
|
||||||
color: lighten($link, 10%)
|
|
||||||
&.nav-stacked
|
|
||||||
& > li > a,
|
|
||||||
& > li > a:hover
|
|
||||||
border-color: #666
|
|
||||||
|
|
||||||
.nav-pills
|
|
||||||
& > li > a:hover
|
|
||||||
background-color: darken($bg, 5%)
|
|
||||||
color: lighten($link, 10%)
|
|
||||||
|
|
||||||
.nav-list > li > a,
|
|
||||||
.nav-list .nav-header
|
|
||||||
text-shadow: 0 1px 0 #000
|
|
||||||
|
|
||||||
.nav-list > li > a:hover
|
|
||||||
background-color: darken($bg, 10%)
|
|
||||||
color: lighten($link, 10%)
|
|
||||||
|
|
||||||
.nav-list .active
|
|
||||||
& > a:hover
|
|
||||||
background-color: #0088cc
|
|
||||||
color: white
|
|
||||||
|
|
||||||
.tabs-below .nav-tabs
|
|
||||||
border-top: 1px solid #666
|
|
||||||
|
|
||||||
.tabs-left .nav-tabs
|
|
||||||
border-right: 1px solid #666
|
|
||||||
|
|
||||||
.tabs-right .nav-tabs
|
|
||||||
border-left: 1px solid #666
|
|
||||||
|
|
||||||
.tabs-below .nav-tabs > li > a:hover
|
|
||||||
border-top: 1px solid #666
|
|
||||||
|
|
||||||
.tabs-left .nav-tabs > li > a:hover
|
|
||||||
border-color: transparent #666 transparent transparent
|
|
||||||
|
|
||||||
.tabs-right .nav-tabs > li > a:hover
|
|
||||||
border-color: transparent transparent transparent #666
|
|
||||||
|
|
||||||
.tabs-below .nav-tabs .active > a,
|
|
||||||
.tabs-below .nav-tabs .active > a:hover
|
|
||||||
border-color: transparent #666 #666 #666
|
|
||||||
|
|
||||||
.tabs-left .nav-tabs .active > a,
|
|
||||||
.tabs-left .nav-tabs .active > a:hover
|
|
||||||
border-color: #666 transparent #666 #666
|
|
||||||
|
|
||||||
.tabs-right .nav-tabs .active > a,
|
|
||||||
.tabs-right .nav-tabs .active > a:hover
|
|
||||||
border-color: #666 #666 #666 transparent
|
|
||||||
|
|
||||||
//=Forms ========================================
|
|
||||||
+placeholder($input-placeholder)
|
|
||||||
|
|
||||||
.input-prepend .add-on,
|
|
||||||
.input-append .add-on
|
|
||||||
background: #444
|
|
||||||
color: $color
|
|
||||||
border-color: #111
|
|
||||||
text-shadow: 0 1px 0 black
|
|
||||||
|
|
||||||
label
|
|
||||||
color: $color
|
|
||||||
|
|
||||||
input,
|
|
||||||
input[type="file"],
|
|
||||||
select,
|
|
||||||
textarea
|
|
||||||
color: $input-color
|
|
||||||
//background-color: $input-bg;
|
|
||||||
border-color: $input-border
|
|
||||||
@extend .well
|
|
||||||
|
|
||||||
.search-query
|
|
||||||
-webkit-box-shadow: rgba(255, 255, 255, 0.1) 0 1px 0, rgba(0, 0, 0, 0) 0 1px 7px 0px inset
|
|
||||||
|
|
||||||
legend
|
|
||||||
color: white
|
|
||||||
+horizontal-rule-dark
|
|
||||||
|
|
||||||
.form-actions
|
|
||||||
border-top-color: #222
|
|
||||||
background-color: #444
|
|
||||||
|
|
||||||
.help-inline
|
|
||||||
color: #999
|
|
||||||
|
|
||||||
.control-group
|
|
||||||
&.warning
|
|
||||||
+controls($warning)
|
|
||||||
&.success
|
|
||||||
+controls($success)
|
|
||||||
&.error
|
|
||||||
+controls($error)
|
|
||||||
|
|
||||||
//=Tables ========================================
|
|
||||||
.table
|
|
||||||
thead
|
|
||||||
color: white
|
|
||||||
td
|
|
||||||
border-top-color: #666
|
|
||||||
|
|
||||||
.table-striped
|
|
||||||
tbody tr:nth-child(2n+1)
|
|
||||||
td, th
|
|
||||||
background-color: #444
|
|
||||||
|
|
||||||
.table-bordered
|
|
||||||
border: 1px solid #666
|
|
||||||
th + th,
|
|
||||||
td + td,
|
|
||||||
th + td,
|
|
||||||
td + th
|
|
||||||
border-left: 1px solid #666
|
|
||||||
|
|
||||||
//=Pagination
|
|
||||||
.pagination a:hover
|
|
||||||
color: lighten($link, 10%)
|
|
||||||
background-color: darken($bg, 5%)
|
|
||||||
|
|
||||||
.pagination .active a
|
|
||||||
color: #fff
|
|
||||||
background-color: darken($bg, 5%)
|
|
||||||
|
|
||||||
.pagination a
|
|
||||||
border-color: #666
|
|
||||||
|
|
||||||
//=Pager
|
|
||||||
.pager a
|
|
||||||
background-color: $bg
|
|
||||||
border-color: #666
|
|
||||||
&:hover
|
|
||||||
background-color: darken($bg, 5%)
|
|
||||||
color: lighten($link, 10%)
|
|
||||||
|
|
||||||
//=Alerts
|
|
||||||
=alert($color)
|
|
||||||
color: #fff
|
|
||||||
background-color: $color
|
|
||||||
text-shadow: 0 1px 0 rgba(0, 0, 0, 0.25)
|
|
||||||
border-color: darken($color, 25%)
|
|
||||||
h4
|
|
||||||
color: darken($color, 20%)
|
|
||||||
|
|
||||||
.alert
|
|
||||||
+alert($warning)
|
|
||||||
|
|
||||||
.alert-success
|
|
||||||
+alert($success)
|
|
||||||
|
|
||||||
.alert-error
|
|
||||||
+alert($error)
|
|
||||||
|
|
||||||
.alert-info
|
|
||||||
+alert($info)
|
|
||||||
|
|
||||||
//=Modals
|
|
||||||
|
|
||||||
.modal
|
|
||||||
background-color: #444
|
|
||||||
|
|
||||||
.modal-header
|
|
||||||
border-bottom: 1px solid #222
|
|
||||||
|
|
||||||
.modal-body p
|
|
||||||
color: $color
|
|
||||||
|
|
||||||
.modal-footer
|
|
||||||
background-color: darken(#444444, 5%)
|
|
||||||
border-top: 1px solid #222
|
|
||||||
+box-shadow(0 1px 0 #333333 inset)
|
|
||||||
|
|
||||||
//=Progress bars
|
|
||||||
.progress
|
|
||||||
@extend .well
|
|
||||||
|
|
||||||
//=Misc ========================================
|
|
||||||
blockquote
|
|
||||||
border-left-color: #111
|
|
||||||
&.pull-right
|
|
||||||
border-right-color: #111
|
|
||||||
|
|
||||||
hr
|
|
||||||
+horizontal-rule-dark
|
|
||||||
border-top: none
|
|
||||||
|
|
||||||
code
|
|
||||||
@extend .well
|
|
||||||
border: none
|
|
||||||
//over bs
|
|
||||||
|
|
||||||
pre
|
|
||||||
@extend .well
|
|
||||||
border: none
|
|
||||||
//over bs
|
|
||||||
color: $color
|
|
||||||
@@ -8,9 +8,8 @@
|
|||||||
* You're free to add application-wide styles to this file and they'll appear at the top of the
|
* 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.
|
* compiled file, but it's generally better to create a new file per style scope.
|
||||||
*
|
*
|
||||||
*= require 'twitter-bootstrap/bootstrap_and_overrides'
|
* require 'general'
|
||||||
*= require 'general'
|
|
||||||
*= require_directory .
|
*= require_directory .
|
||||||
*= require 'devise'
|
* require 'devise'
|
||||||
*= require_self
|
*= require_self
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -1,290 +0,0 @@
|
|||||||
@import compass
|
|
||||||
@import mixins
|
|
||||||
|
|
||||||
// Contents:
|
|
||||||
// =General
|
|
||||||
// =Breadcrumbs
|
|
||||||
// =Headings
|
|
||||||
// =Navigation
|
|
||||||
// =Forms
|
|
||||||
// =Tables
|
|
||||||
// =Pagination
|
|
||||||
// =Misc
|
|
||||||
|
|
||||||
$color: #c6c6c6
|
|
||||||
$bg: #2f2f2f
|
|
||||||
$link: #0088cc
|
|
||||||
|
|
||||||
$warning: #faa732
|
|
||||||
$success: #5bb75b
|
|
||||||
$error: #fc5b5e
|
|
||||||
|
|
||||||
// ds original: #FB292D
|
|
||||||
$info: #3a87ad
|
|
||||||
|
|
||||||
$input-bg: #666666
|
|
||||||
|
|
||||||
// ds default: #444
|
|
||||||
$input-border: #111111
|
|
||||||
|
|
||||||
// default: white
|
|
||||||
$input-placeholder: #666666
|
|
||||||
$input-color: white
|
|
||||||
|
|
||||||
//=General ========================================
|
|
||||||
// Everything with the inset panel just extends .well
|
|
||||||
.well
|
|
||||||
+inset-panel-dark
|
|
||||||
|
|
||||||
body
|
|
||||||
background: $bg
|
|
||||||
color: $color
|
|
||||||
|
|
||||||
//=Breadcrumbs =======================================
|
|
||||||
.breadcrumb
|
|
||||||
@extend .well
|
|
||||||
border: 0
|
|
||||||
//over bs
|
|
||||||
li
|
|
||||||
text-shadow: 0 1px 0 #000
|
|
||||||
//over bs
|
|
||||||
|
|
||||||
//=Headings ======================================
|
|
||||||
.page-header
|
|
||||||
+horizontal-rule-dark
|
|
||||||
|
|
||||||
h1,h2,h3,h4,h5,h6
|
|
||||||
color: white
|
|
||||||
|
|
||||||
h6
|
|
||||||
color: #999
|
|
||||||
|
|
||||||
//=Navigation
|
|
||||||
.nav .dropdown-menu
|
|
||||||
|
|
||||||
.nav-tabs .open .dropdown-toggle,
|
|
||||||
.nav-pills .open .dropdown-toggle,
|
|
||||||
.nav > .open.active > a:hover
|
|
||||||
background-color: darken($bg, 5%)
|
|
||||||
border-color: $bg $bg transparent $bg
|
|
||||||
|
|
||||||
.nav > .dropdown.active > a:hover
|
|
||||||
color: #fff
|
|
||||||
|
|
||||||
.nav-tabs .active .dropdown-toggle .caret,
|
|
||||||
.nav-pills .active .dropdown-toggle .caret
|
|
||||||
border-top-color: #fff
|
|
||||||
|
|
||||||
.nav-tabs
|
|
||||||
border-bottom: 1px solid #666
|
|
||||||
& > .active > a,
|
|
||||||
& > .active > a:hover
|
|
||||||
background-color: $bg
|
|
||||||
color: #fff
|
|
||||||
border-color: #666 #666 transparent #666
|
|
||||||
& > li > a:hover
|
|
||||||
border-color: $bg $bg #666666 $bg
|
|
||||||
background-color: darken($bg, 5%)
|
|
||||||
color: lighten($link, 10%)
|
|
||||||
&.nav-stacked
|
|
||||||
& > li > a,
|
|
||||||
& > li > a:hover
|
|
||||||
border-color: #666
|
|
||||||
|
|
||||||
.nav-pills
|
|
||||||
& > li > a
|
|
||||||
&:hover
|
|
||||||
background-color: darken($bg, 5%)
|
|
||||||
color: lighten($link, 10%)
|
|
||||||
&.btn
|
|
||||||
padding-bottom: 2px
|
|
||||||
background-color: #e6e6e6
|
|
||||||
|
|
||||||
.nav-list > li > a,
|
|
||||||
.nav-list .nav-header
|
|
||||||
text-shadow: 0 1px 0 #000
|
|
||||||
|
|
||||||
.nav-list > li > a:hover
|
|
||||||
background-color: darken($bg, 10%)
|
|
||||||
color: lighten($link, 10%)
|
|
||||||
|
|
||||||
.nav-list .active
|
|
||||||
& > a:hover
|
|
||||||
background-color: #0088cc
|
|
||||||
color: white
|
|
||||||
|
|
||||||
.tabs-below .nav-tabs
|
|
||||||
border-top: 1px solid #666
|
|
||||||
|
|
||||||
.tabs-left .nav-tabs
|
|
||||||
border-right: 1px solid #666
|
|
||||||
|
|
||||||
.tabs-right .nav-tabs
|
|
||||||
border-left: 1px solid #666
|
|
||||||
|
|
||||||
.tabs-below .nav-tabs > li > a:hover
|
|
||||||
border-top: 1px solid #666
|
|
||||||
|
|
||||||
.tabs-left .nav-tabs > li > a:hover
|
|
||||||
border-color: transparent #666 transparent transparent
|
|
||||||
|
|
||||||
.tabs-right .nav-tabs > li > a:hover
|
|
||||||
border-color: transparent transparent transparent #666
|
|
||||||
|
|
||||||
.tabs-below .nav-tabs .active > a,
|
|
||||||
.tabs-below .nav-tabs .active > a:hover
|
|
||||||
border-color: transparent #666 #666 #666
|
|
||||||
|
|
||||||
.tabs-left .nav-tabs .active > a,
|
|
||||||
.tabs-left .nav-tabs .active > a:hover
|
|
||||||
border-color: #666 transparent #666 #666
|
|
||||||
|
|
||||||
.tabs-right .nav-tabs .active > a,
|
|
||||||
.tabs-right .nav-tabs .active > a:hover
|
|
||||||
border-color: #666 #666 #666 transparent
|
|
||||||
|
|
||||||
//=Forms ========================================
|
|
||||||
+placeholder($input-placeholder)
|
|
||||||
|
|
||||||
.input-prepend .add-on,
|
|
||||||
.input-append .add-on
|
|
||||||
background: #444
|
|
||||||
color: $color
|
|
||||||
border-color: #111
|
|
||||||
text-shadow: 0 1px 0 black
|
|
||||||
|
|
||||||
label
|
|
||||||
color: $color
|
|
||||||
|
|
||||||
input,
|
|
||||||
input[type="file"],
|
|
||||||
select,
|
|
||||||
textarea
|
|
||||||
color: $input-color
|
|
||||||
//background-color: $input-bg;
|
|
||||||
border-color: $input-border
|
|
||||||
@extend .well
|
|
||||||
|
|
||||||
.search-query
|
|
||||||
-webkit-box-shadow: rgba(255, 255, 255, 0.1) 0 1px 0, rgba(0, 0, 0, 0) 0 1px 7px 0px inset
|
|
||||||
|
|
||||||
legend
|
|
||||||
color: white
|
|
||||||
+horizontal-rule-dark
|
|
||||||
|
|
||||||
.form-actions
|
|
||||||
border-top-color: #222
|
|
||||||
background-color: #444
|
|
||||||
|
|
||||||
.help-inline
|
|
||||||
color: #999
|
|
||||||
|
|
||||||
.control-group
|
|
||||||
&.warning
|
|
||||||
+controls($warning)
|
|
||||||
&.success
|
|
||||||
+controls($success)
|
|
||||||
&.error
|
|
||||||
+controls($error)
|
|
||||||
|
|
||||||
//=Tables ========================================
|
|
||||||
.table
|
|
||||||
thead
|
|
||||||
color: white
|
|
||||||
td
|
|
||||||
border-top-color: #666
|
|
||||||
|
|
||||||
.table-striped
|
|
||||||
tbody tr:nth-child(2n+1)
|
|
||||||
td, th
|
|
||||||
background-color: #444
|
|
||||||
|
|
||||||
.table-bordered
|
|
||||||
border: 1px solid #666
|
|
||||||
th + th,
|
|
||||||
td + td,
|
|
||||||
th + td,
|
|
||||||
td + th
|
|
||||||
border-left: 1px solid #666
|
|
||||||
|
|
||||||
//=Pagination
|
|
||||||
.pagination a:hover
|
|
||||||
color: lighten($link, 10%)
|
|
||||||
background-color: darken($bg, 5%)
|
|
||||||
|
|
||||||
.pagination .active a
|
|
||||||
color: #fff
|
|
||||||
background-color: darken($bg, 5%)
|
|
||||||
|
|
||||||
.pagination a
|
|
||||||
border-color: #666
|
|
||||||
|
|
||||||
//=Pager
|
|
||||||
.pager a
|
|
||||||
background-color: $bg
|
|
||||||
border-color: #666
|
|
||||||
&:hover
|
|
||||||
background-color: darken($bg, 5%)
|
|
||||||
color: lighten($link, 10%)
|
|
||||||
|
|
||||||
//=Alerts
|
|
||||||
=alert($color)
|
|
||||||
color: #fff
|
|
||||||
background-color: $color
|
|
||||||
text-shadow: 0 1px 0 rgba(0, 0, 0, 0.25)
|
|
||||||
border-color: darken($color, 25%)
|
|
||||||
h4
|
|
||||||
color: darken($color, 20%)
|
|
||||||
|
|
||||||
.alert
|
|
||||||
+alert($warning)
|
|
||||||
|
|
||||||
.alert-success
|
|
||||||
+alert($success)
|
|
||||||
|
|
||||||
.alert-error
|
|
||||||
+alert($error)
|
|
||||||
|
|
||||||
.alert-info
|
|
||||||
+alert($info)
|
|
||||||
|
|
||||||
//=Modals
|
|
||||||
|
|
||||||
.modal
|
|
||||||
background-color: #444
|
|
||||||
|
|
||||||
.modal-header
|
|
||||||
border-bottom: 1px solid #222
|
|
||||||
|
|
||||||
.modal-body p
|
|
||||||
color: $color
|
|
||||||
|
|
||||||
.modal-footer
|
|
||||||
background-color: darken(#444444, 5%)
|
|
||||||
border-top: 1px solid #222
|
|
||||||
+box-shadow(0 1px 0 #333333 inset)
|
|
||||||
|
|
||||||
//=Progress bars
|
|
||||||
.progress
|
|
||||||
@extend .well
|
|
||||||
|
|
||||||
//=Misc ========================================
|
|
||||||
blockquote
|
|
||||||
border-left-color: #111
|
|
||||||
&.pull-right
|
|
||||||
border-right-color: #111
|
|
||||||
|
|
||||||
hr
|
|
||||||
+horizontal-rule-dark
|
|
||||||
border-top: none
|
|
||||||
|
|
||||||
code
|
|
||||||
@extend .well
|
|
||||||
border: none
|
|
||||||
//over bs
|
|
||||||
|
|
||||||
pre
|
|
||||||
@extend .well
|
|
||||||
border: none
|
|
||||||
//over bs
|
|
||||||
color: $color
|
|
||||||
@@ -1,6 +1,4 @@
|
|||||||
/*
|
/*
|
||||||
*= require 'twitter-bootstrap/bootstrap_and_overrides'
|
|
||||||
*= require 'twitter-bootstrap/bootstrap_overrides'
|
|
||||||
*= require 'jquery-ui-1.8.23.custom.css'
|
*= require 'jquery-ui-1.8.23.custom.css'
|
||||||
*= require qtip
|
*= require qtip
|
||||||
*= require 'general'
|
*= require 'general'
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
/*
|
|
||||||
*= require 'twitter-bootstrap/bootstrap_and_overrides'
|
|
||||||
*= require 'twitter-bootstrap/bootstrap_overrides'
|
|
||||||
*= require 'jquery-ui-1.8.23.custom.css'
|
|
||||||
*= require qtip
|
|
||||||
*= require 'general'
|
|
||||||
* require active_list
|
|
||||||
*= require_directory ../base1-shared
|
|
||||||
*= require_directory .
|
|
||||||
*= require_self
|
|
||||||
*/
|
|
||||||
@@ -1,310 +0,0 @@
|
|||||||
@import compass
|
|
||||||
@import mixins
|
|
||||||
|
|
||||||
// Contents:
|
|
||||||
// =General
|
|
||||||
// =Breadcrumbs
|
|
||||||
// =Headings
|
|
||||||
// =Navigation
|
|
||||||
// =Forms
|
|
||||||
// =Tables
|
|
||||||
// =Pagination
|
|
||||||
// =Accordion
|
|
||||||
// =Misc
|
|
||||||
|
|
||||||
$color: #c6c6c6
|
|
||||||
$bg: #2f2f2f
|
|
||||||
$link: #FAA732
|
|
||||||
|
|
||||||
$warning: #faa732
|
|
||||||
$success: #5bb75b
|
|
||||||
$error: #fc5b5e
|
|
||||||
|
|
||||||
// ds original: #FB292D
|
|
||||||
$info: #3a87ad
|
|
||||||
|
|
||||||
$input-bg: #666666
|
|
||||||
|
|
||||||
// ds default: #444
|
|
||||||
$input-border: #111111
|
|
||||||
|
|
||||||
// default: white
|
|
||||||
$input-placeholder: #666666
|
|
||||||
$input-color: white
|
|
||||||
|
|
||||||
//=General ========================================
|
|
||||||
// Everything with the inset panel just extends .well
|
|
||||||
.well
|
|
||||||
//+inset-panel-dark
|
|
||||||
background-color: rgba(255,255,255,0.8)
|
|
||||||
h1,h2,h3,h4,h5,h6,a
|
|
||||||
color: #333
|
|
||||||
.table
|
|
||||||
thead
|
|
||||||
color: #111
|
|
||||||
td
|
|
||||||
border-top-color: #aaa
|
|
||||||
color: #111
|
|
||||||
|
|
||||||
body
|
|
||||||
background: $bg
|
|
||||||
color: $color
|
|
||||||
a
|
|
||||||
color: $link
|
|
||||||
&:hover
|
|
||||||
color: lighten($link, 10%)
|
|
||||||
|
|
||||||
//=Breadcrumbs =======================================
|
|
||||||
.breadcrumb
|
|
||||||
@extend .well
|
|
||||||
border: 0
|
|
||||||
//over bs
|
|
||||||
li
|
|
||||||
text-shadow: 0 1px 0 #000
|
|
||||||
//over bs
|
|
||||||
|
|
||||||
//=Headings ======================================
|
|
||||||
.page-header
|
|
||||||
+horizontal-rule-dark
|
|
||||||
|
|
||||||
h1,h2,h3,h4,h5,h6
|
|
||||||
color: white
|
|
||||||
|
|
||||||
h6
|
|
||||||
color: #999
|
|
||||||
|
|
||||||
//=Navigation
|
|
||||||
.nav .dropdown-menu
|
|
||||||
|
|
||||||
.nav-tabs .open .dropdown-toggle,
|
|
||||||
.nav-pills .open .dropdown-toggle,
|
|
||||||
.nav > .open.active > a:hover
|
|
||||||
background-color: darken($bg, 5%)
|
|
||||||
border-color: $bg $bg transparent $bg
|
|
||||||
|
|
||||||
.nav > .dropdown.active > a:hover
|
|
||||||
color: #fff
|
|
||||||
|
|
||||||
.nav-tabs .active .dropdown-toggle .caret,
|
|
||||||
.nav-pills .active .dropdown-toggle .caret
|
|
||||||
border-top-color: #fff
|
|
||||||
|
|
||||||
.nav-tabs
|
|
||||||
border-bottom: 1px solid #666
|
|
||||||
& > .active > a,
|
|
||||||
& > .active > a:hover
|
|
||||||
background-color: $bg
|
|
||||||
color: #fff
|
|
||||||
border-color: #666 #666 transparent #666
|
|
||||||
& > li > a:hover
|
|
||||||
border-color: $bg $bg #666666 $bg
|
|
||||||
background-color: darken($bg, 5%)
|
|
||||||
color: lighten($link, 10%)
|
|
||||||
&.nav-stacked
|
|
||||||
& > li > a,
|
|
||||||
& > li > a:hover
|
|
||||||
border-color: #666
|
|
||||||
|
|
||||||
.nav-pills
|
|
||||||
& > li > a:hover
|
|
||||||
background-color: darken($bg, 5%)
|
|
||||||
color: lighten($link, 10%)
|
|
||||||
|
|
||||||
.nav-list > li > a,
|
|
||||||
.nav-list .nav-header
|
|
||||||
text-shadow: 0 1px 0 #000
|
|
||||||
|
|
||||||
.nav-list > li > a:hover
|
|
||||||
background-color: darken($bg, 10%)
|
|
||||||
color: lighten($link, 10%)
|
|
||||||
|
|
||||||
.nav-list .active
|
|
||||||
& > a:hover
|
|
||||||
background-color: #0088cc
|
|
||||||
color: white
|
|
||||||
|
|
||||||
.tabs-below .nav-tabs
|
|
||||||
border-top: 1px solid #666
|
|
||||||
|
|
||||||
.tabs-left .nav-tabs
|
|
||||||
border-right: 1px solid #666
|
|
||||||
|
|
||||||
.tabs-right .nav-tabs
|
|
||||||
border-left: 1px solid #666
|
|
||||||
|
|
||||||
.tabs-below .nav-tabs > li > a:hover
|
|
||||||
border-top: 1px solid #666
|
|
||||||
|
|
||||||
.tabs-left .nav-tabs > li > a:hover
|
|
||||||
border-color: transparent #666 transparent transparent
|
|
||||||
|
|
||||||
.tabs-right .nav-tabs > li > a:hover
|
|
||||||
border-color: transparent transparent transparent #666
|
|
||||||
|
|
||||||
.tabs-below .nav-tabs .active > a,
|
|
||||||
.tabs-below .nav-tabs .active > a:hover
|
|
||||||
border-color: transparent #666 #666 #666
|
|
||||||
|
|
||||||
.tabs-left .nav-tabs .active > a,
|
|
||||||
.tabs-left .nav-tabs .active > a:hover
|
|
||||||
border-color: #666 transparent #666 #666
|
|
||||||
|
|
||||||
.tabs-right .nav-tabs .active > a,
|
|
||||||
.tabs-right .nav-tabs .active > a:hover
|
|
||||||
border-color: #666 #666 #666 transparent
|
|
||||||
|
|
||||||
//=Forms ========================================
|
|
||||||
+placeholder($input-placeholder)
|
|
||||||
|
|
||||||
.input-prepend .add-on,
|
|
||||||
.input-append .add-on
|
|
||||||
background: #444
|
|
||||||
color: $color
|
|
||||||
border-color: #111
|
|
||||||
text-shadow: 0 1px 0 black
|
|
||||||
|
|
||||||
label
|
|
||||||
color: $color
|
|
||||||
|
|
||||||
input,
|
|
||||||
input[type="file"],
|
|
||||||
select,
|
|
||||||
textarea
|
|
||||||
color: $input-color
|
|
||||||
//background-color: $input-bg;
|
|
||||||
border-color: $input-border
|
|
||||||
@extend .well
|
|
||||||
|
|
||||||
.search-query
|
|
||||||
-webkit-box-shadow: rgba(255, 255, 255, 0.1) 0 1px 0, rgba(0, 0, 0, 0) 0 1px 7px 0px inset
|
|
||||||
|
|
||||||
legend
|
|
||||||
color: white
|
|
||||||
+horizontal-rule-dark
|
|
||||||
|
|
||||||
.form-actions
|
|
||||||
border-top-color: #222
|
|
||||||
background-color: #444
|
|
||||||
|
|
||||||
.help-inline
|
|
||||||
color: #999
|
|
||||||
|
|
||||||
.control-group
|
|
||||||
&.warning
|
|
||||||
+controls($warning)
|
|
||||||
&.success
|
|
||||||
+controls($success)
|
|
||||||
&.error
|
|
||||||
+controls($error)
|
|
||||||
|
|
||||||
//=Tables ========================================
|
|
||||||
.table
|
|
||||||
thead
|
|
||||||
color: white
|
|
||||||
td
|
|
||||||
border-top-color: #666
|
|
||||||
|
|
||||||
.table-striped
|
|
||||||
tbody tr:nth-child(2n+1)
|
|
||||||
td, th
|
|
||||||
background-color: #444
|
|
||||||
|
|
||||||
.table-bordered
|
|
||||||
border: 1px solid #666
|
|
||||||
th + th,
|
|
||||||
td + td,
|
|
||||||
th + td,
|
|
||||||
td + th
|
|
||||||
border-left: 1px solid #666
|
|
||||||
|
|
||||||
//=Pagination
|
|
||||||
.pagination a:hover
|
|
||||||
color: lighten($link, 10%)
|
|
||||||
background-color: darken($bg, 5%)
|
|
||||||
|
|
||||||
.pagination .active a
|
|
||||||
color: #fff
|
|
||||||
background-color: darken($bg, 5%)
|
|
||||||
|
|
||||||
.pagination a
|
|
||||||
border-color: #666
|
|
||||||
|
|
||||||
//=Pager
|
|
||||||
.pager a
|
|
||||||
background-color: $bg
|
|
||||||
border-color: #666
|
|
||||||
&:hover
|
|
||||||
background-color: darken($bg, 5%)
|
|
||||||
color: lighten($link, 10%)
|
|
||||||
|
|
||||||
//=Alerts
|
|
||||||
=alert($color)
|
|
||||||
color: #fff
|
|
||||||
background-color: $color
|
|
||||||
text-shadow: 0 1px 0 rgba(0, 0, 0, 0.25)
|
|
||||||
border-color: darken($color, 25%)
|
|
||||||
h4
|
|
||||||
color: darken($color, 20%)
|
|
||||||
|
|
||||||
.alert
|
|
||||||
+alert($warning)
|
|
||||||
|
|
||||||
.alert-success
|
|
||||||
+alert($success)
|
|
||||||
|
|
||||||
.alert-error
|
|
||||||
+alert($error)
|
|
||||||
|
|
||||||
.alert-info
|
|
||||||
+alert($info)
|
|
||||||
|
|
||||||
//=Modals
|
|
||||||
|
|
||||||
.modal
|
|
||||||
background-color: #444
|
|
||||||
|
|
||||||
.modal-header
|
|
||||||
border-bottom: 1px solid #222
|
|
||||||
|
|
||||||
.modal-body p
|
|
||||||
color: $color
|
|
||||||
|
|
||||||
.modal-footer
|
|
||||||
background-color: darken(#444444, 5%)
|
|
||||||
border-top: 1px solid #222
|
|
||||||
+box-shadow(0 1px 0 #333333 inset)
|
|
||||||
|
|
||||||
.popover
|
|
||||||
color: #333
|
|
||||||
h3
|
|
||||||
color: #333
|
|
||||||
|
|
||||||
//=Progress bars
|
|
||||||
.progress
|
|
||||||
@extend .well
|
|
||||||
|
|
||||||
//=Accordion
|
|
||||||
.accordion-group
|
|
||||||
.accordion-heading
|
|
||||||
background-color: rgba(200, 200, 200, 0.3)
|
|
||||||
|
|
||||||
//=Misc ========================================
|
|
||||||
blockquote
|
|
||||||
border-left-color: #111
|
|
||||||
&.pull-right
|
|
||||||
border-right-color: #111
|
|
||||||
|
|
||||||
hr
|
|
||||||
+horizontal-rule-dark
|
|
||||||
border-top: none
|
|
||||||
|
|
||||||
code
|
|
||||||
@extend .well
|
|
||||||
border: none
|
|
||||||
//over bs
|
|
||||||
|
|
||||||
pre
|
|
||||||
@extend .well
|
|
||||||
border: none
|
|
||||||
//over bs
|
|
||||||
color: $color
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
=placeholder($color: $input-placeholder)
|
|
||||||
\:-moz-placeholder
|
|
||||||
color: $color
|
|
||||||
\::-webkit-input-placeholder
|
|
||||||
color: $color
|
|
||||||
|
|
||||||
=controls($color)
|
|
||||||
& > label,
|
|
||||||
.help-block,
|
|
||||||
.help-inline
|
|
||||||
color: $color
|
|
||||||
input, select, textarea
|
|
||||||
//color: lighten($color, 20%);
|
|
||||||
color: $color
|
|
||||||
border-color: $color
|
|
||||||
input:focus,
|
|
||||||
select:focus,
|
|
||||||
textarea:focus
|
|
||||||
border-color: $color
|
|
||||||
+box-shadow(0 0 6px $color)
|
|
||||||
|
|
||||||
=inset-panel-dark
|
|
||||||
+box-shadow(rgba(white, 0.1) 0 1px 0, rgba(black, 0.8) 0 1px 7px 0px inset)
|
|
||||||
background: darken(#2f2f2f, 6)
|
|
||||||
background-color: rgba(black, 0.3)
|
|
||||||
|
|
||||||
=horizontal-rule-dark
|
|
||||||
+box-shadow(rgba(white, 0.07) 0 1px 0)
|
|
||||||
border-bottom: 1px solid #121212
|
|
||||||
|
|
||||||
=horizontal-rule-top-dark
|
|
||||||
+box-shadow(rgba(white, 0.07) 0 1px 0 inset)
|
|
||||||
border-top: 1px solid #121212
|
|
||||||
|
|
||||||
=vertical-rule-dark
|
|
||||||
+box-shadow(rgba(white, 0.07) 1px 0 0)
|
|
||||||
border-right: 1px solid #121212
|
|
||||||
|
|
||||||
=vertical-rule-left-dark
|
|
||||||
+box-shadow(rgba(white, 0.07) 1px 0 0 inset)
|
|
||||||
border-left: 1px solid #121212
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
#product-category-list
|
|
||||||
list-style: none
|
|
||||||
li
|
|
||||||
clear: both
|
|
||||||
margin-bottom: 8px
|
|
||||||
.name
|
|
||||||
padding: 5px 5px
|
|
||||||
#week_days-group
|
|
||||||
.btn
|
|
||||||
opacity: 0.4
|
|
||||||
&.active
|
|
||||||
opacity: 1
|
|
||||||
#full_day-controller
|
|
||||||
margin: 0 10px
|
|
||||||
#sub-day-container
|
|
||||||
display: inline-block
|
|
||||||
&.hide
|
|
||||||
display: none
|
|
||||||
select
|
|
||||||
width: 70px
|
|
||||||
margin-right: 14px
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
.products_preview-date
|
|
||||||
.products_preview-time-container
|
|
||||||
float: left
|
|
||||||
input
|
|
||||||
width: 120px
|
|
||||||
.products_preview-hour
|
|
||||||
float: left
|
|
||||||
margin-left: 10px
|
|
||||||
select
|
|
||||||
width: 50px
|
|
||||||
&:after
|
|
||||||
content: " :"
|
|
||||||
.products_preview-minute
|
|
||||||
float: left
|
|
||||||
margin-left: 10px
|
|
||||||
select
|
|
||||||
width: 50px
|
|
||||||
@@ -1,99 +0,0 @@
|
|||||||
.section-title
|
|
||||||
font-size: 24px
|
|
||||||
padding: 4px 0px
|
|
||||||
.section-tables-container
|
|
||||||
.section-manage-tables
|
|
||||||
margin: -26px 6px 4px 6px
|
|
||||||
.section-table
|
|
||||||
background-color: #ccc
|
|
||||||
//TODO remove width and height for ember control
|
|
||||||
height: 48px
|
|
||||||
width: 83px
|
|
||||||
background-repeat: no-repeat
|
|
||||||
color: black
|
|
||||||
a
|
|
||||||
color: black
|
|
||||||
//background-image: image-url('icons/section-table.png')
|
|
||||||
.table-link
|
|
||||||
margin-top: -45px
|
|
||||||
.table-number
|
|
||||||
color: black
|
|
||||||
position: absolute
|
|
||||||
top: 0
|
|
||||||
line-height: 44px
|
|
||||||
width: 45px
|
|
||||||
font-size: 42px
|
|
||||||
text-align: center
|
|
||||||
.status-icons
|
|
||||||
float: right
|
|
||||||
width: 16px
|
|
||||||
span
|
|
||||||
display: none
|
|
||||||
float: right
|
|
||||||
.action-button-container
|
|
||||||
margin-right: -20px
|
|
||||||
.table-actions
|
|
||||||
display: none
|
|
||||||
position: absolute
|
|
||||||
left: 100%
|
|
||||||
top: 0
|
|
||||||
width: 140px
|
|
||||||
text-align: center
|
|
||||||
background-color: white
|
|
||||||
border: 1px solid #aaa
|
|
||||||
padding-bottom: 10px
|
|
||||||
.title
|
|
||||||
background-color: #aaa
|
|
||||||
.table-action-row
|
|
||||||
margin-top: 10px
|
|
||||||
&.section-tables-active
|
|
||||||
position: relative
|
|
||||||
padding: 0
|
|
||||||
height: 400px
|
|
||||||
//background-image: image-url('textures/wood4.jpg')
|
|
||||||
//background-color: rgba(0,0,0,0.4)
|
|
||||||
.section-table
|
|
||||||
position: absolute
|
|
||||||
cursor: pointer
|
|
||||||
&.occupied
|
|
||||||
background-color: #ffa
|
|
||||||
&.needs_help
|
|
||||||
background-color: #7f7
|
|
||||||
.needs_help
|
|
||||||
display: block
|
|
||||||
&.needs_payment
|
|
||||||
background-image: image-url('icons/needs-payment.png')
|
|
||||||
background-position: 40px 2px
|
|
||||||
.needs_payment
|
|
||||||
display: block
|
|
||||||
&.active_order
|
|
||||||
.active_order
|
|
||||||
display: block
|
|
||||||
//background-color: #f77
|
|
||||||
a
|
|
||||||
&:hover
|
|
||||||
text-decoration: none
|
|
||||||
&.section-tables-manage
|
|
||||||
.section-table
|
|
||||||
cursor: move
|
|
||||||
&.section-tables-inactive
|
|
||||||
.section-table
|
|
||||||
position: relative
|
|
||||||
margin-top: 10px
|
|
||||||
margin-bottom: 30px
|
|
||||||
float: left
|
|
||||||
margin-right: 30px
|
|
||||||
// INDEX
|
|
||||||
|
|
||||||
table
|
|
||||||
td
|
|
||||||
&.table-info
|
|
||||||
.table-count
|
|
||||||
&:after
|
|
||||||
content: " - "
|
|
||||||
.go-to-tables-view.hide
|
|
||||||
display: inline-block
|
|
||||||
|
|
||||||
ul#table-actions-list
|
|
||||||
list-style: none
|
|
||||||
margin: 0
|
|
||||||
@@ -1,61 +0,0 @@
|
|||||||
$side-spacing: 0px
|
|
||||||
@import constants
|
|
||||||
html
|
|
||||||
background-image: $wood
|
|
||||||
background-color: $background-brown
|
|
||||||
body
|
|
||||||
padding-top: 42px
|
|
||||||
padding-left: $side-spacing
|
|
||||||
padding-right: $side-spacing
|
|
||||||
background-color: transparent
|
|
||||||
//padding-top: 50px
|
|
||||||
.navbar-fixed-top
|
|
||||||
margin-left: -$side-spacing
|
|
||||||
margin-right: -$side-spacing
|
|
||||||
margin-bottom: 3px
|
|
||||||
.page-header
|
|
||||||
margin-top: 4px
|
|
||||||
margin-bottom: 6px
|
|
||||||
padding-bottom: 0
|
|
||||||
.main-content
|
|
||||||
padding-top: 16px
|
|
||||||
label
|
|
||||||
&.number
|
|
||||||
display: inline
|
|
||||||
padding: 4px 10px
|
|
||||||
input
|
|
||||||
&.number
|
|
||||||
width: 40px
|
|
||||||
.supplier-is-closed
|
|
||||||
.alert
|
|
||||||
form
|
|
||||||
margin: 0
|
|
||||||
.location_picker_search
|
|
||||||
float: left
|
|
||||||
.draggable
|
|
||||||
cursor: move !important
|
|
||||||
input.dimension
|
|
||||||
width: 40px
|
|
||||||
.location_picker_map
|
|
||||||
width: 600px
|
|
||||||
height: 500px
|
|
||||||
border: 1px solid black
|
|
||||||
padding: 2px
|
|
||||||
display: inline-block
|
|
||||||
float: left
|
|
||||||
clear: left
|
|
||||||
img
|
|
||||||
max-width: none
|
|
||||||
label
|
|
||||||
width: auto
|
|
||||||
display:inline
|
|
||||||
.handle
|
|
||||||
cursor: move
|
|
||||||
font-size: 0.8em
|
|
||||||
color: #777
|
|
||||||
form
|
|
||||||
&.form-inline
|
|
||||||
display: inline-block
|
|
||||||
padding: 4px
|
|
||||||
.clear
|
|
||||||
clear: both
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,3 @@
|
|||||||
|
.container
|
||||||
|
margin-left: auto
|
||||||
|
margin-right: auto
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
/*
|
|
||||||
* This is a manifest file that'll be compiled into application.css, which will include all the files
|
|
||||||
* listed below.
|
|
||||||
*
|
|
||||||
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
|
|
||||||
* or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
|
|
||||||
*
|
|
||||||
* 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_directory .
|
|
||||||
* ------------- require 'bootstrap-devise-rails'
|
|
||||||
*/
|
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
//= require_self
|
||||||
|
//= require_directory .
|
||||||
|
@import ./foundation_and_overrides
|
||||||
|
@import ./structure
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
@import bootstrap
|
|
||||||
body
|
|
||||||
.nav
|
|
||||||
> li
|
|
||||||
> a
|
|
||||||
&:hover
|
|
||||||
background-color: transparent
|
|
||||||
@@ -1,5 +1,42 @@
|
|||||||
@import bourbon
|
|
||||||
$cth-height: 48px
|
$cth-height: 48px
|
||||||
|
$green-original: #99CB23
|
||||||
|
$green: #7BB459 //Heineken
|
||||||
|
$font-family-content: Georgia, serif
|
||||||
|
$font-family-navigation: Verdana,serif
|
||||||
|
$font-family-headers: Verdana,serif //'Pacifico', serif
|
||||||
|
$content-max-width: 962px
|
||||||
|
=linear-gradient($pos, $G1, $G2: null, $G3: null, $G4: null, $G5: null, $G6: null, $G7: null, $G8: null, $G9: null, $G10: null, $fallback: null)
|
||||||
|
// Detect what type of value exists in $pos
|
||||||
|
$pos-type: type-of(nth($pos, 1))
|
||||||
|
$pos-spec: null
|
||||||
|
$pos-degree: null
|
||||||
|
// If $pos is missing from mixin, reassign vars and add default position
|
||||||
|
@if $pos-type == color or nth($pos, 1) == "transparent"
|
||||||
|
$G10: $G9
|
||||||
|
$G9: $G8
|
||||||
|
$G8: $G7
|
||||||
|
$G7: $G6
|
||||||
|
$G6: $G5
|
||||||
|
$G5: $G4
|
||||||
|
$G4: $G3
|
||||||
|
$G3: $G2
|
||||||
|
$G2: $G1
|
||||||
|
$G1: $pos
|
||||||
|
$pos: null
|
||||||
|
@if $pos
|
||||||
|
$positions: _linear-positions-parser($pos)
|
||||||
|
$pos-degree: nth($positions, 1)
|
||||||
|
$pos-spec: nth($positions, 2)
|
||||||
|
$full: $G1, $G2, $G3, $G4, $G5, $G6, $G7, $G8, $G9, $G10
|
||||||
|
// Set $G1 as the default fallback color
|
||||||
|
$fallback-color: nth($G1, 1)
|
||||||
|
// If $fallback is a color use that color as the fallback color
|
||||||
|
@if type-of($fallback) == color or $fallback == "transparent"
|
||||||
|
$fallback-color: $fallback
|
||||||
|
background-color: $fallback-color
|
||||||
|
background-image: -webkit-linear-gradient($pos-degree $full)
|
||||||
|
// Safari 5.1+, Chrome
|
||||||
|
background-image: unquote("linear-gradient(#{$pos-spec}#{$full})")
|
||||||
=content-top-background
|
=content-top-background
|
||||||
.left
|
.left
|
||||||
position: absolute
|
position: absolute
|
||||||
@@ -20,12 +57,6 @@ $cth-height: 48px
|
|||||||
.container
|
.container
|
||||||
position: relative
|
position: relative
|
||||||
max-width: $content-max-width
|
max-width: $content-max-width
|
||||||
$green-original: #99CB23
|
|
||||||
$green: #7BB459 //Heineken
|
|
||||||
$font-family-content: Georgia, serif
|
|
||||||
$font-family-navigation: Verdana,serif
|
|
||||||
$font-family-headers: Verdana,serif //'Pacifico', serif
|
|
||||||
$content-max-width: 962px
|
|
||||||
body
|
body
|
||||||
background-color: #333
|
background-color: #333
|
||||||
margin: 0
|
margin: 0
|
||||||
@@ -88,6 +119,7 @@ body
|
|||||||
#header
|
#header
|
||||||
margin-bottom: 10px
|
margin-bottom: 10px
|
||||||
#logo
|
#logo
|
||||||
|
max-width: 80%
|
||||||
a
|
a
|
||||||
margin: 20px
|
margin: 20px
|
||||||
#header-right
|
#header-right
|
||||||
@@ -129,9 +161,10 @@ body
|
|||||||
margin: 0
|
margin: 0
|
||||||
padding: 0
|
padding: 0
|
||||||
list-style: none
|
list-style: none
|
||||||
li
|
li
|
||||||
position: relative
|
position: relative
|
||||||
list-style: none
|
list-style: none
|
||||||
|
float: left
|
||||||
a
|
a
|
||||||
border: 0
|
border: 0
|
||||||
color: white
|
color: white
|
||||||
@@ -215,7 +248,7 @@ body
|
|||||||
height: $cth-height
|
height: $cth-height
|
||||||
background-repeat: repeat-x
|
background-repeat: repeat-x
|
||||||
background-position: bottom
|
background-position: bottom
|
||||||
margin: 0 69px 0 42px
|
margin: 0 68px 0 42px
|
||||||
#main-wrap
|
#main-wrap
|
||||||
font-size: 14px
|
font-size: 14px
|
||||||
font-family: $font-family-content
|
font-family: $font-family-content
|
||||||
@@ -263,7 +296,7 @@ body
|
|||||||
position: relative
|
position: relative
|
||||||
.footer-shadow
|
.footer-shadow
|
||||||
height: 1px
|
height: 1px
|
||||||
+box-shadow(0px 4px 10px #000)
|
//+box-shadow(0px 4px 10px #000)
|
||||||
.container
|
.container
|
||||||
max-width: 838px
|
max-width: 838px
|
||||||
.footer-content
|
.footer-content
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ html lang="en"
|
|||||||
meta name="viewport" content="width=device-width, initial-scale=1.0"
|
meta name="viewport" content="width=device-width, initial-scale=1.0"
|
||||||
title= content_for?(:title) ? yield(:title) : application_title
|
title= content_for?(:title) ? yield(:title) : application_title
|
||||||
= csrf_meta_tags
|
= csrf_meta_tags
|
||||||
|
= javascript_include_tag 'admin/application'
|
||||||
|
|
||||||
/! Le HTML5 shim, for IE6-8 support of HTML elements
|
/! Le HTML5 shim, for IE6-8 support of HTML elements
|
||||||
/[if lt IE 9]
|
/[if lt IE 9]
|
||||||
@@ -18,38 +19,32 @@ html lang="en"
|
|||||||
link href="images/favicon.ico" rel="shortcut icon"
|
link href="images/favicon.ico" rel="shortcut icon"
|
||||||
|
|
||||||
body
|
body
|
||||||
.navbar.navbar-fixed-top
|
nav.top-bar
|
||||||
.navbar-inner
|
ul.title-area
|
||||||
.container
|
li.name: h4= link_to application_title, admin_root_path
|
||||||
a.btn.btn-navbar data-target=".nav-collapse" data-toggle="collapse"
|
section.top-bar-section
|
||||||
span.icon-bar
|
ul.left
|
||||||
span.icon-bar
|
li= link_to User.model_name.human_plural, admin_users_path
|
||||||
span.icon-bar
|
li.divider
|
||||||
a.brand href=admin_root_path = application_title
|
ul.left
|
||||||
.container.nav-collapse
|
li.has-dropdown.not-click
|
||||||
ul.nav
|
a href="#" = Supplier.model_name.human_plural
|
||||||
li= link_to User.model_name.human_plural, admin_users_path
|
ul.dropdown
|
||||||
li.dropdown
|
li= link_to Supplier.model_name.human_plural, admin_suppliers_path
|
||||||
a.dropdown-toggle href="#" data-toggle="dropdown"
|
li= link_to Section.model_name.human_plural, admin_sections_path
|
||||||
span = Supplier.model_name.human_plural
|
li= link_to Table.model_name.human_plural, admin_tables_path
|
||||||
b.caret
|
li= link_to Product.model_name.human_plural, admin_products_path
|
||||||
ul.child-menu.dropdown-menu
|
li= link_to List.model_name.human_plural, admin_lists_path
|
||||||
li= link_to Supplier.model_name.human_plural, admin_suppliers_path
|
li= link_to Order.model_name.human_plural, admin_orders_path
|
||||||
li= link_to Section.model_name.human_plural, admin_sections_path
|
li= link_to ProductCategory.model_name.human_plural, admin_product_categories_path
|
||||||
li= link_to Table.model_name.human_plural, admin_tables_path
|
li.divider
|
||||||
li= link_to Product.model_name.human_plural, admin_products_path
|
- if administrator_signed_in?
|
||||||
li= link_to List.model_name.human_plural, admin_lists_path
|
ul.right
|
||||||
li= link_to Order.model_name.human_plural, admin_orders_path
|
li.divider
|
||||||
li= link_to ProductCategory.model_name.human_plural, admin_product_categories_path
|
li.has-dropdown.not-click
|
||||||
- if administrator_signed_in?
|
a href="#" = current_administrator.email
|
||||||
.btn-group.pull-right
|
ul.dropdown
|
||||||
a.btn.dropdown-toggle[data-toggle="dropdown" href="#"]
|
li.log-out= link_to t('helpers.links.logout'), destroy_administrator_session_path
|
||||||
i.icon-user
|
|
||||||
= current_administrator.email
|
|
||||||
span.caret
|
|
||||||
ul.dropdown-menu
|
|
||||||
li.log-out= link_to t('helpers.links.logout'), destroy_administrator_session_path
|
|
||||||
|
|
||||||
.container
|
.container
|
||||||
|
|
||||||
.content
|
.content
|
||||||
@@ -62,22 +57,17 @@ html lang="en"
|
|||||||
a.close data-dismiss="alert" ×
|
a.close data-dismiss="alert" ×
|
||||||
div= flash[:notice]
|
div= flash[:notice]
|
||||||
.row
|
.row
|
||||||
.span9
|
.large-9.columns
|
||||||
= yield
|
= yield
|
||||||
.span3
|
.large-3.columns
|
||||||
.well.sidebar-nav
|
.well.sidebar-nav
|
||||||
h3= application_title
|
h3= application_title
|
||||||
ul.nav.nav-list
|
hr
|
||||||
li.nav-header Links
|
ul.side-nav
|
||||||
|
li.heading Links
|
||||||
li= link_to "Qwaiter website", root_path
|
li= link_to "Qwaiter website", root_path
|
||||||
li= link_to "Companytools", 'http://www.companytools.nl/'
|
li= link_to "Companytools", 'http://www.companytools.nl/'
|
||||||
= yield :sidebar
|
= yield :sidebar
|
||||||
|
|
||||||
footer
|
footer
|
||||||
p © Companytools 2012
|
p © Companytools 2014
|
||||||
/!
|
|
||||||
Javascripts
|
|
||||||
\==================================================
|
|
||||||
/! Placed at the end of the document so the pages load faster
|
|
||||||
= javascript_include_tag "application"
|
|
||||||
= yield :footer
|
= yield :footer
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ html lang="en"
|
|||||||
.left
|
.left
|
||||||
.right
|
.right
|
||||||
.container
|
.container
|
||||||
.top-ribbon
|
.top-ribbon
|
||||||
#main-wrap
|
#main-wrap
|
||||||
.container
|
.container
|
||||||
.main-inner
|
.main-inner
|
||||||
|
|||||||
+26
-16
@@ -12,35 +12,45 @@ require 'sprockets/railtie'
|
|||||||
# custom override hack for the couchbase-setting gem, needs to be loaded before other gems, is settings only without dependencies
|
# custom override hack for the couchbase-setting gem, needs to be loaded before other gems, is settings only without dependencies
|
||||||
require File.expand_path('./../../lib/couchbase-setting', __FILE__)
|
require File.expand_path('./../../lib/couchbase-setting', __FILE__)
|
||||||
|
|
||||||
|
|
||||||
if defined?(Bundler)
|
if defined?(Bundler)
|
||||||
# If you precompile assets before deploying to production, use this line
|
# If you precompile assets before deploying to production, use this line
|
||||||
Bundler.require(*Rails.groups(:assets => %w(development test)))
|
Bundler.require(*Rails.groups(assets: %w(development test)))
|
||||||
|
Bundler.require(:assets) if ENV['QWAITER_MOBILE_EXPORT']='yes'
|
||||||
# If you want your assets lazily compiled in production, use this line
|
# If you want your assets lazily compiled in production, use this line
|
||||||
# Bundler.require(:default, :assets, Rails.env)
|
# Bundler.require(:default, :assets, Rails.env)
|
||||||
end
|
end
|
||||||
|
|
||||||
# Ugly fix for the updated json gem changes
|
require 'simply_stored'
|
||||||
module JSON
|
module SimplyStored
|
||||||
class << self
|
module Couch
|
||||||
alias :old_parse :parse
|
def freeze
|
||||||
def parse(json, args = {})
|
self
|
||||||
args[:create_additions] = true
|
end
|
||||||
old_parse(json, args)
|
|
||||||
|
module ClassMethods
|
||||||
|
def after_commit(*)
|
||||||
|
# Paperclip has ActiveRecord lock, do not use this
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
MultiJson.engine = :json_gem
|
|
||||||
|
# Ugly fix for the updated json gem changes
|
||||||
|
#module JSON
|
||||||
|
#class << self
|
||||||
|
#alias :old_parse :parse
|
||||||
|
#def parse(json, args = {})
|
||||||
|
#args[:create_additions] = true
|
||||||
|
#old_parse(json, args)
|
||||||
|
#end
|
||||||
|
#end
|
||||||
|
#end
|
||||||
|
#MultiJson.engine = :json_gem
|
||||||
|
|
||||||
# This is a fix for testing models that
|
# This is a fix for testing models that
|
||||||
# are frozen after destroy and then extended
|
# are frozen after destroy and then extended
|
||||||
# by active_decorator when running the specs
|
# by active_decorator when running the specs
|
||||||
require 'simply_stored'
|
|
||||||
module SimplyStored::Couch
|
|
||||||
def freeze
|
|
||||||
self
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
module Qwaiter
|
module Qwaiter
|
||||||
class Application < Rails::Application
|
class Application < Rails::Application
|
||||||
# Settings in config/environments/* take precedence over those specified here.
|
# Settings in config/environments/* take precedence over those specified here.
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ Devise.setup do |config|
|
|||||||
# modifying a user and when used to authenticate or find a user. Default is :email.
|
# modifying a user and when used to authenticate or find a user. Default is :email.
|
||||||
config.strip_whitespace_keys = [ :email ]
|
config.strip_whitespace_keys = [ :email ]
|
||||||
|
|
||||||
config.allow_insecure_sign_in_after_confirmation = true
|
#config.allow_insecure_sign_in_after_confirmation = true
|
||||||
|
|
||||||
# Tell if authentication through request.params is enabled. True by default.
|
# Tell if authentication through request.params is enabled. True by default.
|
||||||
# It can be set to an array that will enable params authentication only for the
|
# It can be set to an array that will enable params authentication only for the
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
step "the list is marked as in need of help" do
|
step "the list is marked as in need of help" do
|
||||||
@list.needs_help.should_not be_true
|
@list.needs_help.should_not be true
|
||||||
@list.needs_help!
|
@list.needs_help!
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ step "then new product category with proper properties linked to the first produ
|
|||||||
sleep 1
|
sleep 1
|
||||||
@product_category = ProductCategory.find_by_name 'New product category'
|
@product_category = ProductCategory.find_by_name 'New product category'
|
||||||
@product_category.week_days.should == [0, 0, 1, 0, 0, 0, 0]
|
@product_category.week_days.should == [0, 0, 1, 0, 0, 0, 0]
|
||||||
@product_category.full_day.should be_true
|
@product_category.full_day.should be true
|
||||||
@product_category.product_ids.should == [@products.first.id]
|
@product_category.product_ids.should == [@products.first.id]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -29,9 +29,9 @@ describe List do
|
|||||||
list.paid_at.should be_kind_of Time
|
list.paid_at.should be_kind_of Time
|
||||||
end
|
end
|
||||||
it "should set is_paid to true" do
|
it "should set is_paid to true" do
|
||||||
list.is_paid.should be_false
|
list.is_paid.should be false
|
||||||
list.is_paid!
|
list.is_paid!
|
||||||
list.is_paid.should be_true
|
list.is_paid.should be true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -66,31 +66,31 @@ describe List do
|
|||||||
end
|
end
|
||||||
|
|
||||||
describe '#has_active_orders?' do
|
describe '#has_active_orders?' do
|
||||||
its(:has_active_orders?) { should be_false }
|
its(:has_active_orders?) { should be false }
|
||||||
|
|
||||||
it 'returns true when there are placed orders for the list' do
|
it 'returns true when there are placed orders for the list' do
|
||||||
create :order, supplier: supplier, list: list, section: section, state: 'placed'
|
create :order, supplier: supplier, list: list, section: section, state: 'placed'
|
||||||
list.has_active_orders?.should be_true
|
list.has_active_orders?.should be true
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns true when there are active orders for the list' do
|
it 'returns true when there are active orders for the list' do
|
||||||
create :order, supplier: supplier, list: list, section: section, state: 'active'
|
create :order, supplier: supplier, list: list, section: section, state: 'active'
|
||||||
list.has_active_orders?.should be_true
|
list.has_active_orders?.should be true
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns false when there are only delivered orders' do
|
it 'returns false when there are only delivered orders' do
|
||||||
create :order, supplier: supplier, list: list, section: section, state: 'delivered'
|
create :order, supplier: supplier, list: list, section: section, state: 'delivered'
|
||||||
list.has_active_orders?.should be_false
|
list.has_active_orders?.should be false
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns false when there are only closed orders' do
|
it 'returns false when there are only closed orders' do
|
||||||
create :order, supplier: supplier, list: list, section: section, state: 'closed'
|
create :order, supplier: supplier, list: list, section: section, state: 'closed'
|
||||||
list.has_active_orders?.should be_false
|
list.has_active_orders?.should be false
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns false when there are only cancelled orders' do
|
it 'returns false when there are only cancelled orders' do
|
||||||
create :order, supplier: supplier, list: list, section: section, state: 'cancelled'
|
create :order, supplier: supplier, list: list, section: section, state: 'cancelled'
|
||||||
list.has_active_orders?.should be_false
|
list.has_active_orders?.should be false
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -10,8 +10,8 @@ describe Order do
|
|||||||
let(:order) {create :order, supplier: supplier, list: list, state: 'placed' }
|
let(:order) {create :order, supplier: supplier, list: list, state: 'placed' }
|
||||||
subject { order }
|
subject { order }
|
||||||
|
|
||||||
its(:placed?) { should be_true }
|
its(:placed?) { should be true }
|
||||||
its(:active?) { should be_false }
|
its(:active?) { should be false }
|
||||||
|
|
||||||
describe 'count_active_for_supplier_and_list' do
|
describe 'count_active_for_supplier_and_list' do
|
||||||
before { order }
|
before { order }
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ describe Product do
|
|||||||
pc2 = create :product_category, supplier: supplier
|
pc2 = create :product_category, supplier: supplier
|
||||||
|
|
||||||
product = build :product, supplier: supplier, product_category_ids: [pc1.id]
|
product = build :product, supplier: supplier, product_category_ids: [pc1.id]
|
||||||
product.save.should be_true
|
product.save.should be true
|
||||||
product.reload
|
product.reload
|
||||||
pc1.reload
|
pc1.reload
|
||||||
pc2.reload
|
pc2.reload
|
||||||
|
|||||||
+1
-1
@@ -89,7 +89,7 @@ RSpec.configure do |config|
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Use color in STDOUT
|
# Use color in STDOUT
|
||||||
config.color_enabled = true
|
config.color = true
|
||||||
config.fail_fast = false
|
config.fail_fast = false
|
||||||
|
|
||||||
# Use color not only in STDOUT but also in pagers and files
|
# Use color not only in STDOUT but also in pagers and files
|
||||||
|
|||||||
+1406
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user