Merged in Scott's new changes to the header css from /public

This commit is contained in:
Victoria Wang 2013-07-15 03:24:06 -05:00
parent bb47125de6
commit a75b115a56
3 changed files with 34 additions and 6 deletions

View file

@ -2,10 +2,11 @@
// Project Specific: Header Area // Project Specific: Header Area
// ---------------------------------------------------------------- // ----------------------------------------------------------------
// Apply to <header> for styling // Apply to header for styling
.header-Base{ .header-Base{
background:#65a0ad; background:#65a0ad;
border-bottom:6px solid #e93250; border-bottom:6px solid #e93250;
min-height:42px;
overflow:hidden; overflow:hidden;
} }
@ -242,9 +243,17 @@ $signupShadow: 1px 2px 12px 2px rgba(0, 0, 0, 0.15);
.status-Nav{ .status-Nav{
float:right; float:right;
@media (max-device-width:480px), screen and (max-width:800px){
float:none;
}
li{
float:left;
@media (max-device-width:480px), screen and (max-width:800px){ @media (max-device-width:480px), screen and (max-width:800px){
float:none float:none
} }
}
} }
// hp CSS // hp CSS
@ -308,7 +317,8 @@ $signupShadow: 1px 2px 12px 2px rgba(0, 0, 0, 0.15);
overflow:visible; overflow:visible;
position:fixed; position:fixed;
top:0; top:0;
width:100% width:100%;
z-index:9;
} }
.int-Logo{ .int-Logo{
@ -319,5 +329,10 @@ $signupShadow: 1px 2px 12px 2px rgba(0, 0, 0, 0.15);
} }
.interior .header-Nav{ .interior .header-Nav{
padding-left:70px padding-left:70px;
@media (max-device-width:480px), screen and (max-width:800px){
width:100%;
}
} }
.interior .constant-Nav{margin:0}

View file

@ -934,6 +934,7 @@ a {
.header-Base { .header-Base {
background: #65a0ad; background: #65a0ad;
border-bottom: 6px solid #e93250; border-bottom: 6px solid #e93250;
min-height: 42px;
overflow: hidden; } overflow: hidden; }
.header-Content { .header-Content {
@ -1141,6 +1142,11 @@ h1.logo img {
@media (max-device-width: 480px), screen and (max-width: 800px) { @media (max-device-width: 480px), screen and (max-width: 800px) {
.status-Nav { .status-Nav {
float: none; } } float: none; } }
.status-Nav li {
float: left; }
@media (max-device-width: 480px), screen and (max-width: 800px) {
.status-Nav li {
float: none; } }
.hp .header-Base { .hp .header-Base {
padding-top: 46px; } padding-top: 46px; }
@ -1198,7 +1204,8 @@ h1.logo img {
overflow: visible; overflow: visible;
position: fixed; position: fixed;
top: 0; top: 0;
width: 100%; } width: 100%;
z-index: 9; }
.int-Logo { .int-Logo {
left: 0; left: 0;
@ -1208,6 +1215,12 @@ h1.logo img {
.interior .header-Nav { .interior .header-Nav {
padding-left: 70px; } padding-left: 70px; }
@media (max-device-width: 480px), screen and (max-width: 800px) {
.interior .header-Nav {
width: 100%; } }
.interior .constant-Nav {
margin: 0; }
.content-Base { .content-Base {
background: #f6f0e6; background: #f6f0e6;

File diff suppressed because one or more lines are too long