Skip to content

Commit

Permalink
Merge pull request #2694 in SW/shopware from sw-11587/5.0/masonry-eff…
Browse files Browse the repository at this point in the history
…ect-cuts-off-text to 5.0

* commit 'cc91fa370eaef1ab2c1a3259eff069cc2dc5595f':
  SW-11587 - added auto scroll auto to blog and html shopping world elements
  • Loading branch information
Marcel Schmäing committed Jul 1, 2015
2 parents 9580662 + cc91fa3 commit 7087aa3
Showing 1 changed file with 10 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,7 @@ Shopware 5 provides 11 integrated elements inside the shopping worlds that can b
.emotion--blog {
width: 100%;
height: 100%;
overflow: hidden;
overflow: auto;

.blog--container {
height: 100%;
Expand All @@ -656,7 +656,6 @@ Shopware 5 provides 11 integrated elements inside the shopping worlds that can b
.blog--entry {
height: 100%;
padding-left: 1%;
overflow: hidden;
}

.blog--image {
Expand Down Expand Up @@ -684,6 +683,8 @@ Shopware 5 provides 11 integrated elements inside the shopping worlds that can b
.unitize(font-size, 14);
.unitize(line-height, 20);
color: @text-color;
height: auto;
max-height: 60%;
}
}

Expand All @@ -692,7 +693,13 @@ Shopware 5 provides 11 integrated elements inside the shopping worlds that can b
width: 100%;
height: 100%;
position: relative;
overflow: hidden;
overflow: auto;
}

@media screen and(min-width: @tabletViewportWidth) {
.emotion--blog {
overflow: hidden;
}
}

@media screen and(min-width: @desktopViewportWidth) {
Expand Down

0 comments on commit 7087aa3

Please sign in to comment.