From 78472f48025ecd0d8a6eb65140f3867351251069 Mon Sep 17 00:00:00 2001
From: Travis Gorman <thefarbetween@me.com>
Date: Sat, 9 Jul 2016 19:19:22 -0500
Subject: [PATCH 1/3] nothing much

---
 dist/index.html | 82 ++++++++-----------------------------------------
 1 file changed, 13 insertions(+), 69 deletions(-)
diff --git a/dist/index.html b/dist/index.html
index 4e45939..efeb40a 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -2,88 +2,28 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title>Feelings Fight</title>
+    <title>Project Title</title>
 
     <!-- Normalise -->
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/4.2.0/normalize.min.css" media="screen" title="no title" charset="utf-8">
-    <link href="https://fonts.googleapis.com/css?family=Atma" rel="stylesheet">
+
     <!-- Font Awesome -->
-    <script src="https://use.fontawesome.com/95cea4501d.js"></script>
+    <!-- <script src="https://use.fontawesome.com/95cea4501d.js"></script> -->
     <!-- main CSS -->
-    <link rel="stylesheet" href="main.css" media="screen">
+    <link rel="stylesheet" href="../app/styles/main.css" media="screen">
     <!-- zurb foundation fonts -->
     <link type="text/css" rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/foundicons/3.0.0/foundation-icons.css" />
+  <!--  fontdiner swanky -->
+<link href="https://fonts.googleapis.com/css?family=Fontdiner+Swanky" rel="stylesheet">
+    
   </head>
   <body>
-    <header>
-      <h2>Feelings Fight!</h2>
-    </header>
-    <div class="character-container">
-      <div class="story hidden">
-The evil Professor Coldheart is up to no good again. His intense dislike of anything warm and fuzzy is wreaking havoc! Your mission, should you choose to accept it, is to stop this villain from turning the world into a horrible, loveless place. Help spread care and love. In the end, who knows...maybe even cold hearted villains can have feelings too.</div>
-      <h3>Choose Your Character</h3>
-      <div class="character">
-        <img src="images/bedtime.gif"/>
-        <ul class="properties">
-          <li>Name:<span> Bed Time Bear</span></li>
-          <li>Special:<span> Sleepytime! Enemy sleeps through a turn.</span> </li>
-          <li></li>
-          <li></li>
-        </ul>
-        <a href="#bedtime"><input class="choose" type="button" value="Pick me!"/></a>
-      </div>
-      <div class="character">
-        <img src="images/cheerbear.gif"/>
-        <ul class="properties">
-          <li>Name:<span> Cheer Bear</span></li>
-          <li>Special:<span> Cheer Up! Increase damage for 3 turns.</span> </li>
-          <li></li>
-          <li></li>
-        </ul>
-        <a href="#cheer"><input class="choose" type="button" value="Pick me!"/></a>
-      </div>
-      <div class="character">
-        <img src="images/grumpybear.gif"/>
-        <ul class="properties">
-          <li>Name:<span> Grumpy Bear</span></li>
-          <li>Special:<span> Got the Grumps! Lowers enemy accuracy for 3 turns.</span> </li>
-          <li></li>
-          <li></li>
-        </ul>
-        <a href="#grumpy"><input class="choose" type="button" value="Pick me!"/></a>
-      </div>
-      <div class="character">
-        <img src="images/luckbear.gif"/>
-        <ul class="properties">
-        <li>Name:<span> Luck Bear</span></li>
-        <li>Special:<span> Luck of the Irish! Increase personal accuracy.</span> </li>
-        <li></li>
-        <li></li>
-      </ul>
-        <a href="#luck"><input class="choose" type="button" value="Pick me!"/></a>
-      </div>
-    </div>
-    <div class="results">
-    <div class="victory hidden">
-      <h2>Victory!</h2>
-      <div>I can't contain my feelings!</div>
-      <img class="result-img" src="images/coldheart.jpg"/>
-      <p>You defeated Professor Coldheart!</p>
-      <input class="new-game" type="button" value="New Game"/>
-    </div>
-    <div class="defeat hidden">
-      <h2>Defeat!</h2>
-      <img class="result-img" src="images/greencreature.jpg"/>
-      <p>You turned into a Green Creature Slave!</p>
-      <input class="new-game" type="button" value="New Game"/>
-    </div>
-    </div>
 
     <div class="button_container cheer">
-        <div class="icon cheer attack"> <i class="fi-cloud"></i> </div>
+        <div class=""> <i class="fi-cloud cheer attack"></i> </div>
         <div class="icon cheer special"> <i class="fi-heart"></i> </div>
     </div>
-
+<!-- buttons and graphics START -->
     <div class="button_container luck">
         <div class="icon luck attack"> <i class="fi-cloud"></i> </div>
         <div class="icon luck special"> <i class="fi-heart"></i> </div>
@@ -99,6 +39,10 @@ <h2>Defeat!</h2>
         <div class="icon bedtime special"> <i class="fi-heart"></i> </div>
     </div>
 
+
+
+<!-- buttons and graphics END -->
+
     <!-- JQuery -->
     <script src="https://code.jquery.com/jquery-3.0.0.min.js"
     integrity="sha256-JmvOoLtYsmqlsWxa7mDSLMwa6dZ9rrIdtrrVYRnDRH0="

From 9ba6568042378f88703e9cae3278762b97a93453 Mon Sep 17 00:00:00 2001
From: Travis Gorman <thefarbetween@me.com>
Date: Sat, 9 Jul 2016 19:57:04 -0500
Subject: [PATCH 2/3] hit or miss

---
 dist/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dist/index.html b/dist/index.html
index bf5927a..5c3a412 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -152,11 +152,11 @@ <h2>Defeat!</h2>
       <p> MISS!</p>
       <p></p>
     </div>
-    <div class="protagonist-hit ">
+    <div class="enemy-hit ">
       <p>HIT! Professor Coldheart is chipping away</p>
       <p>at your cheer!</p>
     </div>
-    <div class="protagonist-miss ">
+    <div class="enemy-miss ">
       <p> MISS</p>
       <p></p>
     </div>

From 5c37ee6b71637fd5487cf95539a33138c2a73142 Mon Sep 17 00:00:00 2001
From: Travis Gorman <thefarbetween@me.com>
Date: Sun, 10 Jul 2016 19:48:11 -0500
Subject: [PATCH 3/3] layout for fight page

---
 app/styles/main.css  | 177 +++++++++++++++++++++++++++++++------------
 app/styles/main.scss |   9 +--
 2 files changed, 129 insertions(+), 57 deletions(-)

diff --git a/app/styles/main.css b/app/styles/main.css
index 2f4ce5c..fd91f61 100644
--- a/app/styles/main.css
+++ b/app/styles/main.css
@@ -1,50 +1,127 @@
-/*
-Error: Invalid CSS after "...ition: relative": expected "{", was ";"
-        on line 140 of app/styles/main.scss
-
-135:   height: 300px;
-136:   margin: 36px auto;
-137: <<<<<<< HEAD
-138: =======
-139:   // background: #ccc;
-140:   position: relative;
-141: >>>>>>> 27eeec00155770983f965fbcc1e92dfb5c29c46b
-142: }
-143: .protagonist-hit {
-144:   font-family: 'Fontdiner Swanky', cursive;
-145:   font-weight: bold;
-
-Backtrace:
-app/styles/main.scss:140
-/usr/local/lib/ruby/gems/2.3.0/gems/sass-3.4.22/lib/sass/scss/parser.rb:1189:in `expected'
-/usr/local/lib/ruby/gems/2.3.0/gems/sass-3.4.22/lib/sass/scss/parser.rb:1125:in `expected'
-/usr/local/lib/ruby/gems/2.3.0/gems/sass-3.4.22/lib/sass/scss/parser.rb:1120:in `tok!'
-/usr/local/lib/ruby/gems/2.3.0/gems/sass-3.4.22/lib/sass/scss/parser.rb:656:in `block'
-/usr/local/lib/ruby/gems/2.3.0/gems/sass-3.4.22/lib/sass/scss/parser.rb:726:in `declaration_or_ruleset'
-/usr/local/lib/ruby/gems/2.3.0/gems/sass-3.4.22/lib/sass/scss/parser.rb:676:in `block_child'
-/usr/local/lib/ruby/gems/2.3.0/gems/sass-3.4.22/lib/sass/scss/parser.rb:668:in `block_contents'
-/usr/local/lib/ruby/gems/2.3.0/gems/sass-3.4.22/lib/sass/scss/parser.rb:657:in `block'
-/usr/local/lib/ruby/gems/2.3.0/gems/sass-3.4.22/lib/sass/scss/parser.rb:649:in `ruleset'
-/usr/local/lib/ruby/gems/2.3.0/gems/sass-3.4.22/lib/sass/scss/parser.rb:675:in `block_child'
-/usr/local/lib/ruby/gems/2.3.0/gems/sass-3.4.22/lib/sass/scss/parser.rb:668:in `block_contents'
-/usr/local/lib/ruby/gems/2.3.0/gems/sass-3.4.22/lib/sass/scss/parser.rb:125:in `stylesheet'
-/usr/local/lib/ruby/gems/2.3.0/gems/sass-3.4.22/lib/sass/scss/parser.rb:41:in `parse'
-/usr/local/lib/ruby/gems/2.3.0/gems/sass-3.4.22/lib/sass/engine.rb:406:in `_to_tree'
-/usr/local/lib/ruby/gems/2.3.0/gems/sass-3.4.22/lib/sass/engine.rb:381:in `_render_with_sourcemap'
-/usr/local/lib/ruby/gems/2.3.0/gems/sass-3.4.22/lib/sass/engine.rb:298:in `render_with_sourcemap'
-/usr/local/lib/ruby/gems/2.3.0/gems/sass-3.4.22/lib/sass/plugin/compiler.rb:492:in `update_stylesheet'
-/usr/local/lib/ruby/gems/2.3.0/gems/sass-3.4.22/lib/sass/plugin/compiler.rb:215:in `block in update_stylesheets'
-/usr/local/lib/ruby/gems/2.3.0/gems/sass-3.4.22/lib/sass/plugin/compiler.rb:209:in `each'
-/usr/local/lib/ruby/gems/2.3.0/gems/sass-3.4.22/lib/sass/plugin/compiler.rb:209:in `update_stylesheets'
-/usr/local/lib/ruby/gems/2.3.0/gems/sass-3.4.22/lib/sass/plugin/compiler.rb:473:in `on_file_changed'
-/usr/local/lib/ruby/gems/2.3.0/gems/sass-3.4.22/lib/sass/plugin/compiler.rb:331:in `block in watch'
-/usr/local/lib/ruby/gems/2.3.0/gems/sass-3.4.22/vendor/listen/lib/listen/listener.rb:252:in `on_change'
-/usr/local/lib/ruby/gems/2.3.0/gems/sass-3.4.22/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter'
-/usr/local/lib/ruby/gems/2.3.0/gems/sass-3.4.22/vendor/listen/lib/listen/adapter.rb:254:in `report_changes'
-/usr/local/lib/ruby/gems/2.3.0/gems/sass-3.4.22/vendor/listen/lib/listen/adapter.rb:323:in `poll_changed_directories'
-/usr/local/lib/ruby/gems/2.3.0/gems/sass-3.4.22/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller'
-*/
-body:before {
-  white-space: pre;
-  font-family: monospace;
-  content: "Error: Invalid CSS after \"...ition: relative\": expected \"{\", was \";\"\A         on line 140 of app/styles/main.scss\A \A 135:   height: 300px;\A 136:   margin: 36px auto;\A 137: <<<<<<< HEAD\A 138: =======\A 139:   // background: #ccc;\A 140:   position: relative;\A 141: >>>>>>> 27eeec00155770983f965fbcc1e92dfb5c29c46b\A 142: }\A 143: .protagonist-hit {\A 144:   font-family: 'Fontdiner Swanky', cursive;\A 145:   font-weight: bold;"; }
+body {
+  text-align: center;
+  background: url("images/cbbackground.jpeg") top center repeat; }
+  body h2 {
+    font-family: 'Atma', cursive;
+    font-size: 3rem; }
+  body .character-container {
+    width: 65%;
+    margin: 0 auto; }
+    body .character-container .story {
+      text-align: justify;
+      margin-top: 1rem;
+      margin-bottom: 2rem; }
+    body .character-container .character {
+      display: inline-block;
+      width: 22%; }
+      body .character-container .character img {
+        width: 100%; }
+      body .character-container .character li {
+        list-style-type: none;
+        text-align: left; }
+  body .hidden {
+    display: none; }
+  body .victory div {
+    width: 200px;
+    border: 2px solid black;
+    text-align: center;
+    font-size: 1.5rem;
+    padding: 1.3rem;
+    position: relative;
+    border-radius: 10px;
+    margin: 0 auto; }
+  body .victory div::before {
+    content: '';
+    position: absolute;
+    top: 96px;
+    right: 5px;
+    border-width: 15px 10px 0;
+    border-style: solid;
+    border-color: black transparent;
+    display: block;
+    width: 0; }
+  body .victory div::after {
+    content: '';
+    position: absolute;
+    top: 96px;
+    right: 8.2px;
+    border-width: 10px 7px 0;
+    border-style: solid;
+    border-color: white transparent;
+    display: block;
+    width: 0; }
+  body .result-img {
+    margin-top: 1rem;
+    border-radius: 5px;
+    border: 1px solid black; }
+
+.icon {
+  display: inline-block;
+  width: 280px;
+  height: 280px;
+  border: 1px solid black;
+  font-size: 256px;
+  text-align: center;
+  color: #2DAEBF;
+  text-shadow: 0px 2px 0px #0092B3, 0px 5px 2px #555;
+  transition: all 0.25s; }
+
+.attack {
+  font-size: 236px;
+  margin-left: 15%;
+  margin-right: 2%; }
+  .attack:active {
+    font-size: 256px; }
+
+.special {
+  font-size: 236px;
+  margin-right: 15%; }
+  .special:active {
+    font-size: 256px; }
+
+.cheer {
+  color: #F6B1C3; }
+  .cheer:hover {
+    color: #F0788C; }
+
+.luck {
+  color: #2BAB55; }
+  .luck:hover {
+    color: #1E8A10; }
+
+.grumpy {
+  color: #6786F2; }
+  .grumpy:hover {
+    color: #3468CB; }
+
+.bedtime {
+  color: #32C5E6; }
+  .bedtime:hover {
+    color: #0898B4; }
+
+.button_container {
+  width: 90%;
+  height: 300px;
+  margin: 36px auto;
+  position: relative; }
+
+.protagonist-hit {
+  font-family: 'Fontdiner Swanky', cursive;
+  font-weight: bold;
+  font-size: 36px;
+  color: -webkit-gradient(linear, left top, right top, color-stop(0, #f22), color-stop(0.15, #f2f), color-stop(0.3, #22f), color-stop(0.45, #2ff), color-stop(0.6, #2f2), color-stop(0.75, #2f2), color-stop(0.9, #ff2), color-stop(1, #f22)); }
+
+.protagonist-miss {
+  font-family: 'Fontdiner Swanky', cursive;
+  font-weight: bold;
+  font-size: 36px;
+  color: -webkit-gradient(linear, left top, right top, color-stop(0, #f22), color-stop(0.15, #f2f), color-stop(0.3, #22f), color-stop(0.45, #2ff), color-stop(0.6, #2f2), color-stop(0.75, #2f2), color-stop(0.9, #ff2), color-stop(1, #f22)); }
+
+.button_container h5 {
+  font-family: 'Fontdiner Swanky', sans-serif;
+  font-size: 2rem;
+  display: inline-block;
+  position: absolute;
+  top: 3rem; }
+
+/*# sourceMappingURL=main.css.map */
diff --git a/app/styles/main.scss b/app/styles/main.scss
index 5257035..1844c51 100644
--- a/app/styles/main.scss
+++ b/app/styles/main.scss
@@ -19,7 +19,7 @@ body {
 
         .character {
             display: inline-block;
-            width: 24%;
+            width: 22%;
 
             &:hover {
               // transform: scale(1.2);
@@ -134,11 +134,7 @@ body {
   width: 90%;
   height: 300px;
   margin: 36px auto;
-<<<<<<< HEAD
-=======
-  // background: #ccc;
   position: relative;
->>>>>>> 27eeec00155770983f965fbcc1e92dfb5c29c46b
 }
 .protagonist-hit {
   font-family: 'Fontdiner Swanky', cursive;
@@ -171,7 +167,7 @@ body {
     color-stop(1, #f22));
 }
 .enemy-hit {
-  
+
 }
 .enemy-miss {
 
@@ -185,5 +181,4 @@ body {
   top: 3rem;
   // left: -5rem;
 
-
 }
