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 /assets/css | |
| parent | ccc8d9bdbc53fd0e1467e8b3d3ce1d64d8f2e2c1 (diff) | |
| parent | 47093c298d4cf60375311200d3ae85a57d787262 (diff) | |
Merge branch 'master' of https://github.com/HumairAK/solutions_repo
Diffstat (limited to 'assets/css')
| -rw-r--r-- | assets/css/creative.css | 8 | ||||
| -rw-r--r-- | assets/css/style.css | 34 |
2 files changed, 40 insertions, 2 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 { + +} + + |