Skip to content

Commit

Permalink
update social feed css
Browse files Browse the repository at this point in the history
  • Loading branch information
seibtph authored and Philipp Seibt committed Apr 10, 2018
1 parent 84fde96 commit 2411b4f
Show file tree
Hide file tree
Showing 2 changed files with 99 additions and 92 deletions.
2 changes: 1 addition & 1 deletion src/Module/MateThemeSetup.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

class MateThemeSetup extends \BackendModule
{
const VERSION = '1.0.28';
const VERSION = '1.0.29';

protected $strTemplate = 'be_mateTheme_setup';

Expand Down
189 changes: 98 additions & 91 deletions src/Resources/public/sass/mate.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2492,112 +2492,116 @@ textarea {
/* ========================== *
* Social Feed *
* ========================== */
.ce_socialfeed .social-feed-container {
padding: 24px 0;
}
.ce_socialfeed {
clear: left;

.ce_socialfeed .social-feed-element {
position: relative;
margin: 0 0 30px;
overflow: visible;
box-shadow: none;
font-family: inherit;
color: inherit;
float: left;

.content {
padding: 40px 15px 15px;
.social-feed-container {
padding: 24px 0;
}

.author-img {
position: absolute;
top: -15px;
z-index: 2;
.social-feed-element {
position: relative;
margin: 0 0 30px;
overflow: visible;
box-shadow: none;
font-family: inherit;
color: inherit;
float: left;

img {
width: 50px;
.content {
padding: 40px 15px 15px;
}
}

&:hover {
box-shadow: none;
}
.author-img {
position: absolute;
top: -15px;
z-index: 2;

&:before {
position: absolute;
top: 0;
left: 0;
width: 100%;
content: "";
border-top: 5px solid $mateColor2;
z-index: 1;
}
img {
width: 50px;
}
}

p.social-feed-text {
padding: 15px 0;
white-space: pre-line;
&:hover {
box-shadow: none;
}

a {
color: $primary-link-font-color;
&:before {
position: absolute;
top: 0;
left: 0;
width: 100%;
content: "";
border-top: 5px solid $mateColor2;
z-index: 1;
}

&:hover {
color: $primary-link-hover-font-color;
p.social-feed-text {
padding: 15px 0;
white-space: pre-line;

a {
color: $primary-link-font-color;

&:hover {
color: $primary-link-hover-font-color;
}
}
}
}

.muted {
position: absolute;
top: 15px;
right: 30px;
}
.muted {
position: absolute;
top: 15px;
right: 30px;
}

.author-title {
color: #86af49;
font-family: Old Standard;
display: block;
padding: 2px 0;
font-size: 16px;
}
.author-title {
color: #86af49;
font-family: Old Standard;
display: block;
padding: 2px 0;
font-size: 16px;
}

.fa {
position: absolute;
top: 15px;
right: 15px;
color: $mateColor2;
}
.fa {
position: absolute;
top: 15px;
right: 15px;
color: $mateColor2;
}

img {
width: auto;
img {
width: auto;
}
}
}

.ce_socialfeed.col-2 .social-feed-element {
width: calc(100% / 2);
}
&.col-2 .social-feed-element {
width: calc(100% / 2);
}

.ce_socialfeed.col-3 .social-feed-element {
width: calc(100% / 3);
}
&.col-3 .social-feed-element {
width: calc(100% / 3);
}

.ce_socialfeed.col-2, .ce_socialfeed.col-3 {
.social-feed-container {
@extend .row;
&.col-2, &.col-3 {
.social-feed-container {
@extend .row;

.social-feed-element {
box-sizing: border-box;
margin: 0;
background: none;
.social-feed-element {
box-sizing: border-box;
margin: 0;
background: none;

&:before {
left: 0.75rem;
width: calc(100% - (0.75rem * 2));
}
&:before {
left: 0.75rem;
width: calc(100% - (0.75rem * 2));
}

.content {
background: #fff;
margin: 0 0.75rem 35px;
position: relative;
.content {
background: #fff;
margin: 0 0.75rem 35px;
position: relative;
}
}
}
}
Expand Down Expand Up @@ -3388,17 +3392,20 @@ textarea {
}

/* Social Feed */
.ce_socialfeed.col-2, .ce_socialfeed.col-3 {
.social-feed-container {
display: block;
margin: 0;
.ce_socialfeed {
&.col-2, &.col-3 {
.social-feed-container {
display: block;
margin: 0;

.social-feed-element {
-ms-flex: 0 0 100%;
flex: 0 0 100%;
}
.social-feed-element {
-ms-flex: 0 0 100%;
flex: 0 0 100%;
}
}
}
}

}

@import '../../../../../../../files/mate/sass/custom';

0 comments on commit 2411b4f

Please sign in to comment.