Skip to content

Commit

Permalink
Merge branch 'al-folio-main'
Browse files Browse the repository at this point in the history
  • Loading branch information
george-gca committed Jul 17, 2024
2 parents 2a50a96 + 75ab282 commit 753abd1
Show file tree
Hide file tree
Showing 25 changed files with 792 additions and 1,443 deletions.
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ assets/plotly/demo.html
lighthouse_results/**
_posts/en-us/2015-10-20-math.md
_posts/pt-br/2015-10-20-math.md
_sass/font-awesome/*.scss
39 changes: 25 additions & 14 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,24 @@ GEM
feedjira (3.2.3)
loofah (>= 2.3.1, < 3)
sax-machine (>= 1.0, < 2)
ffi (1.17.0)
ffi (1.17.0-aarch64-linux-gnu)
ffi (1.17.0-arm64-darwin)
ffi (1.17.0-x86_64-darwin)
ffi (1.17.0-x86_64-linux-gnu)
forwardable-extended (2.6.0)
gemoji (4.1.0)
google-protobuf (3.25.3-aarch64-linux)
google-protobuf (3.25.3-arm64-darwin)
google-protobuf (3.25.3-x86_64-darwin)
google-protobuf (3.25.3-x86_64-linux)
google-protobuf (4.27.2-aarch64-linux)
bigdecimal
rake (>= 13)
google-protobuf (4.27.2-arm64-darwin)
bigdecimal
rake (>= 13)
google-protobuf (4.27.2-x86_64-darwin)
bigdecimal
rake (>= 13)
google-protobuf (4.27.2-x86_64-linux)
bigdecimal
rake (>= 13)
html-pipeline (2.14.3)
activesupport (>= 2)
nokogiri (>= 1.4)
Expand Down Expand Up @@ -156,7 +165,8 @@ GEM
mini_racer (0.12.0)
libv8-node (~> 21.7.2.0)
minitest (5.24.1)
multi_xml (0.6.0)
multi_xml (0.7.1)
bigdecimal (~> 3.1)
mutex_m (0.2.0)
namae (1.2.0)
racc (~> 1.7)
Expand All @@ -176,17 +186,18 @@ GEM
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
rexml (3.3.1)
rexml (3.3.2)
strscan
rouge (4.3.0)
safe_yaml (1.0.5)
sass-embedded (1.69.5)
google-protobuf (~> 3.23)
rake (>= 13.0.0)
sass-embedded (1.69.5-arm64-darwin)
google-protobuf (~> 3.23)
sass-embedded (1.69.5-x86_64-darwin)
google-protobuf (~> 3.23)
sass-embedded (1.77.8-aarch64-linux-gnu)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-arm64-darwin)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-x86_64-darwin)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-x86_64-linux-gnu)
google-protobuf (~> 4.26)
sax-machine (1.3.2)
strscan (3.1.0)
terminal-table (3.0.2)
Expand Down
105 changes: 26 additions & 79 deletions _sass/font-awesome/_animated.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
animation-direction: var(--#{$fa-css-prefix}-animation-direction, normal);
animation-duration: var(--#{$fa-css-prefix}-animation-duration, 1s);
animation-iteration-count: var(--#{$fa-css-prefix}-animation-iteration-count, infinite);
animation-timing-function: var(--#{$fa-css-prefix}-animation-timing, cubic-bezier(0.28, 0.84, 0.42, 1));
animation-timing-function: var(--#{$fa-css-prefix}-animation-timing, cubic-bezier(0.280, 0.840, 0.420, 1));
}

.#{$fa-css-prefix}-fade {
Expand All @@ -25,7 +25,7 @@
animation-direction: var(--#{$fa-css-prefix}-animation-direction, normal);
animation-duration: var(--#{$fa-css-prefix}-animation-duration, 1s);
animation-iteration-count: var(--#{$fa-css-prefix}-animation-iteration-count, infinite);
animation-timing-function: var(--#{$fa-css-prefix}-animation-timing, cubic-bezier(0.4, 0, 0.6, 1));
animation-timing-function: var(--#{$fa-css-prefix}-animation-timing, cubic-bezier(.4,0,.6,1));
}

.#{$fa-css-prefix}-beat-fade {
Expand All @@ -34,7 +34,7 @@
animation-direction: var(--#{$fa-css-prefix}-animation-direction, normal);
animation-duration: var(--#{$fa-css-prefix}-animation-duration, 1s);
animation-iteration-count: var(--#{$fa-css-prefix}-animation-iteration-count, infinite);
animation-timing-function: var(--#{$fa-css-prefix}-animation-timing, cubic-bezier(0.4, 0, 0.6, 1));
animation-timing-function: var(--#{$fa-css-prefix}-animation-timing, cubic-bezier(.4,0,.6,1));
}

.#{$fa-css-prefix}-flip {
Expand Down Expand Up @@ -99,49 +99,26 @@
}

@keyframes #{$fa-css-prefix}-beat {
0%,
90% {
transform: scale(1);
}
45% {
transform: scale(var(--#{$fa-css-prefix}-beat-scale, 1.25));
}
0%, 90% { transform: scale(1); }
45% { transform: scale(var(--#{$fa-css-prefix}-beat-scale, 1.25)); }
}

@keyframes #{$fa-css-prefix}-bounce {
0% {
transform: scale(1, 1) translateY(0);
}
10% {
transform: scale(var(--#{$fa-css-prefix}-bounce-start-scale-x, 1.1), var(--#{$fa-css-prefix}-bounce-start-scale-y, 0.9)) translateY(0);
}
30% {
transform: scale(var(--#{$fa-css-prefix}-bounce-jump-scale-x, 0.9), var(--#{$fa-css-prefix}-bounce-jump-scale-y, 1.1))
translateY(var(--#{$fa-css-prefix}-bounce-height, -0.5em));
}
50% {
transform: scale(var(--#{$fa-css-prefix}-bounce-land-scale-x, 1.05), var(--#{$fa-css-prefix}-bounce-land-scale-y, 0.95)) translateY(0);
}
57% {
transform: scale(1, 1) translateY(var(--#{$fa-css-prefix}-bounce-rebound, -0.125em));
}
64% {
transform: scale(1, 1) translateY(0);
}
100% {
transform: scale(1, 1) translateY(0);
}
0% { transform: scale(1,1) translateY(0); }
10% { transform: scale(var(--#{$fa-css-prefix}-bounce-start-scale-x, 1.1),var(--#{$fa-css-prefix}-bounce-start-scale-y, 0.9)) translateY(0); }
30% { transform: scale(var(--#{$fa-css-prefix}-bounce-jump-scale-x, 0.9),var(--#{$fa-css-prefix}-bounce-jump-scale-y, 1.1)) translateY(var(--#{$fa-css-prefix}-bounce-height, -0.5em)); }
50% { transform: scale(var(--#{$fa-css-prefix}-bounce-land-scale-x, 1.05),var(--#{$fa-css-prefix}-bounce-land-scale-y, 0.95)) translateY(0); }
57% { transform: scale(1,1) translateY(var(--#{$fa-css-prefix}-bounce-rebound, -0.125em)); }
64% { transform: scale(1,1) translateY(0); }
100% { transform: scale(1,1) translateY(0); }
}

@keyframes #{$fa-css-prefix}-fade {
50% {
opacity: var(--#{$fa-css-prefix}-fade-opacity, 0.4);
}
50% { opacity: var(--#{$fa-css-prefix}-fade-opacity, 0.4); }
}

@keyframes #{$fa-css-prefix}-beat-fade {
0%,
100% {
0%, 100% {
opacity: var(--#{$fa-css-prefix}-beat-fade-opacity, 0.4);
transform: scale(1);
}
Expand All @@ -153,53 +130,23 @@

@keyframes #{$fa-css-prefix}-flip {
50% {
transform: rotate3d(
var(--#{$fa-css-prefix}-flip-x, 0),
var(--#{$fa-css-prefix}-flip-y, 1),
var(--#{$fa-css-prefix}-flip-z, 0),
var(--#{$fa-css-prefix}-flip-angle, -180deg)
);
transform: rotate3d(var(--#{$fa-css-prefix}-flip-x, 0), var(--#{$fa-css-prefix}-flip-y, 1), var(--#{$fa-css-prefix}-flip-z, 0), var(--#{$fa-css-prefix}-flip-angle, -180deg));
}
}

@keyframes #{$fa-css-prefix}-shake {
0% {
transform: rotate(-15deg);
}
4% {
transform: rotate(15deg);
}
8%,
24% {
transform: rotate(-18deg);
}
12%,
28% {
transform: rotate(18deg);
}
16% {
transform: rotate(-22deg);
}
20% {
transform: rotate(22deg);
}
32% {
transform: rotate(-12deg);
}
36% {
transform: rotate(12deg);
}
40%,
100% {
transform: rotate(0deg);
}
0% { transform: rotate(-15deg); }
4% { transform: rotate(15deg); }
8%, 24% { transform: rotate(-18deg); }
12%, 28% { transform: rotate(18deg); }
16% { transform: rotate(-22deg); }
20% { transform: rotate(22deg); }
32% { transform: rotate(-12deg); }
36% { transform: rotate(12deg); }
40%, 100% { transform: rotate(0deg); }
}

@keyframes #{$fa-css-prefix}-spin {
0% {
transform: rotate(0deg);
}
100% {
transform: rotate(360deg);
}
0% { transform: rotate(0deg); }
100% { transform: rotate(360deg); }
}
4 changes: 2 additions & 2 deletions _sass/font-awesome/_bordered-pulled.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@

.#{$fa-css-prefix}-pull-left {
float: left;
margin-right: var(--#{$fa-css-prefix}-pull-margin, #{$fa-pull-margin});
margin-right: var(--#{$fa-css-prefix}-pull-margin, #{$fa-pull-margin});
}

.#{$fa-css-prefix}-pull-right {
float: right;
margin-left: var(--#{$fa-css-prefix}-pull-margin, #{$fa-pull-margin});
margin-left: var(--#{$fa-css-prefix}-pull-margin, #{$fa-pull-margin});
}
19 changes: 10 additions & 9 deletions _sass/font-awesome/_core.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
// -------------------------

.#{$fa-css-prefix} {
font-family: var(--#{$fa-css-prefix}-style-family, "#{$fa-style-family}");
font-family: var(--#{$fa-css-prefix}-style-family, '#{$fa-style-family}');
font-weight: var(--#{$fa-css-prefix}-style, #{$fa-style});
}

.#{$fa-css-prefix},
.#{$fa-css-prefix}-classic,
.#{$fa-css-prefix}-sharp,
.fas,
.#{$fa-css-prefix}-solid,
.far,
.#{$fa-css-prefix}-regular,
.#{$fa-css-prefix}-brands,
.fas,
.far,
.fab,
.#{$fa-css-prefix}-brands {
.#{$fa-css-prefix}-sharp-solid,
.#{$fa-css-prefix}-classic,
.#{$fa-css-prefix} {
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
display: var(--#{$fa-css-prefix}-display, #{$fa-display});
Expand All @@ -29,14 +29,15 @@
.#{$fa-css-prefix}-solid,
.far,
.#{$fa-css-prefix}-regular {
font-family: "Font Awesome 6 Free";
font-family: 'Font Awesome 6 Free';
}

.fab,
.#{$fa-css-prefix}-brands {
font-family: "Font Awesome 6 Brands";
font-family: 'Font Awesome 6 Brands';
}


%fa-icon {
@include fa-icon;
}
4 changes: 2 additions & 2 deletions _sass/font-awesome/_functions.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

// fa-content: convenience function used to set content property
@function fa-content($fa-var) {
@return unquote('"#{ $fa-var }"');
@return unquote("\"#{ $fa-var }\"");
}

// fa-divide: Originally obtained from the Bootstrap https://github.com/twbs/bootstrap
Expand Down Expand Up @@ -51,7 +51,7 @@
$remainder: $remainder - $divisor;
}
@if $remainder > 0 and $precision > 0 {
$remainder: fa-divide($remainder * 10, $divisor, $precision - 1) * 0.1;
$remainder: fa-divide($remainder * 10, $divisor, $precision - 1) * .1;
}
@return ($quotient + $remainder) * $sign;
}
5 changes: 2 additions & 3 deletions _sass/font-awesome/_icons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
readers do not read off random characters that represent icons */

@each $name, $icon in $fa-icons {
.#{$fa-css-prefix}-#{$name}::before {
content: unquote('"#{ $icon }"');
}
.#{$fa-css-prefix}-#{$name}::before { content: unquote("\"#{ $icon }\""); }
}

6 changes: 2 additions & 4 deletions _sass/font-awesome/_list.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,11 @@
margin-left: var(--#{$fa-css-prefix}-li-margin, #{$fa-li-margin});
padding-left: 0;

> li {
position: relative;
}
> li { position: relative; }
}

.#{$fa-css-prefix}-li {
left: calc(var(--#{$fa-css-prefix}-li-width, #{$fa-li-width}) * -1);
left: calc(-1 * var(--#{$fa-css-prefix}-li-width, #{$fa-li-width}));
position: absolute;
text-align: center;
width: var(--#{$fa-css-prefix}-li-width, #{$fa-li-width});
Expand Down
8 changes: 4 additions & 4 deletions _sass/font-awesome/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
}

// sets relative font-sizing and alignment (in _sizing)
@mixin fa-size($font-size) {
@mixin fa-size ($font-size) {
font-size: fa-divide($font-size, $fa-size-scale-base) * 1em; // converts step in sizing scale into an em-based value that's relative to the scale's base
line-height: fa-divide(1, $font-size) * 1em; // sets the line-height of the icon back to that of it's parent
vertical-align: (fa-divide(6, $font-size) - fa-divide(3, 8)) * 1em; // vertically centers the icon taking into account the surrounding text's descender
Expand Down Expand Up @@ -51,22 +51,22 @@
@extend .fa-solid;

&::before {
content: unquote('"#{ $fa-var }"');
content: unquote("\"#{ $fa-var }\"");
}
}
@mixin fa-icon-regular($fa-var) {
@extend %fa-icon;
@extend .fa-regular;

&::before {
content: unquote('"#{ $fa-var }"');
content: unquote("\"#{ $fa-var }\"");
}
}
@mixin fa-icon-brands($fa-var) {
@extend %fa-icon;
@extend .fa-brands;

&::before {
content: unquote('"#{ $fa-var }"');
content: unquote("\"#{ $fa-var }\"");
}
}
Loading

0 comments on commit 753abd1

Please sign in to comment.