Commit feae1904 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Bug 1863197 Primary school theme dashboard display incorrectly"

parents a2173a80 10bdd0f9
......@@ -96,6 +96,190 @@ $logged-in-height-phone: 120px;
}
}
}
.widget-heading {
padding: 10px 15px;
height: $logged-in-height;
border-top: 0;
background-color: transparent;
position: relative;
top: -80px;
text-align: center;
@include media-breakpoint-between (sm, lg) {
height: $logged-in-height-tablet;
top: -60px;
padding: 10px 15px;
}
@include media-breakpoint-down(sm) {
height: $logged-in-height-phone;
top: 0;
padding: 10px;
}
h2 {
font-family: 'Shadows Into Light Two', 'Open Sans', "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 400;
font-size: 30px;
color: $white;
@include media-breakpoint-between (sm, lg) {
font-size: 32px;
margin: 0;
}
@include media-breakpoint-down(sm) {
font-size: 26px;
margin: 0;
}
}
.pict {
margin: 5px 0 5px 25px;
text-align: center;
@include media-breakpoint-between (sm, lg) {
margin: 5px 0 5px 25px;
}
img {
max-width: 100%;
@include media-breakpoint-down(sm) {
display: none;
}
}
}
p {
margin: 0;
font-size: $font-size-sm;
color: $white;
@include media-breakpoint-down(sm) {
margin: 0;
line-height: 1.1em;
}
}
a {
color: $white;
}
}
.widget-detail {
padding: 10px 15px;
position: relative;
top: -80px;
border: 0;
@include media-breakpoint-between (sm, lg) {
top: -60px;
}
@include media-breakpoint-down(sm) {
display: none
}
p {
margin-bottom: 0;
color: $gray-700;
@include media-breakpoint-down(sm) {
font-size: $font-size-sm;
}
}
}
&.logged-in {
text-decoration: none;
height: $logged-in-height;
overflow:hidden;
@include media-breakpoint-between (sm, lg) {
height: $logged-in-height-tablet;
}
@include media-breakpoint-down(sm) {
height: auto;
overflow: visible;
}
.widget-heading {
@include clearfix;
border-radius: 0;
@include media-breakpoint-down(sm) {
border-radius: 0;
}
h2 {
margin: 10px 0 15px 0;
font-weight: normal;
@include media-breakpoint-down (lg) {
font-size: 24px;
margin: 0;
}
}
p {
font-size: $font-size-sm;
color: $white;
}
}
.widget-detail {
@include transition(0.03s);
border-radius: 0;
opacity:0;
margin-top: -$logged-in-height * 2;
border: none;
font-weight: bold;
display: inline-block;
z-index: 2;
background-color: $theme-primary-color;
height: $logged-in-height;
margin-right: 0;
vertical-align: top;
width:100%;
@include media-breakpoint-between (sm, lg) {
margin-top: -$logged-in-height-tablet * 2;
height: $logged-in-height-tablet;
}
@include media-breakpoint-down(sm) {
display: none;
}
p {
color: $white;
}
}
&:hover {
.widget-heading {
background-color: $theme-primary-color;
}
.widget-detail {
@include transition(0.3s);
opacity: 1;
margin-top: -$logged-in-height;
@include media-breakpoint-between (sm, lg) {
margin-top: -$logged-in-height-tablet;
}
@include media-breakpoint-down(sm) {
display: none;
}
}
}
}
}
.penciltip {
......@@ -174,191 +358,6 @@ $logged-in-height-phone: 120px;
}
}
}
.widget-heading {
padding: 10px 15px;
height: $logged-in-height;
border-top: 0;
background-color: transparent;
position: relative;
top: -80px;
text-align: center;
@include media-breakpoint-between (sm, lg) {
height: $logged-in-height-tablet;
top: -60px;
padding: 10px 15px;
}
@include media-breakpoint-down(sm) {
height: $logged-in-height-phone;
top: 0;
padding: 10px;
}
h2 {
font-family: 'Shadows Into Light Two', 'Open Sans', "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 400;
font-size: 30px;
color: $white;
@include media-breakpoint-between (sm, lg) {
font-size: 32px;
margin: 0;
}
@include media-breakpoint-down(sm) {
font-size: 26px;
margin: 0;
}
}
.pict {
margin: 5px 0 5px 25px;
text-align: center;
@include media-breakpoint-between (sm, lg) {
margin: 5px 0 5px 25px;
}
img {
max-width: 100%;
@include media-breakpoint-down(sm) {
display: none;
}
}
}
p {
margin: 0;
font-size: $font-size-sm;
color: $white;
@include media-breakpoint-down(sm) {
margin: 0;
line-height: 1.1em;
}
}
a {
color: $white;
}
}
.widget-detail {
padding: 10px 15px;
position: relative;
top: -80px;
border: 0;
@include media-breakpoint-between (sm, lg) {
top: -60px;
}
@include media-breakpoint-down(sm) {
display: none
}
p {
margin-bottom: 0;
color: $gray-700;
@include media-breakpoint-down(sm) {
font-size: $font-size-sm;
}
}
}
.logged-in {
text-decoration: none;
height: $logged-in-height;
overflow:hidden;
@include media-breakpoint-between (sm, lg) {
height: $logged-in-height-tablet;
}
@include media-breakpoint-down(sm) {
height: auto;
overflow: visible;
}
.widget-heading {
@include clearfix;
border-radius: 0;
@include media-breakpoint-down(sm) {
border-radius: 0;
}
h2 {
margin: 10px 0 15px 0;
font-weight: normal;
@include media-breakpoint-down (lg) {
font-size: 24px;
margin: 0;
}
}
p {
font-size: $font-size-sm;
color: $white;
}
}
.widget-detail {
@include transition(0.03s);
border-radius: 0;
opacity:0;
margin-top: -$logged-in-height * 2;
border: none;
font-weight: bold;
display: inline-block;
z-index: 2;
background-color: $theme-primary-color;
height: $logged-in-height;
margin-right: 0;
vertical-align: top;
width:100%;
@include media-breakpoint-between (sm, lg) {
margin-top: -$logged-in-height-tablet * 2;
height: $logged-in-height-tablet;
}
@include media-breakpoint-down(sm) {
display: none;
}
p {
color: $white;
}
}
}
.logged-in:hover {
.widget-heading {
background-color: $theme-primary-color;
}
.widget-detail {
@include transition(0.3s);
opacity: 1;
margin-top: -$logged-in-height;
@include media-breakpoint-between (sm, lg) {
margin-top: -$logged-in-height-tablet;
}
@include media-breakpoint-down(sm) {
display: none;
}
}
}
}
.dashboard-editable {
......
Supports Markdown
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