Minor updates to styling including responsive fixes, bug that cut off part of the border on the Generate link in the main nav, and the tables for the generated workouts.

This commit is contained in:
William Brawner 2015-12-19 17:09:06 -06:00
parent 1d218ee683
commit 6d5008b074
3 changed files with 28 additions and 20 deletions

View file

@ -47,7 +47,9 @@ body {
max-width:100% !important; max-width:100% !important;
margin:0 !important; margin:0 !important;
padding:5px 0 !important; padding:5px 0 !important;
top:45%; top:50%;
-webkit-transform: translateY(-50%);
transform: translateY(-50%);
text-align:center; text-align:center;
display:block; display:block;
text-shadow:0px 0px 5px #000; text-shadow:0px 0px 5px #000;
@ -65,6 +67,10 @@ body {
padding: 10px 20px; padding: 10px 20px;
} }
.home-button:hover {
background-color: #D4262C;
}
#nav { #nav {
float:right; float:right;
margin-right:5px; margin-right:5px;
@ -167,6 +173,10 @@ body {
border:1px solid black; border:1px solid black;
} }
.generator label, .generator button {
display: block;
}
.generator select { .generator select {
-webkit-appearance:none; -webkit-appearance:none;
text-align: center; text-align: center;
@ -177,6 +187,7 @@ body {
border:1px solid #000; border:1px solid #000;
padding:3px 5px; padding:3px 5px;
cursor: pointer; cursor: pointer;
margin: 10px 10px 30px;
} }
.generator input[type='checkbox'] { .generator input[type='checkbox'] {
@ -203,6 +214,7 @@ body {
border:1px solid black; border:1px solid black;
margin:10px auto; margin:10px auto;
text-align:center; text-align:center;
border-collapse: collapse;
} }
.workout th, .workout tr, .workout td { .workout th, .workout tr, .workout td {
@ -211,6 +223,16 @@ body {
.workout th { .workout th {
font-weight: bold; font-weight: bold;
color: #fff;
background-color: #87161a;
}
.workout th, td {
padding: 5px;
}
.workout tr:nth-child(even) {
background-color: #f2f2f2;
} }
@media (max-width: 1024px) { @media (max-width: 1024px) {
@ -222,7 +244,7 @@ body {
#nav { #nav {
float:none; float:none;
display:block; display:block;
width:290px; width:194px;
margin:auto; margin:auto;
} }

View file

@ -12,17 +12,12 @@
<input type="hidden" name="_token" value="{{ csrf_token() }}"> <input type="hidden" name="_token" value="{{ csrf_token() }}">
<legend>Background Info:</legend> <legend>Background Info:</legend>
<label>What is your primary goal?:</label> <label>What is your primary goal?:</label>
<br />
<br />
<select name='goal' required> <select name='goal' required>
<option value="" disabled selected>Select Your Goal:</option> <option value="" disabled selected>Select Your Goal:</option>
<option value="strength">Gain Strength</option> <option value="strength">Gain Strength</option>
<option value="endurance">Gain Endurance</option> <option value="endurance">Gain Endurance</option>
<option value="definition">Gain Definition</option> <option value="definition">Gain Definition</option>
</select> </select>
<br />
<br />
<br />
<!-- <label>Which of the following equipment/exercise styles do you have access to and enjoy doing? Check all that apply:</label> <!-- <label>Which of the following equipment/exercise styles do you have access to and enjoy doing? Check all that apply:</label>
<br /> <br />
<br /> <br />
@ -41,8 +36,6 @@
<br /> <br />
<br /> --> <br /> -->
<label>How long have you consistently followed an exercise routine?</label> <label>How long have you consistently followed an exercise routine?</label>
<br />
<br />
<select name="years" required> <select name="years" required>
<option value="" disabled selected>Years:</option> <option value="" disabled selected>Years:</option>
<option value="0">0</option> <option value="0">0</option>
@ -57,12 +50,7 @@
} }
?> ?>
</select> </select>
<br />
<br />
<br />
<label>How many days would you like to workout this week?</label> <label>How many days would you like to workout this week?</label>
<br />
<br />
<select name="frequency" required> <select name="frequency" required>
<option value="" disabled selected>Days per Week:</option> <option value="" disabled selected>Days per Week:</option>
<?php <?php
@ -71,8 +59,6 @@
} }
?> ?>
</select> </select>
<br />
<br />
<button name="submit" class="home-button">Generate My Workout!</button> <button name="submit" class="home-button">Generate My Workout!</button>
</fieldset> </fieldset>
</form> </form>

View file

@ -8,14 +8,14 @@
@section('header') @section('header')
<div class="header"> <div class="header">
<div class="container"> <div class="container">
<div id=logo> <div id="logo">
<a href="/"><img src={{ asset('assets/images/logo.png') }} alt='Fitness 1440'></a> <a href="/"><img src={{ asset('assets/images/logo.png') }} alt='Fitness 1440'></a>
</div> </div>
<div id=nav> <div id="nav">
<ul> <ul>
<a href="/"><li>Home</li></a> | <li><a href="/">Home</a></li> |
<!--<a href="/about"><li>About</li></a> |--> <!--<a href="/about"><li>About</li></a> |-->
<a href="/generate"><li>Generate</li></a> <li><a href="/generate">Generate</a></li>
</ul> </ul>
</div> </div>
</div> </div>