Merge pull request #1 from lolcookie/master

Update from source
Dylanb-dev · Nov 30, 2015 · ed60f73 · ed60f73
2 parents 6907b51 + a79f983
commit ed60f73
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+CNAME
diff --git a/CNAME b/CNAME
@@ -0,0 +1,2 @@
+calc.splatoon.ink
+
diff --git a/index.html b/index.html
@@ -36,7 +36,7 @@ <h1>Splatoon Calculator</h1>
 
 
 <div class="container" ng-controller="MainCtrl">
-  <modal title="Error" visible="showModal">
+  <modal title="Errorbox" visible="showModal" id="modal">
   </modal>
 
 

diff --git a/main.controller.js b/main.controller.js
@@ -142,7 +142,10 @@ splatoonApp.directive('modal', function () {
                 '<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>' +
                 '<h4 class="modal-title">{{ ErrorMessage }}</h4>' +
 								'</div>' +
-	              '<div class="modal-body" ng-transclude></div>' +
+								'<div class="modal-body">' +
+									'<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>' +
+									'</div>' +
+								'</div>' +
 	            '</div>' +
 	          '</div>' +
 	        '</div>',

diff --git a/stats.js b/stats.js
@@ -53,10 +53,10 @@ angular.module('splatoonApp').stats = function ($scope) {
     new Stat("Bomb Throw Range", "%", 0, 150, 60, function (x) {
         this.value = Math.min(this.max, (156.8 * (1 + x))/156.8*100);
     }),
-    new Stat("Run Speed", "%", 0, 144, 60, function (x) {
+    new Stat("Run Speed", " u/s", 0, 144, 60, function (x) {
         this.value = Math.min(this.max, 96 * (1 + x));
     }),
-    new Stat("Swim Speed", "%", 0, 240, 120, function (x) {
+    new Stat("Swim Speed", " u/s", 0, 240, 120, function (x) {
         this.value = Math.min(this.max, 192 * (1 + x));
     }),
     new Stat("Special Charge", "%", 0, 130, 100, function (x) {

diff --git a/styles.css b/styles.css
@@ -1,16 +1,11 @@
+#modal {
+  top: 30%;
+}
+
 .h1 {
   text-align: center;
 }
-#banner {
-    border-bottom: none;
-    margin-top: -20px;
-}
 
-#banner h1 {
-    font-size: 60px;
-    line-height: 1;
-    letter-spacing: -1px;
-}
 .thing-form {
     margin: 20px 0;
 }