diff options
| author | HumairAK <humair88@hotmail.com> | 2016-07-13 09:05:08 +0000 |
|---|---|---|
| committer | HumairAK <humair88@hotmail.com> | 2016-07-13 09:05:08 +0000 |
| commit | 4797d1ff9ef4ef35306750dd2bb8c259519d222d (patch) | |
| tree | 09746eadefdd4bd2f412e644e1aee8b85c127b47 | |
| parent | ccc8d9bdbc53fd0e1467e8b3d3ce1d64d8f2e2c1 (diff) | |
| parent | 47093c298d4cf60375311200d3ae85a57d787262 (diff) | |
Merge branch 'master' of https://github.com/HumairAK/solutions_repo
| -rw-r--r-- | assets/css/creative.css | 8 | ||||
| -rw-r--r-- | assets/css/style.css | 34 | ||||
| -rw-r--r-- | index.html | 35 |
3 files changed, 73 insertions, 4 deletions
diff --git a/assets/css/creative.css b/assets/css/creative.css index e8c7ca5..f36128c 100644 --- a/assets/css/creative.css +++ b/assets/css/creative.css @@ -127,6 +127,14 @@ footer .navbar-default .affix .nav>li>a:focus { color: #222; } +<<<<<<< HEAD +@media(min-width:768px) { + +} + + +======= +>>>>>>> 952f7cefcd35550bb0930418e56c524f09eca92d header { position: relative; width: 100%; diff --git a/assets/css/style.css b/assets/css/style.css index 35eb354..308a36c 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -47,7 +47,7 @@ main .search h2{ padding-top: 200px; /* Change to move search bar content. Keep as pixel*/ } -.search input[type=text] { +.search input { text-align: center; box-sizing: border-box; background: white url('../images/search_icon.png') no-repeat 9px 9px; @@ -55,7 +55,7 @@ main .search h2{ padding: 12px 20px 12px 40px; } -.search input[type=text], .search button.search-button { +.search input, .search button.search-button { font-size: 16px; height: 40px; border-radius: 10px; @@ -404,3 +404,33 @@ section.exam-info em { padding: 15px; } /*** ABOUT PAGE END ***/ + +/************************** Pop-up Window *********************************************/ + +.login-window { + display: inline-block; + text-align: left; + vertical-align: middle; + padding: 15%; +} + +.login-window h4 { + text-transform: uppercase; + font-family: 'Open Sans','Helvetica Neue',Arial,sans-serif; + font-weight: 700; + color: #666666; +} + +.login-window .modal-header { + text-align: center; +} + +.login-window input { + +} + +.login-window input:focus { + +} + + @@ -24,6 +24,7 @@ </head> <body> + <nav id="mainNav" class="navbar navbar-default navbar-fixed-top" > <div class="container-fluid"> <!-- Brand and toggle get grouped for better mobile display --> @@ -62,7 +63,7 @@ <li><a href="#">Fourth Year</a></li> </ul> </li> - <li><a href="#">Log In</a></li> + <li><a href="#" data-toggle="modal" data-target=".login-window">Log In</a></li> <li><a href="#">Register</a></li> <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Links <span class="caret"></span></a> @@ -85,7 +86,7 @@ </nav> <header> - <div class="header-content"> + <div class="header-content" <section class="header-content-inner"> <p><strong>The solutions to all your problems</strong></p> <hr> <!-- Divider --> @@ -100,6 +101,7 @@ <li><a href="#">Users</a> </li> </ul> </div> + <!-- Search bar --> <input type="text" class="form-control" aria-label="..." name="search" placeholder="Enter course name"> <!-- Prompt Search --> @@ -139,6 +141,35 @@ </nav> </footer> + <!-- POP UP WINDOW FOR LOGIN --> + <article class="modal fade login-window"> + <div class="modal-dialog"> + <div class="modal-content"> + + <section class="modal-header"> + <button type="button" class="close" data-dismiss="modal">×</button> + <h4 class="modal-title">Log In</h4> + </section> + + <section class="modal-body"> + <form role="form"> + <div class="form-group"> + <input type="text" class="form-control" placeholder="Username"> + </div> + <div class="form-group"> + <input type="password" class="form-control" placeholder="Password"> + </div> + </form> + </section> + + <div class="modal-footer"> + <button class="btn">Submit</button> + </div> + + </div> + </div> + </article> + <script> $(document).ready(function() { |