Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/JetImpex/wapu into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
MjHead committed Jun 7, 2017
2 parents 0d43aca + 80175b7 commit 07a73db
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 9 deletions.
46 changes: 46 additions & 0 deletions assets/sass/shortcodes/_shortcodes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,52 @@
margin-bottom: 32px;
}
}
&-image {
margin: 1em 0;
@include media-breakpoint-up(xl) {
margin: 2em 0;
}
.blurb__link {
padding: 15px 15px 30px;
border: 1px solid $color__separator;
border-radius: $border__radius;
display: flex;
flex-direction: column;
flex-wrap: wrap;
justify-content: center;
align-content: stretch;
align-items: center;
color: $color__text-main;
@include transition(all 0.45s ease);
@include media-breakpoint-up(xl) {
padding: 13px 15px;
flex-wrap: wrap;
flex-direction: row;
justify-content: flex-start;
}
&:hover {
border-color: transparent;
-webkit-box-shadow: 0 10px 59px 0 rgba(80,106,172,0.15);
box-shadow: 0 10px 59px 0 rgba(80,106,172,0.15);
@include transition(all 0.32s ease);
i {
@include transition(all 0.3s ease);
&:before {
-webkit-text-fill-color: transparent;
color: white;
background-image: -webkit-linear-gradient(-45deg, white 0%,white 40%,white 57%);
@include transition(all 0.3s ease);
}
&:after {
opacity: 0.1;
transform: scale(0.82);
transition: all 270ms cubic-bezier(0.570, 0.035, 0.000, 0.955);
}
}

}
}
}
&-boxed-description {
margin: 2em 0;
text-align: center;
Expand Down
13 changes: 5 additions & 8 deletions assets/sass/site/primary/_posts-and-pages.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,11 @@
.single .entry-content {
p, ul, ol {
img {
-webkit-box-shadow: 0 0 25px 1px #d1d1e2;
box-shadow: 0 0 25px 1px #d1d1e2;
}
}
ul, ol {
img {
margin-top: 1.4em;
margin-bottom: 2.2em;
border-radius: 5px;
-webkit-box-shadow: 0 10px 59px 0 rgba(80,106,172,0.15);
box-shadow: 0 10px 59px 0 rgba(80,106,172,0.15);
margin-top: 1.75em;
margin-bottom: 2.75em;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion style.css

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions wapu-core/shortcodes/blurb/blurb-image.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?php
/**
* Image banner template
*/
?>
<div class="blurb <?php echo $class; ?>" <?php echo $id; ?>>
<?php $this->html( $link, '<a href="%1$s" class="blurb__link">' ) ?>
<?php echo $img_tag; ?>
</a>
</div>

0 comments on commit 07a73db

Please sign in to comment.