Skip to content
This repository has been archived by the owner on Jul 11, 2023. It is now read-only.

Commit

Permalink
Refactor intro animations into a separate SASS variable (mmistakes#1147)
Browse files Browse the repository at this point in the history
  • Loading branch information
@makaroniame
makaroniame committed Aug 2, 2017
1 parent aaa21ff commit 2b530fc
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 24 deletions.
4 changes: 2 additions & 2 deletions _sass/minimal-mistakes/_footer.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
/* sticky footer fix end */
margin-top: 3em;
color: mix(#fff, $gray, 25%);
-webkit-animation: intro 0.3s both;
animation: intro 0.3s both;
-webkit-animation: $intro-transition;
animation: $intro-transition;
-webkit-animation-delay: 0.45s;
animation-delay: 0.45s;
background-color: $lighter-gray;
Expand Down
4 changes: 2 additions & 2 deletions _sass/minimal-mistakes/_masthead.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
.masthead {
position: relative;
border-bottom: 1px solid $border-color;
-webkit-animation: intro 0.3s both;
animation: intro 0.3s both;
-webkit-animation: $intro-transition;
animation: $intro-transition;
-webkit-animation-delay: 0.15s;
animation-delay: 0.15s;
z-index: 20;
Expand Down
4 changes: 2 additions & 2 deletions _sass/minimal-mistakes/_navigation.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
padding-left: 2em;
padding-right: 2em;
font-family: $sans-serif;
-webkit-animation: intro 0.3s both;
animation: intro 0.3s both;
-webkit-animation: $intro-transition;
animation: $intro-transition;
-webkit-animation-delay: 0.30s;
animation-delay: 0.30s;

Expand Down
12 changes: 6 additions & 6 deletions _sass/minimal-mistakes/_page.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
margin-top: 2em;
padding-left: 1em;
padding-right: 1em;
-webkit-animation: intro 0.3s both;
animation: intro 0.3s both;
-webkit-animation: $intro-transition;
animation: $intro-transition;
-webkit-animation-delay: 0.35s;
animation-delay: 0.35s;

Expand Down Expand Up @@ -113,8 +113,8 @@
position: relative;
margin-bottom: 2em;
@include clearfix;
-webkit-animation: intro 0.3s both;
animation: intro 0.3s both;
-webkit-animation: $intro-transition;
animation: $intro-transition;
-webkit-animation-delay: 0.25s;
animation-delay: 0.25s;

Expand All @@ -126,8 +126,8 @@
background-size: cover;
background-repeat: no-repeat;
background-position: center;
-webkit-animation: intro 0.3s both;
animation: intro 0.3s both;
-webkit-animation: $intro-transition;
animation: $intro-transition;
-webkit-animation-delay: 0.25s;
animation-delay: 0.25s;

Expand Down
1 change: 1 addition & 0 deletions _sass/minimal-mistakes/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,3 +127,4 @@ $box-shadow : 0 1px 1px rgba(0, 0, 0, 0.125) !default;
$navicon-width : 1.5rem !default;
$navicon-height : 0.25rem !default;
$global-transition : all 0.2s ease-in-out !default;
$intro-transition : intro 0.3s both !default;
4 changes: 2 additions & 2 deletions docs/_sass/minimal-mistakes/_footer.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
/* sticky footer fix end */
margin-top: 3em;
color: mix(#fff, $gray, 25%);
-webkit-animation: intro 0.3s both;
animation: intro 0.3s both;
-webkit-animation: $intro-transition;
animation: $intro-transition;
-webkit-animation-delay: 0.45s;
animation-delay: 0.45s;
background-color: $lighter-gray;
Expand Down
4 changes: 2 additions & 2 deletions docs/_sass/minimal-mistakes/_masthead.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
.masthead {
position: relative;
border-bottom: 1px solid $border-color;
-webkit-animation: intro 0.3s both;
animation: intro 0.3s both;
-webkit-animation: $intro-transition;
animation: $intro-transition;
-webkit-animation-delay: 0.15s;
animation-delay: 0.15s;
z-index: 20;
Expand Down
4 changes: 2 additions & 2 deletions docs/_sass/minimal-mistakes/_navigation.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
padding-left: 2em;
padding-right: 2em;
font-family: $sans-serif;
-webkit-animation: intro 0.3s both;
animation: intro 0.3s both;
-webkit-animation: $intro-transition;
animation: $intro-transition;
-webkit-animation-delay: 0.30s;
animation-delay: 0.30s;

Expand Down
12 changes: 6 additions & 6 deletions docs/_sass/minimal-mistakes/_page.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
margin-top: 2em;
padding-left: 1em;
padding-right: 1em;
-webkit-animation: intro 0.3s both;
animation: intro 0.3s both;
-webkit-animation: $intro-transition;
animation: $intro-transition;
-webkit-animation-delay: 0.35s;
animation-delay: 0.35s;

Expand Down Expand Up @@ -113,8 +113,8 @@
position: relative;
margin-bottom: 2em;
@include clearfix;
-webkit-animation: intro 0.3s both;
animation: intro 0.3s both;
-webkit-animation: $intro-transition;
animation: $intro-transition;
-webkit-animation-delay: 0.25s;
animation-delay: 0.25s;

Expand All @@ -126,8 +126,8 @@
background-size: cover;
background-repeat: no-repeat;
background-position: center;
-webkit-animation: intro 0.3s both;
animation: intro 0.3s both;
-webkit-animation: $intro-transition;
animation: $intro-transition;
-webkit-animation-delay: 0.25s;
animation-delay: 0.25s;

Expand Down

0 comments on commit 2b530fc

Please sign in to comment.