talksik/Reflex
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor changes.

Browse Source
This commit is contained in:
Karthik Pullela
2018-01-20 23:37:11 -08:00
parent 40369ab1f7 62a2fad70b
commit 1d56e56100
3 changed files with 107 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flex/flex/db.sqlite3
BIN
View File
Binary file not shown.
flex/flex/home/templates/home/main.css
+77 -14
View File
@@ -11,14 +11,30 @@ title {
body { body {
margin: 0; margin: 0;
padding: 0; padding: 0;
position: absolute; position: relative;
height: 100%; height: 100%;
width: 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-repeat: no-repeat;
background-size: cover; 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 { div.input {
margin: 0; margin: 0;
position: absolute; position: absolute;
@@ -28,9 +44,9 @@ div.input {
} }
p.title { p.title {
margin: 0; margin: 10;
padding: 0; padding: 0;
height: 100px; height: 120px;
width: 70%; width: 70%;
text-align: center; text-align: center;
position: absolute; position: absolute;
@@ -39,9 +55,13 @@ p.title {
margin-right: -50%; margin-right: -50%;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
font-family: 'Open Sans Condensed', sans-serif; font-family: 'Open Sans Condensed', sans-serif;
font-size: 150px; font-size: 200px;
color: papayawhip; color: #C0C0C0;
margin-top: 150px;
text-shadow: 0px 0px 2px #000;
} }
font.title { font.title {
margin: 0; margin: 0;
padding-top: 5px; padding-top: 5px;
@@ -57,14 +77,43 @@ font.title {
font-size: 20px; font-size: 20px;
color: yellow; 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 { p.inputs {
color: dimgray; color: dimgray;
margin: 0; margin: 0;
padding: 5px; padding: 5px;
border-radius: 8px; border-radius: 8px;
background-color: papayawhip; background-color: #BDBDBD;
height: 110px; opacity: .5;
height: 150px;
width: 100%; width: 100%;
text-align: center; text-align: center;
position: fixed; position: fixed;
@@ -80,16 +129,19 @@ p.inputs {
font-size: 40px; font-size: 40px;
} }
button { button {
margin: 0; margin: 10px;
font-family: 'Open Sans Condensed', sans-serif; font-family: 'Open Sans Condensed', sans-serif;
font-size: 20px; font-size: 20px;
background-color: darkblue; letter-spacing: 2px;
font-style: oblique;
background-color: #00B8D4;
color: white; color: white;
height: 35px; height: 45px;
width: 150px; width: 150px;
padding: 0 5px 0 5px; padding: 0px 5px 10px 3px;
border: none; border: none;
box-shadow: 3px 3px 2px #888888; box-shadow: 3px 3px 2px #888888;
} }
button:hover { button:hover {
font-size: 19px; font-size: 19px;
@@ -98,3 +150,14 @@ button:hover {
box-shadow: inset 0 0 10px #000000; box-shadow: inset 0 0 10px #000000;
cursor: pointer; cursor: pointer;
} }
#begin{
color: white;
font-size: 25px;
}
.nav {
position: fixed;
top: 0;
background-color: blue;
}
index.html
+30 -6
View File
@@ -4,27 +4,51 @@
<head> <head>
{% load static %} {% load static %}
<link rel="shortcut icon" href="pics/Airplane.ico" /> <link rel="shortcut icon" href="pics/Airplane.ico" />
<title>Seat-X</title> <title>ReFleX</title>
<script type="text/javascript" src="jquery-3.1.1.min.js"></script> <script type="text/javascript" src="jquery-3.1.1.min.js"></script>
<<<<<<< HEAD
<link rel="stylesheet" type="text/css" href="{% static '/home/main.css' %}"> <link rel="stylesheet" type="text/css" href="{% static '/home/main.css' %}">
<link href="https://fonts.googleapis.com/css?family=Open+Sans+Condensed:300" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Open+Sans+Condensed:300" rel="stylesheet">
=======
<link rel="stylesheet" type="text/css" href="main.css">
<link href="https://fonts.googleapis.com/css?family=Rubik" rel="stylesheet">
>>>>>>> 62a2fad70b02ecd685b79e0cd1cfb10beac6d9ec
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
<!-- Optional theme -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">
<!-- Latest compiled and minified JavaScript -->
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
<style>
</style>
</head> </head>
<body> <body>
<div class="container-fluid">
<div class="row nav">
<div class="col-sm-5">
</div>
<div class="col-sm-7">
</div>
</div>
</div>
</div>
</div>
<div class="input"> <div class="input">
<p class="title">Reflex <p class="title">ReFleX
<font color="yellow" class="title">Accomplishing goals in a better way</font> <p class="subtitle">Compete With <font color = "#00897B"><font-size = 40px><b>You</b></font></font></font>
</p> </p>
<p class="inputs">Welcome to Relfex Fitness! <p class="inputs">
<br> <br>
<a href="planePage.html"><button id="begin">Begin Process</button></a> <a href="planePage.html"><button id="begin">BEGIN</button></a>
<br> <br>
</p> </p>
</div> </div>