Updates to host on digital ocean and also played around with ajax loa…

…ding pages
Francismb · Jun 19, 2016 · 3810b95 · 3810b95
1 parent d6aaef3
commit 3810b95
Show file tree

Hide file tree

Showing 18 changed files with 777 additions and 393 deletions.
diff --git a/Gemfile b/Gemfile
@@ -13,7 +13,7 @@ end
 
 # Production gems
 group :production do
-  gem 'puma' # Use puma as the app server
-  gem 'viaduct_rails_helpers' # Use viaduct helpers for admin statistics
-  gem 'pg' # Postgresql as the production database
+  #gem 'puma' # Use puma as the app server
+  #gem 'viaduct_rails_helpers' # Use viaduct helpers for admin statistics
+  #gem 'pg' # Postgresql as the production database
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -0,0 +1,238 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (2.3.2)
+    actionmailer (4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.1)
+      actionview (= 4.2.1)
+      activesupport (= 4.2.1)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    actionview (4.2.1)
+      activesupport (= 4.2.1)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    activejob (4.2.1)
+      activesupport (= 4.2.1)
+      globalid (>= 0.3.0)
+    activemodel (4.2.1)
+      activesupport (= 4.2.1)
+      builder (~> 3.1)
+    activerecord (4.2.1)
+      activemodel (= 4.2.1)
+      activesupport (= 4.2.1)
+      arel (~> 6.0)
+    activesupport (4.2.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.3)
+    bcrypt (3.1.11)
+    builder (3.2.2)
+    carrierwave (0.11.2)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
+      json (>= 1.7)
+      mime-types (>= 1.16)
+      mimemagic (>= 0.3.0)
+    concurrent-ruby (1.0.2)
+    erubis (2.7.0)
+    excon (0.49.0)
+    fission (0.5.0)
+      CFPropertyList (~> 2.2)
+    fog (1.36.0)
+      fog-aliyun (>= 0.1.0)
+      fog-atmos
+      fog-aws (>= 0.6.0)
+      fog-brightbox (~> 0.4)
+      fog-core (~> 1.32)
+      fog-dynect (~> 0.0.2)
+      fog-ecloud (~> 0.1)
+      fog-google (<= 0.1.0)
+      fog-json
+      fog-local
+      fog-powerdns (>= 0.1.1)
+      fog-profitbricks
+      fog-radosgw (>= 0.0.2)
+      fog-riakcs
+      fog-sakuracloud (>= 0.0.4)
+      fog-serverlove
+      fog-softlayer
+      fog-storm_on_demand
+      fog-terremark
+      fog-vmfusion
+      fog-voxel
+      fog-xenserver
+      fog-xml (~> 0.1.1)
+      ipaddress (~> 0.5)
+      nokogiri (~> 1.5, >= 1.5.11)
+    fog-aliyun (0.1.0)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      ipaddress (~> 0.8)
+      xml-simple (~> 1.1)
+    fog-atmos (0.1.0)
+      fog-core
+      fog-xml
+    fog-aws (0.9.2)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+      ipaddress (~> 0.8)
+    fog-brightbox (0.10.1)
+      fog-core (~> 1.22)
+      fog-json
+      inflecto (~> 0.0.2)
+    fog-core (1.39.0)
+      builder
+      excon (~> 0.49)
+      formatador (~> 0.2)
+    fog-dynect (0.0.3)
+      fog-core
+      fog-json
+      fog-xml
+    fog-ecloud (0.3.0)
+      fog-core
+      fog-xml
+    fog-google (0.1.0)
+      fog-core
+      fog-json
+      fog-xml
+    fog-json (1.0.2)
+      fog-core (~> 1.0)
+      multi_json (~> 1.10)
+    fog-local (0.3.0)
+      fog-core (~> 1.27)
+    fog-powerdns (0.1.1)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+    fog-profitbricks (0.0.5)
+      fog-core
+      fog-xml
+      nokogiri
+    fog-radosgw (0.0.5)
+      fog-core (>= 1.21.0)
+      fog-json
+      fog-xml (>= 0.0.1)
+    fog-riakcs (0.1.0)
+      fog-core
+      fog-json
+      fog-xml
+    fog-sakuracloud (1.7.5)
+      fog-core
+      fog-json
+    fog-serverlove (0.1.2)
+      fog-core
+      fog-json
+    fog-softlayer (1.1.1)
+      fog-core
+      fog-json
+    fog-storm_on_demand (0.1.1)
+      fog-core
+      fog-json
+    fog-terremark (0.1.0)
+      fog-core
+      fog-xml
+    fog-vmfusion (0.1.0)
+      fission
+      fog-core
+    fog-voxel (0.1.0)
+      fog-core
+      fog-xml
+    fog-xenserver (0.2.3)
+      fog-core
+      fog-xml
+    fog-xml (0.1.2)
+      fog-core
+      nokogiri (~> 1.5, >= 1.5.11)
+    formatador (0.2.5)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
+    i18n (0.7.0)
+    inflecto (0.0.2)
+    ipaddress (0.8.3)
+    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.4)
+      mime-types (>= 1.16, < 4)
+    mime-types (3.0)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0221)
+    mimemagic (0.3.1)
+    mini_portile2 (2.0.0)
+    minitest (5.8.4)
+    multi_json (1.12.0)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
+    rack (1.6.4)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.2.1)
+      actionmailer (= 4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
+      activemodel (= 4.2.1)
+      activerecord (= 4.2.1)
+      activesupport (= 4.2.1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.1)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (4.2.1)
+      actionpack (= 4.2.1)
+      activesupport (= 4.2.1)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.4.2)
+    sprockets (3.6.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.0.4)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.11)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    xml-simple (1.1.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bcrypt
+  carrierwave (= 0.11.2)
+  fog (= 1.36)
+  jquery-rails
+  rails (= 4.2.1)
+  sqlite3
+
+BUNDLED WITH
+   1.12.5
diff --git a/app/assets/stylesheets/application.css.erb b/app/assets/stylesheets/application.css.erb
@@ -1,49 +1,76 @@
 h1.huge {
-  font-size: 4.5em;
-  font-weight: 300;
+	font-size: 4.5em;
+	font-weight: 300;
 }
+
 h1.huge > span {
-  display: block;
-  font-size: 16px;
-  margin-top: -10px;
+	display: block;
+	font-size: 16px;
+	margin-top: -10px;
 }
+
 p.padded {
-  padding: 0 100px;
+	padding: 0 100px;
 }
+
 .young-background {
-  margin: 25px 0;
-  background: url(<%= image_url('background.jpg') %>) center top no-repeat;
-  -webkit-background-size: ;
-  background-size: cover;
-  height: 280px;
+	margin: 25px 0;
+	background: url(<%= image_url('background.jpg') %>) center top no-repeat;
+	-webkit-background-size: cover;
+	background-size: cover;
+	height: 280px;
 }
+
 .young-background p {
-  display: table-cell;
-  vertical-align: middle;
-  height: 280px;
-  color: #ffffff;
-  line-height: 24px;
+	display: table-cell;
+	vertical-align: middle;
+	height: 280px;
+	color: #ffffff;
+	line-height: 24px;
 }
+
 .specialties {
-  text-align: center;
+	text-align: center;
 }
+
 .specialties .quarter {
-  padding: 0 15px;
+	padding: 0 15px;
 }
+
 .specialties h3 {
-  margin: 5px auto;
-  font-weight: 500;
+	margin: 5px auto;
+	font-weight: 500;
 }
+
 .specialties p {
-  color: #949494;
+	color: #949494;
 }
+
 .specialties .circle {
-  display: inline-block;
-  padding: 20px;
-  width: 32px;
-  height: 32px;
-  background: #333333;
-  -webkit-border-radius: 150px;
-  -moz-border-radius: 150px;
-  border-radius: 150px;
+	display: inline-block;
+	padding: 20px;
+	width: 32px;
+	height: 32px;
+	background: #333333;
+	-webkit-border-radius: 150px;
+	-moz-border-radius: 150px;
+	border-radius: 150px;
+}
+
+@media screen and (max-width: 500px) {
+	h1.huge {
+		font-size: 15vw;
+	}
+
+	.young-background p {
+		padding: 0 20px;
+	}
+}
+
+@media screen and (max-width: 880px) {
+	.specialties .quarter
+	{
+		float: none;
+		width: auto;
+	}
 }
diff --git a/app/assets/stylesheets/grid.css.erb b/app/assets/stylesheets/grid.css.erb
@@ -21,4 +21,4 @@
 }
 .grid .quarter {
   width: 25%;
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,4 +21,4 @@ @@
     }
     .grid .quarter {
       width: 25%;
-    }
+    }