Commit d1bfcdad authored by Evonne Cheung's avatar Evonne Cheung Committed by Robert Lyon
Browse files

More updates to default theme layout



Change-Id: I982b9067394997a4699ca9628360b8c6f1a44e10
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
parent 00145cb0
......@@ -45,6 +45,7 @@
// cleans up some btns that went bung after the styles above
.form-group.submitcancel .cancel {
background: none;
text-shadow: none;
}
// forum buttons
......
.header {
.navbar-toggle {
margin-top: 18px;
margin-top: 15px;
@include gradient-vertical($start-color: #FFFFFF, $end-color: #ececec, $start-percent: 10%, $end-percent: 100%);
border-color: #dddddd;
......@@ -8,6 +8,7 @@
&:focus,
&:hover {
@include gradient-vertical($start-color: #ececec, $end-color: #ececec, $start-percent: 10%, $end-percent: 100%);
color: #333333;
}
}
......
......@@ -52,8 +52,23 @@
}
.header {
height: 138px;
border-bottom: 1px solid #ddd;
@media (max-width: $screen-sm-min) {
height: 65px;
height: auto;
border-bottom: 0;
}
}
// when in the admin and it wraps two lines
&.admin {
padding-top: 168px;
@media (max-width: $screen-sm-min) {
padding-top: 0;
}
.header {
height: 168px;
@media (max-width: $screen-sm-min) {
height: auto;
}
}
}
}
......@@ -67,7 +82,7 @@
.header {
height: 105px;
@media (max-width: $screen-sm-min) {
height: 65px;
height: auto;
}
}
}
......@@ -79,7 +94,7 @@
padding-top: 0;
}
.header {
height: 65px;
height: auto;
}
}
.loggedout {
......@@ -88,3 +103,4 @@
padding-top: 0;
}
}
......@@ -35,6 +35,10 @@
}
}
}
.pull-right {
float: none !important;
}
@media (max-width: $screen-lg) {
max-width: ($screen-md - 30px);
......@@ -54,3 +58,16 @@
}
}
// admin footer
.admin {
.footer {
.footer-inner {
background: none;
border: 0;
padding: 0 15px;
border-radius: 0;
}
}
}
......@@ -4,6 +4,7 @@
.main-nav {
@media (max-width: $screen-sm-min) {
background-color: #eef3e9;
border-bottom: 2px solid #ddd;
}
.nav > li > a {
......
......@@ -2,12 +2,22 @@
background-color: #FFFFFF;
border-left: 0;
border-right: 0;
border-bottom: 0;
min-height: 26px;
margin-top: 0;
.nav {
margin: 3px 15px 3px 5px;
margin: 0px 15px 0px 5px;
>li {
margin: 0 5px 0 0;
> a {
padding: 5px;
}
&.active {
> a {
font-weight: 700;
}
}
}
}
}
......@@ -14,7 +14,7 @@
@media (min-width: $screen-xs-min) and (max-width: $screen-md-min) {
clear: none;
margin-top: 12px;
margin-top: 7px;
}
@media (max-width: $screen-sm-min - 1) {
......@@ -72,7 +72,6 @@
color: $link-color;
margin-top: 11px;
margin-bottom: 0;
font-style: italic;
&:focus,
&:hover {
color: $link-hover-color;
......@@ -103,7 +102,7 @@
}
.main-nav {
.mainnav-search {
margin-top: 2px;
margin-top: 0;
margin-bottom: 0;
}
.navbar-form {
......
.top-nav.navbar-nav {
margin: 15px 0 0 0;
margin: 10px 0 0 0;
padding: 0;
font-size: 13px;
text-align: right;
......@@ -9,7 +9,7 @@
right: auto;
background-color: transparent;
border-radius: 0;
margin: 15px 10px;
margin: 10px 10px;
font-size: 14px;
}
......
......@@ -2,6 +2,7 @@
.collapsible legend h3,
.panel-heading {
a:not(.secondary-link) {
color: $theme-primary-color;
&.collapsed {
background-color: transparent;
color: $theme-primary-color;
......
......@@ -5,4 +5,11 @@
.footer-nav {
font-size: $font-size-base;
}
}
.admin {
.footer {
background-color: transparent;
border-top: 0;
}
}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment