Skip to content

Commit

Permalink
Merge branch 'newtrash'
Browse files Browse the repository at this point in the history
  • Loading branch information
ericconrad committed May 1, 2019
2 parents d319d4a + d3fc7c0 commit a462448
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
2 changes: 1 addition & 1 deletion partials/defaults.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
html {
font-family: $gentona;
font-size: 100%;
font-weight: 300;
font-weight: 400;
font-style: normal;
}

Expand Down
6 changes: 3 additions & 3 deletions partials/search.scss
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@
color: $white !important;
text-align: center;
text-transform: uppercase;
@include transition(background-color);
@include transition-duration($run);
@include transition-timing-function(ease-in-out);
@include transition(background-color, border-color, color);
@include transition-duration($run, $run, $run);
@include transition-timing-function(ease-in-out, ease-in-out, ease-in-out);

.fa {
margin-right: ($standard_spacing / 12);
Expand Down
10 changes: 10 additions & 0 deletions utils/css3.scss
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,16 @@
box-shadow: $string;
}

// Fixes missing shadow on the ends of wrapped text
@mixin box-decoration-break($string...) {
-webkit-box-decoration-break: $string;
-moz-box-decoration-break: $string;
-ms-box-decoration-break: $string;
-o-box-decoration-break: $string;
box-decoration-break: $string;

}

/**
* Text Shadows
*
Expand Down

0 comments on commit a462448

Please sign in to comment.