Skip to content

GitLab

Commit 5ad2ee19 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files
Options

Merge "Bug 1726655: Allow more space for logo in IE11"

parents e8b578c8 a65e3cd9
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 33 deletions
htdocs/theme/raw/sass/layout/_footer.scss
View file @ 5ad2ee19
......@@ -40,6 +40,11 @@
}
}
.mahara-footer-logo {
.mahara-logo a {
height: 37px;
display: inline-block;
.mahara-footer-logo {
height: 100%;
max-width: none;
}
}
htdocs/theme/raw/sass/layout/_header.scss
View file @ 5ad2ee19
......@@ -11,32 +11,37 @@
.loading-box {
float: left;
}
$screen-width-small-logo: 415px;
.logo {
padding: 6px 0;
margin-right: 15px;
margin: 6px 15px 6px 0;
display: inline-block;
// logo restricted to 45px - custom work required for a larger version
img {
height: 45px;
height: 45px;
// When small logo is uploaded 'change-to-small' class is added.
&.change-to-small {
display: none;
@media (min-width: $screen-width-small-logo) {
display: inline-block;
}
}
}
.logo.change-to-small {
img {
@media (max-width: 415px) {
display: none;
}
.logoxs {
margin: 6px 15px 6px 0;
height: 48px;
@media (min-width: $screen-width-small-logo) {
display: none;
}
}
.logo,
.logoxs {
padding: 6px 0;
margin-right: 15px;
img {
display: none;
@media (max-width: 415px) {
display: inherit;
height: 48px;
}
height: 100%;
max-width: none;
}
}
......
htdocs/theme/raw_old/sass/layout/_footer.scss
View file @ 5ad2ee19
......@@ -27,6 +27,11 @@
}
}
.mahara-footer-logo {
.mahara-logo a {
height: 37px;
display: inline-block;
.mahara-footer-logo {
height: 100%;
max-width: none;
}
}
htdocs/theme/raw_old/sass/layout/_header.scss
View file @ 5ad2ee19
......@@ -11,31 +11,37 @@
.loading-box {
float: left;
}
$screen-width-small-logo: 415px;
.logo {
margin-right: 15px;
margin: 6px 15px 6px 0;
display: inline-block;
// logo restricted to 45px - custom work required for a larger version
img {
height: 45px;
height: 45px;
// When small logo is uploaded 'change-to-small' class is added.
&.change-to-small {
display: none;
@media (min-width: $screen-width-small-logo) {
display: inline-block;
}
}
}
.logo.change-to-small {
img {
@media (max-width: 415px) {
display: none;
}
.logoxs {
margin: 6px 15px 6px 0;
height: 48px;
@media (min-width: $screen-width-small-logo) {
display: none;
}
}
.logo,
.logoxs {
padding: 6px 0;
margin-right: 15px;
img {
display: none;
@media (max-width: 415px) {
display: inherit;
height: 48px;
}
height: 100%;
max-width: none;
}
}
......
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