+

melnychukJS · Feb 20, 2016 · b5cbeb6 · b5cbeb6
1 parent 71bb7f1
commit b5cbeb6
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 83 deletions.
diff --git a/html/cards.html b/html/cards.html
@@ -53,57 +53,4 @@
       <div class="dashit"></div>
 		</div>
 	</body>
-	<style>
-
-		.menu{
-			text-align: center;
-			border-bottom: 1px solid black;
-		}
-		.border_bottom{
-			border-bottom: 1px solid rgba(0, 0, 0, 0.14);
-		}
-
-		.menu_button{
-			padding-left:10%;
-			padding-right:10%;
-		}
-		.float_left{
-			float: left;
-		}
-		.float_right{
-			float: right;
-		}
-		.div_at_bottom{
-			width:100%;
-			bottom:9.5%;
-		}
-
-		.upper_button{
-			background-color:#E0951A;
-			color: #fff;
-			border:0;
-			border-bottom: 3px outset #cd8818;
-		}
-
-		.lower_button{
-			margin-top:7%;
-			background-color:#4A4A4A;
-			color: #fff;
-			border:0;
-			border-bottom: 3px outset #404040;
-		}
-
-		.lower_button, .upper_button{
-			width:70%;
-			margin-left:auto;
-			margin-right:auto;
-			text-align: center;
-			vertical-align: middle;
-			line-height: 100%;
-			border-radius:5px;
-			font-weight: bold;
-			font-size:18px;
-		}
-
-	</style>
-</head>
+</head>
diff --git a/html/settings_sec.html b/html/settings_sec.html
@@ -5,12 +5,27 @@
 		<meta name="viewport" content="width=device-width">
 		<meta charset="utf-8">
 		<link rel="stylesheet" href="http://yui.yahooapis.com/pure/0.6.0/pure-min.css">
+		<link rel="stylesheet" href="stylesheet.css">
+		<link href='https://fonts.googleapis.com/css?family=Varela+Round' rel='stylesheet' type='text/css'>
+		<meta name="apple-mobile-web-app-capable" content="yes">
 	</head>
 	<body>
 		<div class="menu pure-g">
-		    <div class="pure-u-1-3 "><p>Piggybank</p></div>
-		    <div class="pure-u-1-3 "><p>Stats</p></div>
-		    <div class="pure-u-1-3"><p>Settings</p></div>
+		    <div class="pure-u-1-3">
+		    	<p><a href="index.html" class="icon piggy-icon">
+		    		<img src="pig_icon.png">
+		    	</a></p>
+		    </div>
+		    <div class="pure-u-1-3">
+		    	<p><a href="stats.html" class="icon stats-icon">
+		    		<img src="graph_icon.png">
+		    	</a></p>
+		    </div>
+		    <div class="pure-u-1-3 selected">
+		    	<p><a href="settings.html" class="icon settings-icon">
+		    		<img src="wheel_icon.png">
+		    	</a></p>
+		    </div>
 		</div>
 		<div class="pure-g">
 			<div class="pure-u-5-5 border_bottom menu_button"><span class="float_left"><p>€1 - €5</p></span><span class="float_right"><p>5%</p></span></div>
@@ -46,35 +61,35 @@
 			float: right;
 		}
 		.border_bottom{
-		border-bottom: 1px solid black;
+			border-bottom: 1px solid  rgba(0, 0, 0, 0.17);
 		}
 		.menu_button{
-		padding-left:10%;
-		padding-right:10%;
+			padding-left:10%;
+			padding-right:10%;
 		}
 		.div_at_bottom{
-		width:100%;
-		position:fixed;
-		bottom:0;
-		border-top:1px solid black;
+			width:100%;
+			position:fixed;
+			bottom:0;
+			border-top:1px solid black;
 		}
 		.div_in_div_at_bottom{
-		width:80%;
-		margin-left:auto;
-		margin-right:auto;
-		padding-bottom:5%;
+			width:80%;
+			margin-left:auto;
+			margin-right:auto;
+			padding-bottom:5%;
 		}
 		#percent_range{
-		width:100%;
-		margin-top:15%;
-		display:block;
-		margin-left:auto;
-		margin-right:auto;
+			width:100%;
+			margin-top:15%;
+			display:block;
+			margin-left:auto;
+			margin-right:auto;
 		}
 		#submit_button{
-		margin-right:-10%;
-		margin-bottom:5%;
-		display:block;
+			margin-right:-10%;
+			margin-bottom:5%;
+			display:block;
 		}
 		input[type=range]{
 			-webkit-appearance: none;
@@ -107,21 +122,21 @@
 		}
 
 		#lower_boundary{
-		margin-top:5%;
+			margin-top:5%;
 		}
 
 		#higher_boundary{
-		margin-top:5%;
+			margin-top:5%;
 		}
 
 		#valBox{
-		position:fixed;
-		bottom:13%;
-		left:50%;
-		transform:translateX(-50%);
+			position:fixed;
+			bottom:13%;
+			left:50%;
+			transform:translateX(-50%);
 		}
 
-}
+		
 
 	</style>
 	<script>