diff options
| -rw-r--r-- | assets/css/creative.css | 6 | ||||
| -rw-r--r-- | assets/css/style.css | 120 | ||||
| -rw-r--r-- | exams.html | 4 | ||||
| -rw-r--r-- | index.html | 12 | ||||
| -rw-r--r-- | questions.html | 4 | ||||
| -rw-r--r-- | user_profile.html | 98 | ||||
| -rw-r--r-- | user_profile_alt.html | 14 | ||||
| -rw-r--r-- | user_solutions.html | 8 |
8 files changed, 17 insertions, 249 deletions
diff --git a/assets/css/creative.css b/assets/css/creative.css index 535e830..0155dba 100644 --- a/assets/css/creative.css +++ b/assets/css/creative.css @@ -148,7 +148,7 @@ padding-top: 200px; header { position: relative; width: 100%; - min-height: auto; + min-height: 100%; text-align: center; /*color: #fff;*/ background-image: url("../images/main.jpg"); @@ -327,8 +327,8 @@ header .header-content .header-content-inner hr { .table-user-information > tbody > tr > td { border-top: 0; } -.toppad -{margin-top:20px; +.toppad { + margin-top:20px; } diff --git a/assets/css/style.css b/assets/css/style.css index dc27602..ff26ab4 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -23,93 +23,6 @@ h1{ } -/*top_bar.height + main.height + footer.height = 8% + 80% + 12% */ -#top-bar{ - width: 100%; - height: 8%; - display: flex; - display: -webkit-flex; - flex-direction: row; - -webkit-flex-direction: row; - justify-content: space-between; - -webkit-justify-content: space-between; - align-items: flex-end; - -webkit-align-items: flex-end; -} - - #top-bar nav { - flex: 0 1 auto; - -webkit-flex: 0 1 auto; - padding-right: 20%; - - } - - #top-bar #logo { - padding-left: 20%; - } - - #top-bar img { - padding: 10%; - width: auto; - /* Humair - I added this because size wasn't working for firefox*/ - max-width: 150px; - } - - - #top-bar nav ul { - margin: 0; - padding: 0; - overflow: hidden; - - } - #top-bar ul li { - float: right; - } - - #top-bar ul li a { - display: block; - color: darkgray; - text-align: center; - padding: 14px 16px; - vertical-align: bottom; - } - - #top-bar ul li a:hover { - color: lightblue; - } - - #top-bar .drop-menu { - padding: 0; - } - - .drop-menu { - display: none; - padding: 0; - width: auto; - position: absolute; - background-color: #f9f9f9; - box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); - } - - #top-bar .drop-menu li { - float: right; - text-align: center; - clear: both; - height: auto; - color: black; - text-decoration: none; - display: block; - } - - .drop-menu li a { - padding: 12px 16px; - } - - .drop-down:hover .drop-menu { - display: block; - } - - main { background-image: url("../images/main.jpg"); @@ -400,40 +313,7 @@ main [id^="sol-"] div.comments ul li p.user-comment { /*************************** END OF USER SOLUTIONS - user_solutions.html *********************************/ -/* -footer { - background-color: #333333; - bottom: 0; - height: 12%; -} - -footer #footer-container{ - margin-left: 20%; - margin-right: 20%; - padding: .5%; -} -footer nav a{ - float: left; - padding-right: 20px; - font-size: 1em; -} -footer h6 { - margin: 0; - color: white; - float: right; - font-size: 1em; - font-weight: normal; - font-style: italic; - -} - -footer nav a { - display: block; - color: darkgray; - vertical-align: top; -} -*/ /***********************************************************************************************************************/ /*THE SOLUTIONS PAGE BEGINS HERE*/ @@ -34,7 +34,7 @@ class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="navbar-brand page-scroll" href="index.html"> ENTER OUR NAME HERE</a> + <a class="navbar-brand page-scroll" href="index.html">Solutions.Repo</a> </div> <!-- Collect the nav links, forms, and other content for toggling --> @@ -42,7 +42,7 @@ id="bs-example-navbar-collapse-1"> <ul class="nav navbar-nav navbar-right"> <li><a href="user_solutions.html">Solutions Page</a></li> - <li><a href="user_profile.html">Profile Page</a></li> + <li><a href="user_profile_alt.html">Profile Page</a></li> <li><a href="questions.html">Questions Page</a></li> <li><a href="exams.html">Exams Pages</a></li> @@ -34,7 +34,7 @@ class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="navbar-brand page-scroll" href="index.html"> ENTER OUR NAME HERE</a> + <a class="navbar-brand page-scroll" href="index.html">Solutions.Repo</a> </div> <!-- Collect the nav links, forms, and other content for toggling --> @@ -42,7 +42,7 @@ id="bs-example-navbar-collapse-1"> <ul class="nav navbar-nav navbar-right"> <li><a href="user_solutions.html">Solutions Page</a></li> - <li><a href="user_profile.html">Profile Page</a></li> + <li><a href="user_profile_alt.html">Profile Page</a></li> <li><a href="questions.html">Questions Page</a></li> <li><a href="exams.html">Exams Pages</a></li> @@ -94,14 +94,6 @@ </header> <footer> - <!--<div id="footer-container" class="container-fluid">--> - <!--<nav>--> - <!--<a href="#">Contact</a>--> - <!--<a href="#">About Us</a>--> - <!--<a href="#">Terms of Use</a>--> - <!--</nav>--> - <!--<h6>Copyright 2016</h6>--> - <!--</div>--> <div class="navbar navbar-default navbar-fixed-bottom"> <div class="container-fluid"> <div class="navbar-collapse collapse" id="footer-body"> diff --git a/questions.html b/questions.html index a47f66f..7ff151f 100644 --- a/questions.html +++ b/questions.html @@ -34,7 +34,7 @@ class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="navbar-brand page-scroll" href="index.html"> ENTER OUR NAME HERE</a> + <a class="navbar-brand page-scroll" href="index.html">Solutions.Repo</a> </div> <!-- Collect the nav links, forms, and other content for toggling --> @@ -42,7 +42,7 @@ id="bs-example-navbar-collapse-1"> <ul class="nav navbar-nav navbar-right"> <li><a href="user_solutions.html">Solutions Page</a></li> - <li><a href="user_profile.html">Profile Page</a></li> + <li><a href="user_profile_alt.html">Profile Page</a></li> <li><a href="questions.html">Questions Page</a></li> <li><a href="exams.html">Exams Pages</a></li> diff --git a/user_profile.html b/user_profile.html deleted file mode 100644 index 3f4db43..0000000 --- a/user_profile.html +++ /dev/null @@ -1,98 +0,0 @@ -<html> -<head> - <meta charset="UTF-8"> - <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <title>Solutions Repo</title> - - <link href="assets/css/style.css" rel="stylesheet" type="text/css"> - <link href='https://fonts.googleapis.com/css?family=Lato:100' rel='stylesheet' type='text/css'> - <link href='https://fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'> -</head> -<body> -<div id="top-bar"> - <div id="logo"><a href="#"><img src="assets/images/placeholder.png"></a></div> - <nav> - <ul> - <li><a href="#">Register</a></li> - <li><a href="#">Log In</a></li> - <li class="drop-down"> - <a href="#">Courses</a> - <nav class="drop-menu"> - <ul> - <li><a href="#">First Year</a></li> - <li><a href="#">Second Year</a></li> - <li><a href="#">Third Year</a></li> - <li><a href="#">Fourth Year</a></li> - </ul> - </nav> - </li> - <!-- <li id="header"><header><a href="#"><img src="assets/images/logo.png"></a></header></li> --> - </ul> - </nav> -</div> - -<main> - <!--made the id in to a class--> - - <section id="user-profile-content"> - <section id="user-menu-container"> - <section id="user-menu"> - <div id="user-avatar"> - <img src="assets/images/avatar.png" alt="avatar"> - </div> - <div id="user-photo-edit"> - <button class="menu-button menu-button-first menu-button-last" - id="bt-edit-photo">Edit Photo</button> - </div> - <div id="user-options"> - <button class="menu-button-first" id="bt-general">General info</button> - <button class="menu-button" id="bt-follows">Follows</button> - <button class="menu-button" id="bt-friends">Friends</button> - <button class="menu-button" id="bt-inbox">Inbox</button> - <button class="menu-button-last" id="bt-history">Comment History</button> - </div> - </section> - - </section> - <section id="user-info-container"> - - <div id="user-info"> - <div id="user-name"> - <h1>Walter White</h1> - </div> - - <div id="user-content"> - <h2>Account info:</h2> - <p><em>Username:</em><span id="edit-name">theSmith1985</span></p> - - <p><em>e-mail:</em><span id="edit-email">smithy@gmail.com</span></p> - <h2>Personal Info: </h2> - <p><em>First name:</em><span id="edit-fname">Walter</span></p> - <p><em>Last name:</em><span id="edit-lname">White</span></p> - <p><em>University:</em><span id="edit-uni">University of Toronto</span></p> - <p><em>Campus:</em><span id="edit-camp">St. George</span></p> - <p><em>Program:</em><span id="edit-prog">Computer Science</span></p> - <p><em>Age:</em><span id="edit-age">50</span></p> - </div> - <button class="edit-button" style="vertical-align:middle"><span>Edit Personal Info </span></button> - </div> - </section> - </section> - - - -</main> - -<footer> - <div id="footer-container"> - <nav> - <a href="#">Contact</a> - <a href="#">About Us</a> - <a href="#">Terms of Use</a> - </nav> - <h6>Copyright 2016</h6> - </div> - -</footer> -</body> -</html>
\ No newline at end of file diff --git a/user_profile_alt.html b/user_profile_alt.html index aea99d6..f152761 100644 --- a/user_profile_alt.html +++ b/user_profile_alt.html @@ -34,7 +34,7 @@ class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="navbar-brand page-scroll" href="index.html"> ENTER OUR NAME HERE</a> + <a class="navbar-brand page-scroll" href="index.html">Solutions.Repo</a> </div> <!-- Collect the nav links, forms, and other content for toggling --> @@ -42,7 +42,7 @@ id="bs-example-navbar-collapse-1"> <ul class="nav navbar-nav navbar-right"> <li><a href="user_solutions.html">Solutions Page</a></li> - <li><a href="user_profile.html">Profile Page</a></li> + <li><a href="user_profile_alt.html">Profile Page</a></li> <li><a href="questions.html">Questions Page</a></li> <li><a href="exams.html">Exams Pages</a></li> @@ -127,6 +127,8 @@ </div>--> + + <!--Attempt to apply bootstrap to it Failed :(--> <!-- <div class="container"> <div class="row" style="width: 60%; padding-left: 15%; padding-right: 15%"> <div class="col-md-3"> @@ -237,14 +239,6 @@ </main> <footer> - <!--<div id="footer-container" class="container-fluid">--> - <!--<nav>--> - <!--<a href="#">Contact</a>--> - <!--<a href="#">About Us</a>--> - <!--<a href="#">Terms of Use</a>--> - <!--</nav>--> - <!--<h6>Copyright 2016</h6>--> - <!--</div>--> <div class="navbar navbar-default navbar-fixed-bottom"> <div class="container-fluid"> <div class="navbar-collapse collapse" id="footer-body"> diff --git a/user_solutions.html b/user_solutions.html index 02f3708..2f1d14e 100644 --- a/user_solutions.html +++ b/user_solutions.html @@ -33,15 +33,14 @@ class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="navbar-brand page-scroll" href="index.html"> ENTER OUR NAME HERE</a> + <a class="navbar-brand page-scroll" href="index.html">Solutions.Repo </a> </div> <!-- Collect the nav links, forms, and other content for toggling --> - <div class="collapse navbar-collapse" - id="bs-example-navbar-collapse-1"> + <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> <ul class="nav navbar-nav navbar-right"> <li><a href="user_solutions.html">Solutions Page</a></li> - <li><a href="user_profile.html">Profile Page</a></li> + <li><a href="user_profile_alt.html">Profile Page</a></li> <li><a href="questions.html">Questions Page</a></li> <li><a href="exams.html">Exams Pages</a></li> @@ -212,6 +211,7 @@ </div> </footer> + <script> $(document).ready(function() { |