Removed Bootstrap and converted to scss
This commit is contained in:
parent
8df05b288f
commit
25664fe55d
5
Gemfile
5
Gemfile
@ -37,12 +37,13 @@ gem 'haml_assets'
|
|||||||
# gem 'handlebars_assets'
|
# gem 'handlebars_assets'
|
||||||
gem 'i18n-js'
|
gem 'i18n-js'
|
||||||
gem 'jquery-turbolinks'
|
gem 'jquery-turbolinks'
|
||||||
gem 'less-rails'
|
# gem 'less-rails'
|
||||||
gem 'sass-rails', '~> 4.0.0'
|
gem 'sass-rails', '~> 4.0.0'
|
||||||
gem 'therubyracer'
|
gem 'therubyracer'
|
||||||
gem 'compass-rails', '~> 2.0.alpha.0'
|
gem 'compass-rails', '~> 2.0.alpha.0'
|
||||||
|
gem 'zurb-foundation'
|
||||||
gem 'turbolinks'
|
gem 'turbolinks'
|
||||||
gem 'twitter-bootstrap-rails', github: 'diowa/twitter-bootstrap-rails', branch: 'fontawesome-3.2.1'
|
# gem 'twitter-bootstrap-rails', github: 'diowa/twitter-bootstrap-rails', branch: 'fontawesome-3.2.1'
|
||||||
gem 'uglifier', '>= 1.3.0'
|
gem 'uglifier', '>= 1.3.0'
|
||||||
|
|
||||||
group :development, :test do
|
group :development, :test do
|
||||||
|
29
Gemfile.lock
29
Gemfile.lock
@ -1,14 +1,3 @@
|
|||||||
GIT
|
|
||||||
remote: git://github.com/diowa/twitter-bootstrap-rails.git
|
|
||||||
revision: 05f7e9fa7f1c7d7101d2f177169e8d632b9b9e65
|
|
||||||
branch: fontawesome-3.2.1
|
|
||||||
specs:
|
|
||||||
twitter-bootstrap-rails (2.2.7)
|
|
||||||
actionpack (>= 3.1)
|
|
||||||
execjs
|
|
||||||
rails (>= 3.1)
|
|
||||||
railties (>= 3.1)
|
|
||||||
|
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
@ -67,7 +56,6 @@ GEM
|
|||||||
execjs
|
execjs
|
||||||
coffee-script-source (1.6.3)
|
coffee-script-source (1.6.3)
|
||||||
columnize (0.3.6)
|
columnize (0.3.6)
|
||||||
commonjs (0.2.7)
|
|
||||||
compass (0.12.2)
|
compass (0.12.2)
|
||||||
chunky_png (~> 1.2)
|
chunky_png (~> 1.2)
|
||||||
fssm (>= 0.2.7)
|
fssm (>= 0.2.7)
|
||||||
@ -82,6 +70,7 @@ GEM
|
|||||||
thor
|
thor
|
||||||
crack (0.4.1)
|
crack (0.4.1)
|
||||||
safe_yaml (~> 0.9.0)
|
safe_yaml (~> 0.9.0)
|
||||||
|
daemons (1.1.9)
|
||||||
database_cleaner (1.2.0)
|
database_cleaner (1.2.0)
|
||||||
debug_inspector (0.0.2)
|
debug_inspector (0.0.2)
|
||||||
debugger (1.6.2)
|
debugger (1.6.2)
|
||||||
@ -97,6 +86,7 @@ GEM
|
|||||||
launchy (~> 2.1)
|
launchy (~> 2.1)
|
||||||
mail (~> 2.2)
|
mail (~> 2.2)
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
|
eventmachine (1.0.3-x86-mingw32)
|
||||||
execjs (2.0.2)
|
execjs (2.0.2)
|
||||||
factory_girl (4.2.0)
|
factory_girl (4.2.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
@ -124,11 +114,6 @@ GEM
|
|||||||
turbolinks
|
turbolinks
|
||||||
launchy (2.3.0)
|
launchy (2.3.0)
|
||||||
addressable (~> 2.3)
|
addressable (~> 2.3)
|
||||||
less (2.4.0)
|
|
||||||
commonjs (~> 0.2.7)
|
|
||||||
less-rails (2.4.2)
|
|
||||||
actionpack (>= 3.1)
|
|
||||||
less (~> 2.4.0)
|
|
||||||
mail (2.5.4)
|
mail (2.5.4)
|
||||||
mime-types (~> 1.16)
|
mime-types (~> 1.16)
|
||||||
treetop (~> 1.4.8)
|
treetop (~> 1.4.8)
|
||||||
@ -224,6 +209,10 @@ GEM
|
|||||||
tins (~> 0.8)
|
tins (~> 0.8)
|
||||||
therubyracer (0.11.0beta1-x86-mingw32)
|
therubyracer (0.11.0beta1-x86-mingw32)
|
||||||
ref
|
ref
|
||||||
|
thin (1.5.1)
|
||||||
|
daemons (>= 1.0.9)
|
||||||
|
eventmachine (>= 0.12.6)
|
||||||
|
rack (>= 1.0.0)
|
||||||
thor (0.18.1)
|
thor (0.18.1)
|
||||||
thread_safe (0.1.3)
|
thread_safe (0.1.3)
|
||||||
atomic
|
atomic
|
||||||
@ -246,6 +235,8 @@ GEM
|
|||||||
win32console (1.3.2-x86-mingw32)
|
win32console (1.3.2-x86-mingw32)
|
||||||
xpath (2.0.0)
|
xpath (2.0.0)
|
||||||
nokogiri (~> 1.3)
|
nokogiri (~> 1.3)
|
||||||
|
zurb-foundation (4.3.2)
|
||||||
|
sass (>= 3.2.0)
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
x86-mingw32
|
x86-mingw32
|
||||||
@ -270,7 +261,6 @@ DEPENDENCIES
|
|||||||
jquery-rails
|
jquery-rails
|
||||||
jquery-turbolinks
|
jquery-turbolinks
|
||||||
launchy
|
launchy
|
||||||
less-rails
|
|
||||||
meta_request
|
meta_request
|
||||||
pg
|
pg
|
||||||
pry
|
pry
|
||||||
@ -283,7 +273,8 @@ DEPENDENCIES
|
|||||||
selenium-webdriver
|
selenium-webdriver
|
||||||
simplecov
|
simplecov
|
||||||
therubyracer
|
therubyracer
|
||||||
|
thin
|
||||||
turbolinks
|
turbolinks
|
||||||
twitter-bootstrap-rails!
|
|
||||||
uglifier (>= 1.3.0)
|
uglifier (>= 1.3.0)
|
||||||
webmock
|
webmock
|
||||||
|
zurb-foundation
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
#= require turbolinks
|
#= require turbolinks
|
||||||
|
|
||||||
# FRONT END
|
# FRONT END
|
||||||
#= require twitter/bootstrap
|
|
||||||
|
|
||||||
# JS HANDLEBARS TEMPLATES
|
# JS HANDLEBARS TEMPLATES
|
||||||
# require handlebars.runtime
|
# require handlebars.runtime
|
||||||
|
@ -8,9 +8,9 @@
|
|||||||
* 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.
|
||||||
*
|
*
|
||||||
*= stub stubs/variables_overrides.css.less
|
* = stub stubs/variables_overrides.css.scss
|
||||||
*= require_self
|
*= require_self
|
||||||
*= require_tree .
|
*= require_tree .
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@import "stubs/variables_overrides.css.less";
|
//@include "stubs/variables_overrides.css.scss";
|
@ -1,26 +0,0 @@
|
|||||||
@import "twitter/bootstrap/bootstrap";
|
|
||||||
|
|
||||||
body {
|
|
||||||
padding-top: @navbarHeight + 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
@import "twitter/bootstrap/responsive";
|
|
||||||
|
|
||||||
// Set the correct sprite paths
|
|
||||||
//@iconSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings");
|
|
||||||
//@iconWhiteSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings-white");
|
|
||||||
|
|
||||||
// Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines)
|
|
||||||
@fontAwesomeEotPath: asset-url("fontawesome-webfont.eot");
|
|
||||||
@fontAwesomeEotPath_iefix: asset-url("fontawesome-webfont.eot?#iefix");
|
|
||||||
@fontAwesomeWoffPath: asset-url("fontawesome-webfont.woff");
|
|
||||||
@fontAwesomeTtfPath: asset-url("fontawesome-webfont.ttf");
|
|
||||||
@fontAwesomeSvgPath: asset-url("fontawesome-webfont.svg#fontawesomeregular");
|
|
||||||
|
|
||||||
// Font Awesome
|
|
||||||
@import "fontawesome/font-awesome";
|
|
||||||
|
|
||||||
// Glyphicons
|
|
||||||
//@import "twitter/bootstrap/sprites.less";
|
|
||||||
|
|
||||||
// Override the default bootstrap variables in stubs/variables_overrides.css.less
|
|
27
app/assets/stylesheets/bootstrap_and_overrides.css.scss
vendored
Normal file
27
app/assets/stylesheets/bootstrap_and_overrides.css.scss
vendored
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
//@import "twitter/bootstrap/bootstrap";
|
||||||
|
|
||||||
|
body {
|
||||||
|
/*padding-top: $navbarHeight + 10px;*/
|
||||||
|
background-color: #BBB;
|
||||||
|
}
|
||||||
|
|
||||||
|
//@import "twitter/bootstrap/responsive";
|
||||||
|
|
||||||
|
// Set the correct sprite paths
|
||||||
|
//@iconSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings");
|
||||||
|
//@iconWhiteSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings-white");
|
||||||
|
|
||||||
|
// Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines)
|
||||||
|
//@fontAwesomeEotPath: asset-url("fontawesome-webfont.eot");
|
||||||
|
//@fontAwesomeEotPath_iefix: asset-url("fontawesome-webfont.eot?#iefix");
|
||||||
|
//@fontAwesomeWoffPath: asset-url("fontawesome-webfont.woff");
|
||||||
|
//@fontAwesomeTtfPath: asset-url("fontawesome-webfont.ttf");
|
||||||
|
//@fontAwesomeSvgPath: asset-url("fontawesome-webfont.svg#fontawesomeregular");
|
||||||
|
|
||||||
|
// Font Awesome
|
||||||
|
//@import "fontawesome/font-awesome";
|
||||||
|
|
||||||
|
// Glyphicons
|
||||||
|
//@import "twitter/bootstrap/sprites.less";
|
||||||
|
|
||||||
|
// Override the default bootstrap variables in stubs/variables_overrides.css.less
|
@ -1,4 +1,4 @@
|
|||||||
@import "twitter/bootstrap/variables";
|
// @import "twitter/bootstrap/variables";
|
||||||
|
|
||||||
/* ==========================================================================
|
/* ==========================================================================
|
||||||
Variables and overrides
|
Variables and overrides
|
||||||
@ -10,4 +10,4 @@
|
|||||||
/* Bootstrap variables override
|
/* Bootstrap variables override
|
||||||
========================================================================== */
|
========================================================================== */
|
||||||
|
|
||||||
@sansFontFamily: "Ubuntu", "Helvetica Neue", Helvetica, Arial, sans-serif;
|
$sansFontFamily: "Ubuntu", "Helvetica Neue", Helvetica, Arial, sans-serif;
|
@ -16,23 +16,14 @@
|
|||||||
#
|
#
|
||||||
development:
|
development:
|
||||||
adapter: postgresql
|
adapter: postgresql
|
||||||
encoding: unicode
|
encoding: utf8
|
||||||
database: <%= ENV['STARTER_APP_DEV_DB_DATABASE'] || 'starterapp_development' %>
|
database: bike_bike_dev
|
||||||
|
username: bike_bike
|
||||||
|
password: NewOrleans@)!#
|
||||||
|
host: 127.0.0.1
|
||||||
|
port: 5433
|
||||||
pool: 5
|
pool: 5
|
||||||
username: <%= ENV['STARTER_APP_DEV_DB_USER'] || 'postgres' %>
|
|
||||||
password: <%= ENV['STARTER_APP_DEV_DB_PASSWORD'] %>
|
|
||||||
|
|
||||||
# Connect on a TCP socket. Omitted by default since the client uses a
|
|
||||||
# domain socket that doesn't need configuration. Windows does not have
|
|
||||||
# domain sockets, so uncomment these lines.
|
|
||||||
host: <%= ENV['STARTER_APP_DEV_DB_HOST'] || 'localhost' %>
|
|
||||||
|
|
||||||
# The TCP port the server listens on. Defaults to 5432.
|
|
||||||
# If your server runs on a different port number, change accordingly.
|
|
||||||
port: <%= ENV['STARTER_APP_DEV_DB_PORT'] || '5432' %>
|
|
||||||
|
|
||||||
# Schema search path. The server defaults to $user,public
|
|
||||||
#schema_search_path: myapp,sharedapp,public
|
|
||||||
|
|
||||||
# Minimum log levels, in increasing order:
|
# Minimum log levels, in increasing order:
|
||||||
# debug5, debug4, debug3, debug2, debug1,
|
# debug5, debug4, debug3, debug2, debug1,
|
||||||
@ -45,18 +36,20 @@ development:
|
|||||||
# Do not set this db to the same as development or production.
|
# Do not set this db to the same as development or production.
|
||||||
test:
|
test:
|
||||||
adapter: postgresql
|
adapter: postgresql
|
||||||
encoding: unicode
|
encoding: utf8
|
||||||
database: <%= ENV['STARTER_APP_TEST_DB_DATABASE'] || 'starterapp_test' %>
|
database: bike_bike_test
|
||||||
|
username: bike_bike
|
||||||
|
password: NewOrleans@)!#
|
||||||
|
host: 127.0.0.1
|
||||||
|
port: 5433
|
||||||
pool: 5
|
pool: 5
|
||||||
username: <%= ENV['STARTER_APP_TEST_DB_USER'] || 'postgres' %>
|
|
||||||
password: <%= ENV['STARTER_APP_TEST_DB_PASSWORD'] %>
|
|
||||||
host: <%= ENV['STARTER_APP_TEST_DB_HOST'] || 'localhost' %>
|
|
||||||
port: <%= ENV['STARTER_APP_TEST_DB_PORT'] || '5432' %>
|
|
||||||
|
|
||||||
production:
|
production:
|
||||||
adapter: postgresql
|
adapter: postgresql
|
||||||
encoding: unicode
|
encoding: utf8
|
||||||
database: starterapp_production
|
database: bike_bike
|
||||||
|
username: bike_bike
|
||||||
|
password: NewOrleans@)!#
|
||||||
|
host: 127.0.0.1
|
||||||
|
port: 5433
|
||||||
pool: 5
|
pool: 5
|
||||||
username: postgres
|
|
||||||
password:
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user