Some tweaks

matthuhiggins · Jun 10, 2016 · 8ea6ab8 · 8ea6ab8
1 parent da04d62
commit 8ea6ab8
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 32 deletions.
diff --git a/Gemfile b/Gemfile
@@ -17,8 +17,6 @@ gem 'coffee-rails', '~> 4.1.0'
 
 # Use jquery as the JavaScript library
 gem 'jquery-rails'
-# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
-gem 'turbolinks', '~> 5.x'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 2.0'
 # Use Redis adapter to run Action Cable in production

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -138,9 +138,6 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (2.0.4)
-    turbolinks (5.0.0.beta2)
-      turbolinks-source
-    turbolinks-source (5.0.0.beta5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uglifier (3.0.0)
@@ -168,10 +165,9 @@ DEPENDENCIES
   sass-rails (~> 5.0)
   spring
   spring-watcher-listen (~> 2.0.0)
-  turbolinks (~> 5.x)
   tzinfo-data
   uglifier (>= 1.3.0)
   web-console
 
 BUNDLED WITH
-   1.12.3
+   1.12.5
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -11,6 +11,4 @@
 // about supported directives.
 //
 //= require jquery
-//= require jquery_ujs
-//= require turbolinks
 //= require_tree .
diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js
diff --git a/app/assets/javascripts/channels/.keep b/app/assets/javascripts/channels/.keep
diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss
@@ -1,11 +1,27 @@
+body {
+  font-family: 'Lato', sans-serif !important;
+}
+
+h1, h2, h3 {
+  text-transform: uppercase;
+}
+
+h1 {
+
+}
+
+h2 {
+  font-size: 36px;
+}
+
+h3 {
+  font-size: 18px;
+}
+
 #home {
   margin-bottom: 1em;
   margin-top: 4em;
 
-  h1, h2 {
-    text-transform: uppercase;
-  }
-
   h1 {
     font-size: 135px;
     font-weight: 300;
@@ -47,10 +63,13 @@
 }
 
 section {
-  h1, h2,h3,h4 {
-    text-align: center;
+  &.alt {
+    background-color: #dedddc
   }
 
+  h1,h2,h3,h4 {
+    text-align: center;
+  }
 
   p {
     font-size: 16px;

diff --git a/app/views/application/_menu.html.erb b/app/views/application/_menu.html.erb
@@ -8,11 +8,11 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="#">Brigitte + Matt</a>
+      <a class="navbar-brand" href="#home">Brigitte + Matt</a>
     </div>
     <div id="navbar" class="navbar-collapse collapse">
       <ul class="nav navbar-nav">
-        <li><a href="#registry">Wedding</a></li>
+        <li><a href="#wedding">Wedding</a></li>
         <li><a href="#directions">Getting There</a></li>
         <li><a href="#accomodations">Accomodations</a></li>
         <li><a href="#registry">Registry</a></li>

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -4,9 +4,10 @@
     <title>Bigitte ♥ Matthew</title>
     <%= csrf_meta_tags %>
 
-    <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
-    <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
+    <%= stylesheet_link_tag    'application' %>
+    <%= javascript_include_tag 'application' %>
 
+    <link href='https://fonts.googleapis.com/css?family=Lato' rel='stylesheet' type='text/css'>
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script>
 

diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
@@ -58,4 +58,23 @@
       <%= link_to 'http://www.honeyfund.com/wedding/BrigitteandMatthew', 'http://www.honeyfund.com/wedding/BrigitteandMatthew' %>
     </p>
   </section>
+  <section class="alt">
+    <div id="countdown">
+      <h3>See you in:</h3>
+      <h2>
+        <span class="time">
+          <span class="days">4</span><span class="units">D</span>
+        </span>
+        <span class="time">
+          <span class="hours">4</span><span class="units">H</span>
+        </span>
+        <span class="time">
+          <span class="minutes">16</span><span class="units">M</span>
+        </span>
+        <span class="time">
+          <span class="seconds">24</span><span class="units">S</span>
+        </span>
+      </h2>
+    </div>
+  </section>
 </div>