Optimizations. And some JS magic

diff --git a/css/master.css b/css/master.css
index c10b9e07f09e367a2585b638ef484e8ed45965c3..1dd5002f3f56404154103b113bdc0234d0dac14e 100644 (file)
--- a/css/master.css
+++ b/css/master.css
@@ -46,7 +46,11 @@
 }
 
 .alert-link {
+  color: #ffd429 !important;
+}
 
+.alert-link:hover {
+  color: white !important;
 }
 
 .alert {
@@ -56,9 +60,13 @@
 }
 
 .alert-success {
-  background: #dff0d9;
-  color: #E8FBF2;
-  color: rgba(255,255,255,0.9);
+  background: #2caf8f;
+
+}
+
+.alert-success p {
+  color: #E8FBF2 !important;
+  color: rgba(255,255,255,0.9) !important;
 }
 
 .alert-info {
@@ -67,9 +75,6 @@
   color: rgba(255,255,255,0.9);
 }
 
-/*.label-info {
-  background: #2B81E3;
-}*/
 
 .panel-body {
   padding: 0;
@@ -448,9 +453,11 @@ li.neutral {
 }
 
 .recommended-section {
+  margin-top: 20px;
+  margin-bottom: 20px;
   padding-top: 30px;
   padding-bottom: 30px;
-  background: #fffae5;
+  background: #F5FFF7;
 }
 /*Charities*/
 .charities {

diff --git a/givingguide.html b/givingguide.html
index e9a0bdc66edf0bf59dd3a01592ae1da52fefa5dd..34cd46806b06cd274620e51f844c9536f0f906db 100644 (file)
--- a/givingguide.html
+++ b/givingguide.html
@@ -76,7 +76,7 @@
   </nav>
 
   <!--Begin Intro-->
-  <section class="intro">
+  <section class="intro" id="intro">
     <div class="container">
       <div class="row">
         <div class="illustration col-md-6">
@@ -100,7 +100,7 @@
   <!--End Intro-->
 
   <!--Begin Actions-->
-  <section class="actions">
+  <section class="actions" id="actions">
     <div class="container">
       <div class="row is-table-row">
         <!-- Begin Share -->

diff --git a/img/Illustration-alt.png b/img/Illustration-alt.png
index f99e4d9096541a05239bfb01f8c0afb399cc9d73..8b621ce065748657c2785d39ee21dfe7d47ce1d3 100644 (file)
Binary files a/img/Illustration-alt.png and b/img/Illustration-alt.png differ

diff --git a/img/Illustration.png b/img/Illustration.png
index 115d6c6ba8ae20765b2030487528f8feb60dca35..a8a784c96f16cb64b22feda0d6467d2e38e5bb29 100644 (file)
Binary files a/img/Illustration.png and b/img/Illustration.png differ

diff --git a/img/info.svg b/img/info.svg
index 82b4fe6eff71e760419865c8935d7be1503e948d..ed6bbb132f58623e2bf2199adb4622fc6ac4ea83 100644 (file)
--- a/img/info.svg
+++ b/img/info.svg
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><svg width="19px" height="19px" viewBox="0 0 19 19" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">        <title>info</title>        <defs/>    <g id="Graphics" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">        <g id="info" fill="#0F4639">            <g id="Shape">                <path d="M8.56338011,6.64553947 L8.56338011,4.72769924 L10.4366199,4.72769924 L10.4366199,6.64553947 L8.56338011,6.64553947 Z M9.5,17.1267609 C11.5813771,17.1267609 13.3728484,16.3759785 14.8744131,14.874413 C16.3759779,13.3728482 17.1267602,11.5813776 17.1267602,9.49999962 C17.1267602,7.41862319 16.3759779,5.62715182 14.8744131,4.12558703 C13.3728484,2.62402149 11.5813771,1.87323909 9.5,1.87323909 C7.41862289,1.87323909 5.62715159,2.62402149 4.12558687,4.12558703 C2.62402214,5.62715182 1.87323978,7.41862319 1.87323978,9.49999962 C1.87323978,11.5813776 2.62402214,13.3728482 4.12558687,14.874413 C5.62715159,16.3759785 7.41862289,17.1267609 9.5,17.1267609 L9.5,17.1267609 Z M9.5,0 C12.1165884,0 14.3540687,0.929186152 16.2124409,2.78755846 C18.0708139,4.64593076 19,6.88341115 19,9.49999962 C19,12.1165881 18.0708139,14.3540692 16.2124409,16.2124415 C14.3540687,18.0708138 12.1165884,19 9.5,19 C6.88341163,19 4.64593133,18.0708138 2.78755911,16.2124415 C0.929186115,14.3540692 0,12.1165881 0,9.49999962 C0,6.88341115 0.929186115,4.64593076 2.78755911,2.78755846 C4.64593133,0.929186152 6.88341163,0 9.5,0 L9.5,0 Z M8.56338011,14.2723008 L8.56338011,8.56338045 L10.4366199,8.56338045 L10.4366199,14.2723008 L8.56338011,14.2723008 Z"/>            </g>        </g>    </g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><svg width="19px" height="19px" viewBox="0 0 19 19" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">        <title>info</title>        <defs/>    <g id="Graphics" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">        <g id="info" fill="#FFD429">            <g id="Shape">                <path d="M8.56338011,6.64553947 L8.56338011,4.72769924 L10.4366199,4.72769924 L10.4366199,6.64553947 L8.56338011,6.64553947 Z M9.5,17.1267609 C11.5813771,17.1267609 13.3728484,16.3759785 14.8744131,14.874413 C16.3759779,13.3728482 17.1267602,11.5813776 17.1267602,9.49999962 C17.1267602,7.41862319 16.3759779,5.62715182 14.8744131,4.12558703 C13.3728484,2.62402149 11.5813771,1.87323909 9.5,1.87323909 C7.41862289,1.87323909 5.62715159,2.62402149 4.12558687,4.12558703 C2.62402214,5.62715182 1.87323978,7.41862319 1.87323978,9.49999962 C1.87323978,11.5813776 2.62402214,13.3728482 4.12558687,14.874413 C5.62715159,16.3759785 7.41862289,17.1267609 9.5,17.1267609 L9.5,17.1267609 Z M9.5,0 C12.1165884,0 14.3540687,0.929186152 16.2124409,2.78755846 C18.0708139,4.64593076 19,6.88341115 19,9.49999962 C19,12.1165881 18.0708139,14.3540692 16.2124409,16.2124415 C14.3540687,18.0708138 12.1165884,19 9.5,19 C6.88341163,19 4.64593133,18.0708138 2.78755911,16.2124415 C0.929186115,14.3540692 0,12.1165881 0,9.49999962 C0,6.88341115 0.929186115,4.64593076 2.78755911,2.78755846 C4.64593133,0.929186152 6.88341163,0 9.5,0 L9.5,0 Z M8.56338011,14.2723008 L8.56338011,8.56338045 L10.4366199,8.56338045 L10.4366199,14.2723008 L8.56338011,14.2723008 Z"/>            </g>        </g>    </g></svg>
\ No newline at end of file

diff --git a/img/products/wifi-adapter.png b/img/products/wifi-adapter.png
index fad46aeba8892cd5651f522ead7d9316baf5e25e..92f7ac069db032cfb269c30a6735dfe47f496393 100644 (file)
Binary files a/img/products/wifi-adapter.png and b/img/products/wifi-adapter.png differ

diff --git a/js/magic.js b/js/magic.js
index ee265a4427e93aafafa9f21de89424049030d908..22392b79999adc7cef6cbd004e2f651553cc78e0 100644 (file)
--- a/js/magic.js
+++ b/js/magic.js
@@ -1,9 +1,16 @@
 $(document).ready(function() {
 
-  // Instructs the browser to release the focus from buttons. Could // be a Bootstrap bug.
+    // Instructs the browser to release the focus from buttons. Could be a Bootstrap bug.
 
-  $(".btn").mouseup(function(){
-      $(this).blur();
-  })
+    $(".btn").mouseup(function() {
+        $(this).blur();
+    })
+
+    // Push the 'Actions' pane to the bottom on mobile
+    if ($('body').width() < 960) {
+        $("#actions").insertBefore("#charities");
+    } else {
+        $("#actions").insertAfter("#intro");
+    }
 
 });