Skip to content

Commit

Permalink
updated copy, testing a fix for draggable screen
Browse files Browse the repository at this point in the history
  • Loading branch information
mikeyferg committed Mar 14, 2016
1 parent 13739a7 commit b800ddb
Show file tree
Hide file tree
Showing 363 changed files with 708 additions and 51 deletions.
15 changes: 6 additions & 9 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,13 @@ ruby "2.2.2"
gem 'bootstrap-filestyle-rails'

gem 'font-awesome-sass'
gem 'annotate'

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug'
end

group :development do
# Access an IRB console on exception pages or by using <%= console %> in views
gem 'web-console', '~> 2.0'

# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'pry'
gem 'pry-rails'
gem 'pry-byebug'
gem 'binding_of_caller'
gem 'better_errors'
end
88 changes: 54 additions & 34 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -36,50 +36,69 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
annotate (2.7.0)
activerecord (>= 3.2, < 6.0)
rake (~> 10.4)
arel (6.0.3)
autoprefixer-rails (6.3.3.1)
execjs
better_errors (2.1.1)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bootstrap-filestyle-rails (1.1.2)
bootstrap-sass (3.2.0.2)
sass (~> 3.2)
builder (3.2.2)
byebug (6.0.2)
coffee-rails (4.1.0)
byebug (8.2.2)
coderay (1.1.1)
coffee-rails (4.1.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
railties (>= 4.0.0, < 5.1.x)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.9.1.1)
coffee-script-source (1.10.0)
concurrent-ruby (1.0.1)
debug_inspector (0.0.2)
erubis (2.7.0)
execjs (2.6.0)
font-awesome-sass (4.4.0)
font-awesome-sass (4.5.0)
sass (>= 3.2)
globalid (0.3.6)
activesupport (>= 4.1.0)
i18n (0.7.0)
jbuilder (2.3.1)
activesupport (>= 3.0.0, < 5)
jbuilder (2.4.1)
activesupport (>= 3.0.0, < 5.1)
multi_json (~> 1.2)
jquery-rails (4.0.5)
rails-dom-testing (~> 1.0)
jquery-rails (4.1.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
mime-types (2.6.2)
mini_portile (0.6.2)
method_source (0.8.2)
mime-types (2.99.1)
mini_portile2 (2.0.0)
minitest (5.8.4)
multi_json (1.11.2)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
pg (0.18.3)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
pg (0.18.4)
pry (0.10.3)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-byebug (3.3.0)
byebug (~> 8.0)
pry (~> 0.10)
pry-rails (0.3.4)
pry (>= 0.9.10)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
Expand All @@ -100,21 +119,22 @@ GEM
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.2)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.4)
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.4)
railties (4.2.4)
actionpack (= 4.2.4)
activesupport (= 4.2.4)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (11.1.0)
rdoc (4.2.0)
sass (3.4.18)
rake (10.5.0)
rdoc (4.2.2)
json (~> 1.4)
sass (3.4.21)
sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0)
sass (~> 3.1)
Expand All @@ -124,34 +144,33 @@ GEM
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
spring (1.4.0)
sprockets (3.3.4)
rack (~> 1.0)
sprockets-rails (2.3.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
slop (3.6.0)
sprockets (3.5.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.0.4)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
thor (0.19.1)
thread_safe (0.3.5)
tilt (2.0.1)
tilt (2.0.2)
turbolinks (2.5.3)
coffee-rails
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
web-console (2.2.1)
activemodel (>= 4.0)
binding_of_caller (>= 0.7.2)
railties (>= 4.0)
sprockets-rails (>= 2.0, < 4.0)

PLATFORMS
ruby

DEPENDENCIES
annotate
autoprefixer-rails
better_errors
binding_of_caller
bootstrap-filestyle-rails
bootstrap-sass (~> 3.2.0)
byebug
Expand All @@ -160,14 +179,15 @@ DEPENDENCIES
jbuilder (~> 2.0)
jquery-rails
pg
pry
pry-byebug
pry-rails
rails (= 4.2.4)
rails_12factor
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
spring
turbolinks
uglifier (>= 1.3.0)
web-console (~> 2.0)

BUNDLED WITH
1.10.6
8 changes: 3 additions & 5 deletions app/assets/stylesheets/freelancer.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
/*!
* Start Bootstrap - Freelancer Bootstrap Theme (http://startbootstrap.com)
* Code licensed under the Apache License v2.0.
* For details, see http://www.apache.org/licenses/LICENSE-2.0.
*/
html {
overflow-x: hidden;
}

body {
overflow-x: hidden;
Expand Down
Empty file.
6 changes: 3 additions & 3 deletions app/views/static_pages/main_page.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@
<!-- Portfolio Grid Section -->
<section id="portfolio">
<div class="container">
<div class="row">
<!-- <div class="row">
<div class="col-lg-12 text-center">
<h2>Directions</h2>
</div>
</div>
</div> -->
<div class="row test">
<div class="col-sm-4 portfolio-item center">
<h3>Record yourself turning your head, <b>SLOWLY<b></h2>
<h3>Record yourself turning your head, <br><b>SLOWLY<b></h2>
</div>
<div class="col-sm-4 portfolio-item center">
<p>All the way left and then right and back to center.</p>
Expand Down
Loading

0 comments on commit b800ddb

Please sign in to comment.