diff --git a/client/scss/_socialselement.scss b/client/scss/_socialselement.scss index b146ab5..33eb264 100644 --- a/client/scss/_socialselement.scss +++ b/client/scss/_socialselement.scss @@ -35,23 +35,14 @@ } .rounded-social-buttons{ .social-button { + margin-right: 0px; + width: 50px; + height: 50px; + font-size: 24px; display: inline-block; position: relative; - cursor: pointer; - width: 3.125rem; - height: 3.125rem; - border: 0.125rem solid transparent; - padding: 0; - text-decoration: none; - text-align: center; - color: #fff; - font-weight: normal; - font-size: 24px; - line-height: 2; - border-radius: 1.6875rem; - transition: all 0.5s ease; - margin-right: 0.25rem; - margin-bottom: 0.25rem; + line-height: 50px; + border-radius: 32px; background: $SecondaryColor; *{ color: #fff !important; diff --git a/templates/NourAlmasrieh/SocialWall/Includes/Cards.ss b/templates/NourAlmasrieh/SocialWall/Includes/Cards.ss index 644dc65..2c234ce 100644 --- a/templates/NourAlmasrieh/SocialWall/Includes/Cards.ss +++ b/templates/NourAlmasrieh/SocialWall/Includes/Cards.ss @@ -48,7 +48,7 @@ <div class="row"> <div class="col-12"> <p> - $Message.LimitWordCount(15, ' ...').RAW + $Message.LimitCharacters(150).RAW </p> </div> </div> diff --git a/templates/NourAlmasrieh/SocialWall/Includes/ElementStyleB.ss b/templates/NourAlmasrieh/SocialWall/Includes/ElementStyleB.ss index 836d7bc..61e717a 100644 --- a/templates/NourAlmasrieh/SocialWall/Includes/ElementStyleB.ss +++ b/templates/NourAlmasrieh/SocialWall/Includes/ElementStyleB.ss @@ -1,5 +1,5 @@ <div class="container typography cards_style"> - <div class="row mt-5 socialcards" <% if $ShowOnMasonry %> data-masonry='{"percentPosition": true }'<% end_if %>> + <div class="row mt-5 socialcards <% if $ShowOnMasonry %> masonry<% end_if %>" <% if $ShowOnMasonry %> data-masonry='{"percentPosition": true }'<% end_if %>> <% if $PostsStyle == 'mixed' %> <% if $ShowOnMasonry %> <% loop $getOnPosts.Sort('CreatedDate', 'DESC') %> @@ -64,14 +64,25 @@ </div> </div> <% if $ShowOnMasonry %> -<script> - var msnry = new Masonry( '.socialcards', { - // options... - }); - setInterval(function () { - var msnry = new Masonry( '.socialcards', { - // options... + <script> + var msnry = new Masonry( '.masonry', { + // options... }); - }, 1500) -</script> + setInterval(function () { + var msnry = new Masonry( '.masonry', { + // options... + }); + }, 1500) + </script> +<% else %> + <script> + window.addEventListener("load", function(){ + equalHeight('.equalHeight') + }) + window.addEventListener("resize", function(){ + setTimeout(function(){ + equalHeight('.equalHeight') + }) + }) + </script> <% end_if %> \ No newline at end of file diff --git a/templates/NourAlmasrieh/SocialWall/Includes/Slides.ss b/templates/NourAlmasrieh/SocialWall/Includes/Slides.ss index 0b5afc9..4b2e97c 100644 --- a/templates/NourAlmasrieh/SocialWall/Includes/Slides.ss +++ b/templates/NourAlmasrieh/SocialWall/Includes/Slides.ss @@ -48,7 +48,7 @@ <div class="row"> <div class="col-12"> <p> - $Message.LimitWordCount(15, ' ...').RAW + $Message.LimitCharacters(150).RAW </p> </div> </div> diff --git a/templates/NourAlmasrieh/SocialWall/Layout/SocialPage.ss b/templates/NourAlmasrieh/SocialWall/Layout/SocialPage.ss index 4cae5ac..3ffe25f 100644 --- a/templates/NourAlmasrieh/SocialWall/Layout/SocialPage.ss +++ b/templates/NourAlmasrieh/SocialWall/Layout/SocialPage.ss @@ -27,7 +27,7 @@ <% end_if %> </div> <div class="container typography"> - <div class="row mt-5 socialcards" data-masonry='{"percentPosition": true }'> + <div class="row mt-5 socialcards masonry" data-masonry='{"percentPosition": true }'> <% loop $getOnPosts.Sort('CreatedDate', 'DESC') %> <div class="col-md-6 col-lg-4 col-xl-3 socialcard mb-3 mb-md-4"> <% include NourAlmasrieh\SocialWall\Includes\Cards %> @@ -37,11 +37,11 @@ </div> </div> <script> - var msnry = new Masonry( '.socialcards', { + var msnry = new Masonry( '.masonry', { // options... }); setInterval(function () { - var msnry = new Masonry( '.socialcards', { + var msnry = new Masonry( '.masonry', { // options... }); }, 1500) diff --git a/templates/NourAlmasrieh/SocialWall/SocialsElement.ss b/templates/NourAlmasrieh/SocialWall/SocialsElement.ss index f5155f4..b81c623 100644 --- a/templates/NourAlmasrieh/SocialWall/SocialsElement.ss +++ b/templates/NourAlmasrieh/SocialWall/SocialsElement.ss @@ -8,6 +8,11 @@ <% if $ElementStyle == Slides %> <% include NourAlmasrieh\SocialWall\Includes\ElementStyleA %> <% else_if $ElementStyle == Cards %> - <% include NourAlmasrieh\SocialWall\Includes\ElementStyleB %> + <div class="d-none d-lg-block"> + <% include NourAlmasrieh\SocialWall\Includes\ElementStyleB %> + </div> + <div class="d-block d-lg-none"> + <% include NourAlmasrieh\SocialWall\Includes\ElementStyleA %> + </div> <% end_if %> </div> \ No newline at end of file