mirror of
https://github.com/jcwimer/wrestlingApp
synced 2026-03-24 17:04:43 +00:00
fixed bootstrap
This commit is contained in:
64
Gemfile
64
Gemfile
@@ -1,47 +1,57 @@
|
||||
source 'https://rubygems.org'
|
||||
|
||||
|
||||
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
|
||||
gem 'rails', '4.0.2'
|
||||
|
||||
group :development do
|
||||
# Use sqlite3 as the database for Active Record
|
||||
gem 'sqlite3'
|
||||
end
|
||||
|
||||
group :production do
|
||||
gem 'pg', '0.15.1'
|
||||
gem 'mysql2'
|
||||
end
|
||||
|
||||
gem 'rails', '4.1.4'
|
||||
# Use sqlite3 as the database for Active Record
|
||||
gem 'sqlite3', :group => :development
|
||||
# Use SCSS for stylesheets
|
||||
gem 'sass-rails', '~> 4.0.0'
|
||||
|
||||
gem 'sass-rails', '~> 4.0.3'
|
||||
# Use Uglifier as compressor for JavaScript assets
|
||||
gem 'uglifier', '>= 1.3.0'
|
||||
|
||||
# Use CoffeeScript for .js.coffee assets and views
|
||||
gem 'coffee-rails', '~> 4.0.0'
|
||||
|
||||
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
|
||||
# gem 'therubyracer', platforms: :ruby
|
||||
# gem 'therubyracer', platforms: :ruby
|
||||
|
||||
# Use jquery as the JavaScript library
|
||||
gem 'jquery-rails'
|
||||
|
||||
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
|
||||
gem 'turbolinks'
|
||||
|
||||
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
|
||||
gem 'jbuilder', '~> 1.2'
|
||||
gem 'jbuilder', '~> 2.0'
|
||||
# bundle exec rake doc:rails generates the API under doc/api.
|
||||
gem 'sdoc', '~> 0.4.0', group: :doc
|
||||
|
||||
group :doc do
|
||||
# bundle exec rake doc:rails generates the API under doc/api.
|
||||
gem 'sdoc', require: false
|
||||
end
|
||||
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
|
||||
gem 'spring', group: :development
|
||||
|
||||
#MY GEMS
|
||||
gem 'devise'
|
||||
# Use ActiveModel has_secure_password
|
||||
# gem 'bcrypt', '~> 3.1.7'
|
||||
|
||||
# Use unicorn as the app server
|
||||
# gem 'unicorn'
|
||||
|
||||
# Use Capistrano for deployment
|
||||
# gem 'capistrano-rails', group: :development
|
||||
|
||||
# Use debugger
|
||||
# gem 'debugger', group: [:development, :test]
|
||||
|
||||
|
||||
#Install by me
|
||||
#For Heroku
|
||||
group :production do
|
||||
gem 'pg'
|
||||
gem 'rails_12factor'
|
||||
gem 'mysql2'
|
||||
end
|
||||
#Other
|
||||
#gem 'capistrano', :group => :development
|
||||
gem 'bootstrap-sass', '2.3.2.0'
|
||||
gem 'devise'
|
||||
gem 'cancan'
|
||||
gem 'bootstrap-sass', '3.1.1.0'
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
107
Gemfile.lock
107
Gemfile.lock
@@ -1,35 +1,37 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
actionmailer (4.0.2)
|
||||
actionpack (= 4.0.2)
|
||||
actionmailer (4.1.4)
|
||||
actionpack (= 4.1.4)
|
||||
actionview (= 4.1.4)
|
||||
mail (~> 2.5.4)
|
||||
actionpack (4.0.2)
|
||||
activesupport (= 4.0.2)
|
||||
builder (~> 3.1.0)
|
||||
erubis (~> 2.7.0)
|
||||
actionpack (4.1.4)
|
||||
actionview (= 4.1.4)
|
||||
activesupport (= 4.1.4)
|
||||
rack (~> 1.5.2)
|
||||
rack-test (~> 0.6.2)
|
||||
activemodel (4.0.2)
|
||||
activesupport (= 4.0.2)
|
||||
builder (~> 3.1.0)
|
||||
activerecord (4.0.2)
|
||||
activemodel (= 4.0.2)
|
||||
activerecord-deprecated_finders (~> 1.0.2)
|
||||
activesupport (= 4.0.2)
|
||||
arel (~> 4.0.0)
|
||||
activerecord-deprecated_finders (1.0.3)
|
||||
activesupport (4.0.2)
|
||||
i18n (~> 0.6, >= 0.6.4)
|
||||
minitest (~> 4.2)
|
||||
multi_json (~> 1.3)
|
||||
actionview (4.1.4)
|
||||
activesupport (= 4.1.4)
|
||||
builder (~> 3.1)
|
||||
erubis (~> 2.7.0)
|
||||
activemodel (4.1.4)
|
||||
activesupport (= 4.1.4)
|
||||
builder (~> 3.1)
|
||||
activerecord (4.1.4)
|
||||
activemodel (= 4.1.4)
|
||||
activesupport (= 4.1.4)
|
||||
arel (~> 5.0.0)
|
||||
activesupport (4.1.4)
|
||||
i18n (~> 0.6, >= 0.6.9)
|
||||
json (~> 1.7, >= 1.7.7)
|
||||
minitest (~> 5.1)
|
||||
thread_safe (~> 0.1)
|
||||
tzinfo (~> 0.3.37)
|
||||
arel (4.0.2)
|
||||
tzinfo (~> 1.1)
|
||||
arel (5.0.1.20140414130214)
|
||||
bcrypt (3.1.9)
|
||||
bootstrap-sass (3.1.1.0)
|
||||
bootstrap-sass (2.3.2.0)
|
||||
sass (~> 3.2)
|
||||
builder (3.1.4)
|
||||
builder (3.2.2)
|
||||
cancan (1.6.10)
|
||||
coffee-rails (4.0.1)
|
||||
coffee-script (>= 2.2.0)
|
||||
@@ -49,9 +51,9 @@ GEM
|
||||
execjs (2.2.2)
|
||||
hike (1.2.3)
|
||||
i18n (0.7.0)
|
||||
jbuilder (1.5.3)
|
||||
activesupport (>= 3.0.0)
|
||||
multi_json (>= 1.2.0)
|
||||
jbuilder (2.2.6)
|
||||
activesupport (>= 3.0.0, < 5)
|
||||
multi_json (~> 1.2)
|
||||
jquery-rails (3.1.2)
|
||||
railties (>= 3.0, < 5.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
@@ -60,26 +62,33 @@ GEM
|
||||
mime-types (~> 1.16)
|
||||
treetop (~> 1.4.8)
|
||||
mime-types (1.25.1)
|
||||
minitest (4.7.5)
|
||||
minitest (5.5.0)
|
||||
multi_json (1.10.1)
|
||||
mysql2 (0.3.17)
|
||||
orm_adapter (0.5.0)
|
||||
pg (0.15.1)
|
||||
pg (0.17.1)
|
||||
polyglot (0.3.5)
|
||||
rack (1.5.2)
|
||||
rack-test (0.6.2)
|
||||
rack (>= 1.0)
|
||||
rails (4.0.2)
|
||||
actionmailer (= 4.0.2)
|
||||
actionpack (= 4.0.2)
|
||||
activerecord (= 4.0.2)
|
||||
activesupport (= 4.0.2)
|
||||
rails (4.1.4)
|
||||
actionmailer (= 4.1.4)
|
||||
actionpack (= 4.1.4)
|
||||
actionview (= 4.1.4)
|
||||
activemodel (= 4.1.4)
|
||||
activerecord (= 4.1.4)
|
||||
activesupport (= 4.1.4)
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.0.2)
|
||||
sprockets-rails (~> 2.0.0)
|
||||
railties (4.0.2)
|
||||
actionpack (= 4.0.2)
|
||||
activesupport (= 4.0.2)
|
||||
railties (= 4.1.4)
|
||||
sprockets-rails (~> 2.0)
|
||||
rails_12factor (0.0.3)
|
||||
rails_serve_static_assets
|
||||
rails_stdout_logging
|
||||
rails_serve_static_assets (0.0.2)
|
||||
rails_stdout_logging (0.0.3)
|
||||
railties (4.1.4)
|
||||
actionpack (= 4.1.4)
|
||||
activesupport (= 4.1.4)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (10.4.2)
|
||||
@@ -96,15 +105,16 @@ GEM
|
||||
sdoc (0.4.1)
|
||||
json (~> 1.7, >= 1.7.7)
|
||||
rdoc (~> 4.0)
|
||||
spring (1.2.0)
|
||||
sprockets (2.12.3)
|
||||
hike (~> 1.2)
|
||||
multi_json (~> 1.0)
|
||||
rack (~> 1.0)
|
||||
tilt (~> 1.1, != 1.3.0)
|
||||
sprockets-rails (2.0.1)
|
||||
sprockets-rails (2.2.2)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
sprockets (~> 2.8)
|
||||
sprockets (>= 2.8, < 4.0)
|
||||
sqlite3 (1.3.10)
|
||||
thor (0.19.1)
|
||||
thread_safe (0.3.4)
|
||||
@@ -114,7 +124,8 @@ GEM
|
||||
polyglot (>= 0.3.1)
|
||||
turbolinks (2.5.3)
|
||||
coffee-rails
|
||||
tzinfo (0.3.42)
|
||||
tzinfo (1.2.2)
|
||||
thread_safe (~> 0.1)
|
||||
uglifier (2.6.0)
|
||||
execjs (>= 0.3.0)
|
||||
json (>= 1.8.0)
|
||||
@@ -125,17 +136,19 @@ PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
bootstrap-sass (= 3.1.1.0)
|
||||
bootstrap-sass (= 2.3.2.0)
|
||||
cancan
|
||||
coffee-rails (~> 4.0.0)
|
||||
devise
|
||||
jbuilder (~> 1.2)
|
||||
jbuilder (~> 2.0)
|
||||
jquery-rails
|
||||
mysql2
|
||||
pg (= 0.15.1)
|
||||
rails (= 4.0.2)
|
||||
sass-rails (~> 4.0.0)
|
||||
sdoc
|
||||
pg
|
||||
rails (= 4.1.4)
|
||||
rails_12factor
|
||||
sass-rails (~> 4.0.3)
|
||||
sdoc (~> 0.4.0)
|
||||
spring
|
||||
sqlite3
|
||||
turbolinks
|
||||
uglifier (>= 1.3.0)
|
||||
|
||||
14
app/assets/stylesheets/application.css
Normal file
14
app/assets/stylesheets/application.css
Normal file
@@ -0,0 +1,14 @@
|
||||
/*
|
||||
* 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_tree .
|
||||
*/
|
||||
|
||||
@@ -2,8 +2,9 @@
|
||||
<html>
|
||||
<head>
|
||||
<title>Comet Wrestling</title>
|
||||
<%= stylesheet_link_tag "application", media: "all" %>
|
||||
<%= javascript_include_tag "application" %>
|
||||
<%= stylesheet_link_tag "application", media: "all",
|
||||
"data-turbolinks-track" => true %>
|
||||
<%= javascript_include_tag "application", "data-turbolinks-track" => true %>
|
||||
<%= csrf_meta_tags %>
|
||||
<%= render 'layouts/shim' %>
|
||||
</head>
|
||||
|
||||
8261
public/assets/application-a47042d6a31f9a587f6c443dea325171.css
Normal file
8261
public/assets/application-a47042d6a31f9a587f6c443dea325171.css
Normal file
File diff suppressed because it is too large
Load Diff
Binary file not shown.
11584
public/assets/application-f97f0ef88ebed52794953f9d19d8f0f3.js
Normal file
11584
public/assets/application-f97f0ef88ebed52794953f9d19d8f0f3.js
Normal file
File diff suppressed because it is too large
Load Diff
BIN
public/assets/application-f97f0ef88ebed52794953f9d19d8f0f3.js.gz
Normal file
BIN
public/assets/application-f97f0ef88ebed52794953f9d19d8f0f3.js.gz
Normal file
Binary file not shown.
@@ -1 +1 @@
|
||||
{"files":{"application-ea5ff64583154df83ac5980a1cfc1e90.js":{"logical_path":"application.js","mtime":"2014-01-20T12:52:52-05:00","size":366645,"digest":"ea5ff64583154df83ac5980a1cfc1e90"},"application-6b0b707091a1949f5e17ff2421901530.css":{"logical_path":"application.css","mtime":"2014-01-22T09:25:27-05:00","size":261507,"digest":"6b0b707091a1949f5e17ff2421901530"},"application-6d9f7394acf1455f9524b1a14d0914da.js":{"logical_path":"application.js","mtime":"2014-12-22T14:32:32-05:00","size":381043,"digest":"6d9f7394acf1455f9524b1a14d0914da"},"application-2d20a983be112d731e95ab137abac26c.css":{"logical_path":"application.css","mtime":"2014-12-22T14:32:32-05:00","size":625658,"digest":"2d20a983be112d731e95ab137abac26c"},"bootstrap/glyphicons-halflings-regular-2ee37a58f128322bba7e61bcc5e57382.eot":{"logical_path":"bootstrap/glyphicons-halflings-regular.eot","mtime":"2014-12-22T14:32:32-05:00","size":20335,"digest":"2ee37a58f128322bba7e61bcc5e57382"},"bootstrap/glyphicons-halflings-regular-bd1add00e21381b0a98d14c4114bf122.svg":{"logical_path":"bootstrap/glyphicons-halflings-regular.svg","mtime":"2014-12-22T14:32:32-05:00","size":62927,"digest":"bd1add00e21381b0a98d14c4114bf122"},"bootstrap/glyphicons-halflings-regular-89e0a415c0912e07dec0c0457d43187b.ttf":{"logical_path":"bootstrap/glyphicons-halflings-regular.ttf","mtime":"2014-12-22T14:32:32-05:00","size":41280,"digest":"89e0a415c0912e07dec0c0457d43187b"},"bootstrap/glyphicons-halflings-regular-602bd5000f315897da32a5723a5533f5.woff":{"logical_path":"bootstrap/glyphicons-halflings-regular.woff","mtime":"2014-12-22T14:32:32-05:00","size":23320,"digest":"602bd5000f315897da32a5723a5533f5"},"application-9e50c4ef4320296d540ade56b972a5a4.css":{"logical_path":"application.css","mtime":"2014-12-22T14:34:14-05:00","size":603249,"digest":"9e50c4ef4320296d540ade56b972a5a4"}},"assets":{"application.js":"application-6d9f7394acf1455f9524b1a14d0914da.js","application.css":"application-9e50c4ef4320296d540ade56b972a5a4.css","bootstrap/glyphicons-halflings-regular.eot":"bootstrap/glyphicons-halflings-regular-2ee37a58f128322bba7e61bcc5e57382.eot","bootstrap/glyphicons-halflings-regular.svg":"bootstrap/glyphicons-halflings-regular-bd1add00e21381b0a98d14c4114bf122.svg","bootstrap/glyphicons-halflings-regular.ttf":"bootstrap/glyphicons-halflings-regular-89e0a415c0912e07dec0c0457d43187b.ttf","bootstrap/glyphicons-halflings-regular.woff":"bootstrap/glyphicons-halflings-regular-602bd5000f315897da32a5723a5533f5.woff"}}
|
||||
{"files":{"application-ea5ff64583154df83ac5980a1cfc1e90.js":{"logical_path":"application.js","mtime":"2014-01-20T12:52:52-05:00","size":366645,"digest":"ea5ff64583154df83ac5980a1cfc1e90"},"application-6b0b707091a1949f5e17ff2421901530.css":{"logical_path":"application.css","mtime":"2014-01-22T09:25:27-05:00","size":261507,"digest":"6b0b707091a1949f5e17ff2421901530"},"application-6d9f7394acf1455f9524b1a14d0914da.js":{"logical_path":"application.js","mtime":"2014-12-22T14:32:32-05:00","size":381043,"digest":"6d9f7394acf1455f9524b1a14d0914da"},"application-2d20a983be112d731e95ab137abac26c.css":{"logical_path":"application.css","mtime":"2014-12-22T14:32:32-05:00","size":625658,"digest":"2d20a983be112d731e95ab137abac26c"},"bootstrap/glyphicons-halflings-regular-2ee37a58f128322bba7e61bcc5e57382.eot":{"logical_path":"bootstrap/glyphicons-halflings-regular.eot","mtime":"2014-12-22T14:45:45-05:00","size":20335,"digest":"2ee37a58f128322bba7e61bcc5e57382"},"bootstrap/glyphicons-halflings-regular-bd1add00e21381b0a98d14c4114bf122.svg":{"logical_path":"bootstrap/glyphicons-halflings-regular.svg","mtime":"2014-12-22T14:45:45-05:00","size":62927,"digest":"bd1add00e21381b0a98d14c4114bf122"},"bootstrap/glyphicons-halflings-regular-89e0a415c0912e07dec0c0457d43187b.ttf":{"logical_path":"bootstrap/glyphicons-halflings-regular.ttf","mtime":"2014-12-22T14:45:45-05:00","size":41280,"digest":"89e0a415c0912e07dec0c0457d43187b"},"bootstrap/glyphicons-halflings-regular-602bd5000f315897da32a5723a5533f5.woff":{"logical_path":"bootstrap/glyphicons-halflings-regular.woff","mtime":"2014-12-22T14:45:45-05:00","size":23320,"digest":"602bd5000f315897da32a5723a5533f5"},"application-9e50c4ef4320296d540ade56b972a5a4.css":{"logical_path":"application.css","mtime":"2014-12-22T14:34:14-05:00","size":603249,"digest":"9e50c4ef4320296d540ade56b972a5a4"},"application-f97f0ef88ebed52794953f9d19d8f0f3.js":{"logical_path":"application.js","mtime":"2014-12-22T14:48:50-05:00","size":326040,"digest":"f97f0ef88ebed52794953f9d19d8f0f3"},"application-a47042d6a31f9a587f6c443dea325171.css":{"logical_path":"application.css","mtime":"2014-12-22T14:49:34-05:00","size":321362,"digest":"a47042d6a31f9a587f6c443dea325171"}},"assets":{"application.js":"application-f97f0ef88ebed52794953f9d19d8f0f3.js","application.css":"application-a47042d6a31f9a587f6c443dea325171.css","bootstrap/glyphicons-halflings-regular.eot":"bootstrap/glyphicons-halflings-regular-2ee37a58f128322bba7e61bcc5e57382.eot","bootstrap/glyphicons-halflings-regular.svg":"bootstrap/glyphicons-halflings-regular-bd1add00e21381b0a98d14c4114bf122.svg","bootstrap/glyphicons-halflings-regular.ttf":"bootstrap/glyphicons-halflings-regular-89e0a415c0912e07dec0c0457d43187b.ttf","bootstrap/glyphicons-halflings-regular.woff":"bootstrap/glyphicons-halflings-regular-602bd5000f315897da32a5723a5533f5.woff"}}
|
||||
Reference in New Issue
Block a user