Revert "Temporary Commit to test on Mobile"

This reverts commit 1076e08.
vikneshwar · May 31, 2016 · 1dac277 · 1dac277
1 parent 2ee34c4
commit 1dac277
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 21 deletions.
diff --git a/index.html b/index.html
@@ -35,8 +35,6 @@
             for (var i = 0; i < 6; i++) {
                 var div_id = "c" + (i);
                 document.getElementById(div_id).style.background = newColour[i];
-                document.getElementById('c0').focus();
-
             }
         }
 
@@ -55,7 +53,6 @@
 
     function start() {
         var clipboard = new Clipboard('.btn');
-        document.getElementById('c0').focus();
         changeColour(-1);
     }
 
@@ -79,15 +76,12 @@
                         Welcome to ChromaGen!
                     </div>
                     <p>
-                      <div class="dabba">
                         <button id="c0" class="circle" onclick="changeColour(0)"></button>
                         <button id="c1" class="circle" onclick="changeColour(1)"></button>
                         <button id="c2" class="circle" onclick="changeColour(2)"></button>
                         <button id="c3" class="circle" onclick="changeColour(3)"></button>
                         <button id="c4" class="circle" onclick="changeColour(4)"></button>
                         <button id="c5" class="circle" onclick="changeColour(5)"></button>
-                      </div>
-
         </center>
     </div>
 </body>

diff --git a/style.css b/style.css
@@ -11,14 +11,13 @@ body{
 .circle{
 	min-width: 32px;
 	min-height: 32px;
-	padding-top: 16px;
 	background: #fff;
 	margin: 4px;
 	border-radius: 32px;
 	display: inline-block;
-	-webkit-transition-duration: 0.2s;
-	-moz-transition-duration: 0.2s;
-	transition-duration: 0.2s;
+	-webkit-transition-duration: 0.3s;
+	-moz-transition-duration: 0.3s;
+	transition-duration: 0.3s;
 }
 
 .circle:active{
@@ -30,13 +29,12 @@ body{
 
 .circle:focus{
 	box-shadow: 0px 2px 10px -4px rgba(0, 0, 0, 0.75);
-	min-width: 48px;
-	min-height: 48px;
+	transform: scale(1.5,1.5);
 	border-color: #123456;
 	border: 10px;
-	padding-top: 8px;
-	margin-left: 8px;
-	margin-right: 8px;
+	margin-left: 10px;
+	margin-right: 10px;
+
 
 }
 
@@ -88,12 +86,6 @@ button:active{
 	border: 4px;
 }
 
-.dabba{
-	position:static;
-	vertical-align: middle;
-	height: 60px;
-}
-
 .header{
 	font-family: monospace;
 	font-size: 24pt;