diff options
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/css/creative.css | 117 | ||||
| -rw-r--r-- | assets/css/style.css | 17 |
2 files changed, 97 insertions, 37 deletions
diff --git a/assets/css/creative.css b/assets/css/creative.css index f36128c..1f9012c 100644 --- a/assets/css/creative.css +++ b/assets/css/creative.css @@ -1,9 +1,13 @@ +/*div {*/ + /*box-sizing: border-box;*/ +/*}*/ main .search { width: 60%; min-height: 100%; } .search-cover { + /*height: auto;*/ padding-bottom: 10%; } @@ -29,6 +33,12 @@ main .search { } } + +/*main #solutions { + padding-top: 65px; +}*/ + + h2 { font-family: 'Lato', sans-serif; color: gray; @@ -37,9 +47,6 @@ margin: 4%; padding-top: 200px; } -/*** NAVBAR DEFAULT OVERWRITE ***/ -/* For top navigation panel use */ - .navbar-default { border-color: rgba(34,34,34,.05); font-family: 'Open Sans','Helvetica Neue',Arial,sans-serif; @@ -57,14 +64,17 @@ padding-top: 200px; transition: all .35s; } + .navbar-default .navbar-header .navbar-brand { text-transform: uppercase; font-family: 'Open Sans','Helvetica Neue',Arial,sans-serif; font-weight: 700; + /*color: #f05f40;*/ } .navbar-default .navbar-header .navbar-brand:hover , .navbar-default .navbar-header .navbar-brand:focus { + /*color: #eb3812;*/ } .navbar-default .nav > li>a, @@ -77,10 +87,12 @@ padding-top: 200px; .navbar-default .nav > li>a:hover, .navbar-default .nav>li>a:focus:hover { + /*color: #f05f40;*/ } .navbar-default .nav > li.active>a, .navbar-default .nav>li.active>a:focus { + /*color: #f05f40!important;*/ background-color: transparent; } @@ -101,7 +113,14 @@ padding-top: 200px; margin: 0; } -/*** FOOTER DEFAULT OVERWRITE ***/ +/*.navbar-default .dropdown-submenu .dropdown-menu li a { + padding: 0; + padding-top: 5px; + padding-bottom: 5px; + margin: 0; +}*/ + + footer .navbar-default { border-color: rgba(255,255,255,.3); background-color: #333333; @@ -127,22 +146,63 @@ footer .navbar-default .affix .nav>li>a:focus { color: #222; } -<<<<<<< HEAD -@media(min-width:768px) { +/*@media(min-width:768px) { + footer .navbar-default { + border-color: rgba(255,255,255,.3); + background-color: #333333; + } + + footer .navbar-default .navbar-header .navbar-brand { + color: rgba(255,255,255,.7); + } + + footer .navbar-default .navbar-header .navbar-brand:hover , + footer .navbar-default .navbar-header .navbar-brand:focus { + color: #fff; + } + + footer .navbar-default .nav > li>a, + footer .navbar-default .nav>li>a:focus { + color: rgba(255,255,255,.7); + } + + footer .navbar-default .nav > li>a:hover, + footer .navbar-default .nav>li>a:focus:hover { + color: #fff; + } + + footer .navbar-default .affix { + border-color: rgba(34,34,34,.05); + background-color: #fff; + } + + footer .navbar-default .affix .navbar-header .navbar-brand { + font-size: 14px; + } + -} + footer .navbar-default .affix .nav > li>a, + footer .navbar-default .affix .nav>li>a:focus { + color: #222; + } +}*/ -======= ->>>>>>> 952f7cefcd35550bb0930418e56c524f09eca92d header { position: relative; width: 100%; min-height: 100%; text-align: center; + /*color: #fff;*/ background-image: url("../images/main.jpg"); + /*background-color: #5bc0de;*/ background-size: 250px 250px; background-position: center; + /*-webkit-background-size: cover;*/ + /*-moz-background-size: cover;*/ + /*background-size: cover;*/ + /*-o-background-size: cover;*/ + } header .header-spec { @@ -167,6 +227,16 @@ header .header-content .header-content-inner hr { margin: 30px auto; } +/*header .header-content .header-content-inner p { + margin-bottom: 50px; + font-family: 'Lato', sans-serif; + color: red; + font-size: 2.5em; + /color: #333333 +}*/ + + + @media (min-width: 320px) { header { min-height: 100%; @@ -185,6 +255,8 @@ header .header-content .header-content-inner hr { margin-right: auto; margin-left: auto; max-width: 1000px; + + /* Shift search bar content up */ padding-top: 14%; } @@ -222,6 +294,7 @@ header .header-content .header-content-inner hr { margin-right: auto; margin-left: auto; max-width: 80%; + font-size: 32px; font-family: 'Lato', sans-serif; color: gray; font-size: 2.5em; @@ -242,37 +315,33 @@ header .header-content .header-content-inner hr { border-radius: 20px; } -/*** SUB-MENU ***/ .dropdown-submenu { position: relative; } - .dropdown-submenu > .dropdown-menu { top: 0; left: 100%; margin-top: -6px; margin-left: -1px; } - .dropdown-submenu:hover > .dropdown-menu { display: block; } - .dropdown-submenu:hover > a:after { border-left-color: #fff; } - .dropdown-submenu.pull-left { float: none; } - .dropdown-submenu.pull-left > .dropdown-menu { left: -100%; margin-left: 10px; } -/* Humair: Cannot find a usage for the styles below (not including user-profile) - * Remove if not in use. Remove this comment once done.*/ + + +/******************************************************/ + .user-row { margin-bottom: 14px; @@ -292,7 +361,6 @@ header .header-content .header-content-inner hr { cursor: pointer; } -/*** USER PROFILE STYLES ***/ .table-user-information > tbody > tr { border-top: 1px solid rgb(221, 221, 221); } @@ -301,17 +369,17 @@ header .header-content .header-content-inner hr { border-top: 0; } + .table-user-information > tbody > tr > td { border-top: 0; } - -/* VERTICAL OFFSET FOR CONTENT CARD */ .toppad { margin-top:20px; } -/* USER PROFILE CUSTOM NAV */ -/* Note: only children of navbar-custom are affected */ +/****************************************/ +/* user-profile-nav */ +/* only children of navbar-custom are affected*/ .navbar-custom{ background-color: #ffffff; /* Green */ margin: 0 0 3px 0; @@ -319,8 +387,9 @@ header .header-content .header-content-inner hr { font-size: 1em; -webkit-transition-duration: 0.4s; /* Safari */ transition-duration: 0.4s; - border-radius: 10px 10px 0 0; + border-radius: 10px 10px 0px 0px; } + .navbar-custom .navbar-toggle{ border-color: #ddd; } @@ -334,5 +403,5 @@ header .header-content .header-content-inner hr { background-color: #d9edf7; color: #3170a6; } - +/********************************************/ diff --git a/assets/css/style.css b/assets/css/style.css index 308a36c..e81046d 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -407,30 +407,21 @@ section.exam-info em { /************************** Pop-up Window *********************************************/ -.login-window { +.login-window, .registration-window { display: inline-block; text-align: left; vertical-align: middle; - padding: 15%; + padding: 10%; } -.login-window h4 { +.login-window h4, .registration-window { text-transform: uppercase; font-family: 'Open Sans','Helvetica Neue',Arial,sans-serif; font-weight: 700; color: #666666; } -.login-window .modal-header { +.login-window .modal-header, .registration-window .modal-header { text-align: center; } -.login-window input { - -} - -.login-window input:focus { - -} - - |