diff --git a/flex/flex/db.sqlite3 b/flex/flex/db.sqlite3
index ba143c7..5db2926 100644
Binary files a/flex/flex/db.sqlite3 and b/flex/flex/db.sqlite3 differ
diff --git a/flex/flex/home/templates/home/main.css b/flex/flex/home/templates/home/main.css
index 7fc9634..a0447de 100644
--- a/flex/flex/home/templates/home/main.css
+++ b/flex/flex/home/templates/home/main.css
@@ -11,14 +11,30 @@ title {
body {
margin: 0;
padding: 0;
- position: absolute;
+ position: relative;
height: 100%;
width: 100%;
- background-image: url(pics/indexbg.jpg);
+ background-image: url(http://www.mulierchile.com/nike-running-wallpapers/nike-running-wallpapers-005.jpg);
background-repeat: no-repeat;
background-size: cover;
}
-
+div.navbar {
+ background: black;
+ width: 100%;
+ height: 50px;
+ color: white;
+ display: flex;
+ align-items: right;
+ justify-content: center;
+ padding-left: 425px;
+ position: absolute;
+ rgba = red blue green alpha. alpha is
+}
+.navbar .item{
+ color: white;
+ font-size: 35px;
+ margin-left:
+}
div.input {
margin: 0;
position: absolute;
@@ -28,9 +44,9 @@ div.input {
}
p.title {
- margin: 0;
+ margin: 10;
padding: 0;
- height: 100px;
+ height: 120px;
width: 70%;
text-align: center;
position: absolute;
@@ -39,9 +55,13 @@ p.title {
margin-right: -50%;
transform: translate(-50%, -50%);
font-family: 'Open Sans Condensed', sans-serif;
- font-size: 150px;
- color: papayawhip;
+ font-size: 200px;
+ color: #C0C0C0;
+ margin-top: 150px;
+ text-shadow: 0px 0px 2px #000;
}
+
+
font.title {
margin: 0;
padding-top: 5px;
@@ -57,14 +77,43 @@ font.title {
font-size: 20px;
color: yellow;
}
-
+.subtitle{
+ margin: 10;
+ padding: 0;
+ height: 35px;
+ text-align: center;
+ position: absolute;
+ top: 12%;
+ left: 50%;
+ margin-right: -50%;
+ transform: translate(-50%, -50%);
+ font-family: 'Open Sans Condensed', sans-serif;
+ font-size: 50px;
+ color: #546E7A;
+ margin-top:330px;
+}
+html, html a {
+ -webkit-font-smoothing: antialiased;
+ text-shadow: 1px 1px 1px rgba(0,0,0,0.004);
+}
+p.legibility {
+ text-rendering: optimizeLegibility;
+}
+p.speed {
+ text-rendering: optimizeSpeed;
+}
+body {
+ text-rendering: optimizeLegibility;
+}
p.inputs {
color: dimgray;
margin: 0;
padding: 5px;
border-radius: 8px;
- background-color: papayawhip;
- height: 110px;
+ background-color: #BDBDBD;
+ opacity: .5;
+
+ height: 150px;
width: 100%;
text-align: center;
position: fixed;
@@ -80,16 +129,19 @@ p.inputs {
font-size: 40px;
}
button {
- margin: 0;
+ margin: 10px;
font-family: 'Open Sans Condensed', sans-serif;
font-size: 20px;
- background-color: darkblue;
+ letter-spacing: 2px;
+ font-style: oblique;
+ background-color: #00B8D4;
color: white;
- height: 35px;
+ height: 45px;
width: 150px;
- padding: 0 5px 0 5px;
+ padding: 0px 5px 10px 3px;
border: none;
box-shadow: 3px 3px 2px #888888;
+
}
button:hover {
font-size: 19px;
@@ -98,3 +150,14 @@ button:hover {
box-shadow: inset 0 0 10px #000000;
cursor: pointer;
}
+#begin{
+ color: white;
+ font-size: 25px;
+}
+.nav {
+ position: fixed;
+ top: 0;
+ background-color: blue;
+
+
+}
diff --git a/index.html b/index.html
index fc714ec..ec31412 100644
--- a/index.html
+++ b/index.html
@@ -4,27 +4,51 @@
{% load static %}
- Seat-X
+ ReFleX
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> 62a2fad70b02ecd685b79e0cd1cfb10beac6d9ec
+
+
+
+
+
+
+
+
-
+
+
+