Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote branch 'marineb/master'

Conflicts:
	index.html
	routes.html
  • Loading branch information...
commit fec0229155cc40b6700c707615b093707f005650 2 parents 2d73fd8 + d0f1ece
@ike authored
View
12 css/jquery.mobile-1.1.0.css
@@ -149,12 +149,12 @@
color: #fff /*{b-bar-color}*/;
font-weight: bold;
text-shadow: 0 /*{b-bar-shadow-x}*/ 1px /*{b-bar-shadow-y}*/ 1px /*{b-bar-shadow-radius}*/ #3e6790 /*{b-bar-shadow-color}*/;
- background-image: -webkit-gradient(linear, left top, left bottom, from( #6facd5 /*{b-bar-background-start}*/), to( #497bae /*{b-bar-background-end}*/)); /* Saf4+, Chrome */
- background-image: -webkit-linear-gradient( #6facd5 /*{b-bar-background-start}*/, #497bae /*{b-bar-background-end}*/); /* Chrome 10+, Saf5.1+ */
- background-image: -moz-linear-gradient( #6facd5 /*{b-bar-background-start}*/, #497bae /*{b-bar-background-end}*/); /* FF3.6 */
- background-image: -ms-linear-gradient( #6facd5 /*{b-bar-background-start}*/, #497bae /*{b-bar-background-end}*/); /* IE10 */
- background-image: -o-linear-gradient( #6facd5 /*{b-bar-background-start}*/, #497bae /*{b-bar-background-end}*/); /* Opera 11.10+ */
- background-image: linear-gradient( #6facd5 /*{b-bar-background-start}*/, #497bae /*{b-bar-background-end}*/);
+ background-image: -webkit-gradient(linear, left top, left bottom, from( #6facd5), to( #497bae /*{b-bar-background-end}*/)); /* Saf4+, Chrome */
+ background-image: -webkit-linear-gradient( #6facd5, #497bae /*{b-bar-background-end}*/); /* Chrome 10+, Saf5.1+ */
+ background-image: -moz-linear-gradient( #6facd5, #497bae /*{b-bar-background-end}*/); /* FF3.6 */
+ background-image: -ms-linear-gradient( #6facd5, #497bae /*{b-bar-background-end}*/); /* IE10 */
+ background-image: -o-linear-gradient( #6facd5, #497bae /*{b-bar-background-end}*/); /* Opera 11.10+ */
+ background-image: linear-gradient( #6facd5, #497bae /*{b-bar-background-end}*/);
}
.ui-bar-b,
.ui-bar-b input,
View
70 css/main.css
@@ -0,0 +1,70 @@
+.ui-body-c, .ui-overlay-c{
+ background:#F6F6F6;
+ font-family: 'Bree Serif', serif;
+ /*font-family: 'Open Sans', sans-serif;*/
+ text-shadow: 0 1px 1px #ffffff;
+}
+
+
+.ui-body-c, .ui-body-c input, .ui-body-c select, .ui-body-c textarea, .ui-body-c button, .ui-bar-a, .ui-bar-a input, .ui-bar-a select, .ui-bar-a textarea, .ui-bar-a button{
+ font-family: 'Bree Serif', serif;
+}
+
+.ui-bar-a{
+ text-shadow: none;
+}
+
+
+.ui-header{
+ background-image: -webkit-gradient(linear, left top, left bottom, from( #CFF4FC), to( #497bae)); /* Saf4+, Chrome */
+ background-image: -webkit-linear-gradient( #CFF4FC, #9DE2F2); /* Chrome 10+, Saf5.1+ */
+ background-image: -moz-linear-gradient( #CFF4FC, #9DE2F2); /* FF3.6 */
+ background-image: -ms-linear-gradient( #CFF4FC, #9DE2F2); /* IE10 */
+ background-image: -o-linear-gradient( #CFF4FC, #9DE2F2); /* Opera 11.10+ */
+ background-image: linear-gradient( #CFF4FC, #9DE2F2);
+ border: 1px solid #F6F6F6;
+}
+
+.ui-content{
+ font-family: 'Open Sans', sans-serif;
+}
+
+.ui-title{
+ color:white;
+ font-weight:normal;
+}
+
+/* home screen */
+
+#home .ui-body-c, .ui-overlay-c{
+ background-image: -webkit-gradient(linear, left top, left bottom, from( #CFF4FC), to( #497bae)); /* Saf4+, Chrome */
+ background-image: -webkit-linear-gradient( #CFF4FC, #9DE2F2); /* Chrome 10+, Saf5.1+ */
+ background-image: -moz-linear-gradient( #CFF4FC, #9DE2F2); /* FF3.6 */
+ background-image: -ms-linear-gradient( #CFF4FC, #9DE2F2); /* IE10 */
+ background-image: -o-linear-gradient( #CFF4FC, #9DE2F2); /* Opera 11.10+ */
+ background-image: linear-gradient( #CFF4FC, #9DE2F2);
+}
+
+#home .ui-header{
+ background:none;
+ border:none;
+}
+
+#home .ui-title{
+ font-size:50px;
+ font-weight:normal;
+}
+
+#home .ui-header .bike{
+ color:#51C1D5;
+}
+
+#home .ui-header .pool{
+ color:#7ABFCF;
+}
+
+.subtitle{
+ color:#51C1D5;
+ text-align:center;
+ margin-top:30px;
+}
View
20 index.html
@@ -4,23 +4,33 @@
<title>Routes - Bike Pool</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="css/jquery.mobile-1.1.0.css" />
+ <link rel="stylesheet" href="css/main.css" />
+ <link href='http://fonts.googleapis.com/css?family=Bree+Serif|Open+Sans' rel='stylesheet' type='text/css'>
<script src="js/jquery-1.7.2.min.js"></script>
<script src="js/modernizr.js"></script>
<script type="text/javascript"
src="http://maps.googleapis.com/maps/api/js?sensor=false">
</script>
+
<script src="js/jquery.mobile-1.1.0.js"></script>
</head>
<body>
-<div data-role="home">
+<div id="home" data-role="home">
- <div data-role="header">
- <h1>Bike Pool</h1>
+ <div id="header" data-role="header">
+ <h1><span class="bike">Bike</span> <span class="pool">Pool</span></h1>
</div><!-- /header -->
- <div data-role="content">
- <a href="routes.html" data-role="button" data-mini="false">Login Lol</a>
+ <div id="content" data-role="content">
+ <div class="fb-connect">
+ <a href="index.html" data-role="button" data-mini="false">Facebook Connect</a>
+ </div>
+ <div class="subtitle">
+ Travel in Packs.
+ </div>
+
+
</div><!-- /content -->
</div><!-- /page -->
View
2  route.html
@@ -4,6 +4,8 @@
<title>Routes - Bike Pool</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="css/jquery.mobile-1.1.0.css" />
+ <link rel="stylesheet" href="css/main.css" />
+ <link href='http://fonts.googleapis.com/css?family=Bree+Serif|Open+Sans' rel='stylesheet' type='text/css'>
<script src="js/jquery-1.7.2.min.js"></script>
<script src="js/modernizr.js"></script>
<script type="text/javascript"
View
6 routes.html
@@ -3,8 +3,10 @@
<head>
<title>Routes - Bike Pool</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
- <link rel="stylesheet" href="http://code.jquery.com/mobile/1.1.0/jquery.mobile-1.1.0.min.css" />
- <script src="http://code.jquery.com/jquery-1.7.1.min.js"></script>
+ <link rel="stylesheet" href="css/jquery.mobile-1.1.0.css" />
+ <link rel="stylesheet" href="css/main.css" />
+ <link href='http://fonts.googleapis.com/css?family=Bree+Serif|Open+Sans' rel='stylesheet' type='text/css'>
+ <script src="js/jquery-1.7.2.min.js"></script>
<script src="js/modernizr.js"></script>
<script type="text/javascript"
src="http://maps.googleapis.com/maps/api/js?sensor=false">
Please sign in to comment.
Something went wrong with that request. Please try again.