Skip to content

Commit

Permalink
Updating jekyll and removing scss divide warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@jayair
jayair committed Oct 18, 2023
1 parent 92f56f1 commit 935b7b3
Show file tree
Hide file tree
Showing 12 changed files with 198 additions and 193 deletions.
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ruby RUBY_VERSION
#
# This will help ensure the proper Jekyll version is running.
# Happy Jekylling!
gem "jekyll", "4.1.1"
gem "jekyll", "4.3.2"

# This is the default theme for new Jekyll sites. You may change this to anything you like.
gem "minima", "~> 2.0"
Expand Down
57 changes: 31 additions & 26 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,40 +1,43 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.8.1)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
colorator (1.1.0)
concurrent-ruby (1.1.10)
concurrent-ruby (1.2.2)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
eventmachine (1.2.7)
ffi (1.15.5)
ffi (1.16.3)
forwardable-extended (2.6.0)
google-protobuf (3.24.4-arm64-darwin)
google-protobuf (3.24.4-x86_64-darwin)
http_parser.rb (0.8.0)
i18n (1.12.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
jekyll (4.1.1)
jekyll (4.3.2)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 1.0)
jekyll-sass-converter (~> 2.0)
jekyll-sass-converter (>= 2.0, < 4.0)
jekyll-watch (~> 2.0)
kramdown (~> 2.1)
kramdown (~> 2.3, >= 2.3.1)
kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0)
mercenary (~> 0.4.0)
mercenary (>= 0.3.6, < 0.5)
pathutil (~> 0.9)
rouge (~> 3.0)
rouge (>= 3.0, < 5.0)
safe_yaml (~> 1.0)
terminal-table (~> 1.8)
terminal-table (>= 1.8, < 4.0)
webrick (~> 1.7)
jekyll-feed (0.16.0)
jekyll (>= 3.7, < 5.0)
jekyll-redirect-from (0.16.0)
jekyll (>= 3.3, < 5.0)
jekyll-sass-converter (2.2.0)
sassc (> 2.0.1, < 3.0)
jekyll-sass-converter (3.0.0)
sass-embedded (~> 1.54)
jekyll-seo-tag (2.8.0)
jekyll (>= 3.8, < 5.0)
jekyll-sitemap (1.4.0)
Expand All @@ -45,8 +48,8 @@ GEM
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
listen (3.7.1)
liquid (4.0.4)
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
Expand All @@ -56,33 +59,35 @@ GEM
jekyll-seo-tag (~> 2.1)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (5.0.0)
rb-fsevent (0.11.1)
public_suffix (5.0.3)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.5)
rouge (3.30.0)
rexml (3.2.6)
rouge (4.1.3)
safe_yaml (1.0.5)
sassc (2.4.0)
ffi (~> 1.9)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
unicode-display_width (1.8.0)
sass-embedded (1.69.4-arm64-darwin)
google-protobuf (~> 3.23)
sass-embedded (1.69.4-x86_64-darwin)
google-protobuf (~> 3.23)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
unicode-display_width (2.5.0)
webrick (1.7.0)

PLATFORMS
arm64-darwin-21
x86_64-darwin-22

DEPENDENCIES
jekyll (= 4.1.1)
jekyll (= 4.3.2)
jekyll-redirect-from
jekyll-sitemap
minima (~> 2.0)
webrick (~> 1.7)

RUBY VERSION
ruby 2.6.10p210
ruby 3.0.4p208

BUNDLED WITH
2.4.5
2.3.20
34 changes: 17 additions & 17 deletions _sass/about.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
.home > .about-page {

@include media-query($on-palm) {
padding: 0 $spacing-unit / 2;
padding: 0 calc($spacing-unit / 2);
}

.header {
Expand Down Expand Up @@ -100,7 +100,7 @@
}

.products {
margin: 0 -1 * $spacing-unit / 2;
margin: 0 calc(-1 * $spacing-unit / 2);

display: flex;
align-items: stretch;
Expand All @@ -109,24 +109,24 @@
@include media-query($on-palm) {
margin-top: $spacing-unit - 5px;
display: block;
padding: 0 $spacing-unit / 2;
padding: 0 calc($spacing-unit / 2);
}

.product {
flex: 1 1 auto;
margin: 0 $spacing-unit / 2;
margin: 0 calc($spacing-unit / 2);
border-radius: 16px;
padding: $spacing-unit 2 * $spacing-unit - 10px 2 * $spacing-unit - 5px;
border: 1px dashed $important-color;
box-sizing: border-box;

@include media-query($on-monitor) {
padding: $spacing-unit / 2;
padding: calc($spacing-unit / 2);
}

@include media-query($on-palm) {
margin-bottom: $spacing-unit / 2;
padding: $spacing-unit / 2;
margin-bottom: calc($spacing-unit / 2);
padding: calc($spacing-unit / 2);

&:last-child {
margin-bottom: 0;
Expand All @@ -144,10 +144,10 @@
style: dashed;
color: $important-color;
}
margin: $spacing-unit / 2 + 4px 0 $spacing-unit / 2;
margin: calc($spacing-unit / 2 + 4px) 0 calc($spacing-unit / 2);

@include media-query($on-palm) {
margin: $spacing-unit / 2 0 $spacing-unit / 2 - 3px;
margin: calc($spacing-unit / 2) 0 calc($spacing-unit / 2 - 3px);
}
}

Expand Down Expand Up @@ -186,7 +186,7 @@

@include media-query($on-palm) {
margin-top: 2.5 * $spacing-unit;
padding: 2 * $spacing-unit + 10px $spacing-unit / 2 3 * $spacing-unit;
padding: 2 * $spacing-unit + 10px calc($spacing-unit / 2) 3 * $spacing-unit;
border: none;
box-shadow: 6px 9px 25px rgba(57, 92, 107, 0.3),
0px 4px 12px rgba(57, 92, 107, 0.4);
Expand Down Expand Up @@ -266,7 +266,7 @@
}

h5 {
margin-top: $spacing-unit / 2;
margin-top: calc($spacing-unit / 2);
margin-bottom: 2px;
font-family: $base-font-family;
font-size: 20px;
Expand All @@ -288,7 +288,7 @@
}
}
.links {
margin-top: $spacing-unit / 2 - 5px;
margin-top: calc($spacing-unit / 2 - 5px);

@include media-query($on-palm) {
margin-top: $spacing-unit - 10px;
Expand All @@ -300,7 +300,7 @@
margin-right: $spacing-unit - 10px;

@include media-query($on-palm) {
margin-right: $spacing-unit / 2;
margin-right: calc($spacing-unit / 2);
}
}
}
Expand Down Expand Up @@ -401,14 +401,14 @@
padding: $spacing-unit;
}
@include media-query($on-monitor) {
padding: $spacing-unit / 2;
padding: calc($spacing-unit / 2);
}
}
a:nth-child(3) {
padding-left: 2 * $spacing-unit;

@include media-query($on-monitor) { padding: $spacing-unit; }
@include media-query($on-monitor) { padding: $spacing-unit / 2; }
@include media-query($on-monitor) { padding: calc($spacing-unit / 2); }
}
}

Expand All @@ -421,7 +421,7 @@
0px 4px 12px rgba(57, 92, 107, 0.4);

@include media-query($on-palm) {
padding: 0 $spacing-unit / 2 $spacing-unit;
padding: 0 calc($spacing-unit / 2) $spacing-unit;
}
}

Expand All @@ -438,7 +438,7 @@
flex: 0 0 300px - 1.5 * $spacing-unit;
margin: 0 $spacing-unit - 8px;
padding-top: $spacing-unit;
padding-bottom: $spacing-unit / 2;
padding-bottom: calc($spacing-unit / 2);
text-align: left;
border-bottom: 1px dashed $important-color;

Expand Down
8 changes: 4 additions & 4 deletions _sass/blog.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@
position: absolute;
bottom: 0;
left: 50%;
margin-left: - $size / 2;
margin-bottom: - $size / 2;
margin-left: - $size * 0.5;
margin-bottom: - $size * 0.5;
border-radius: 100%;
//filter: grayscale(100%);
}
Expand All @@ -85,7 +85,7 @@ $img-margin: 15px;
//filter: grayscale(100%);
}
li .post-info {
margin-top: $spacing-unit / 2;
margin-top: $spacing-unit * 0.5;
font-size: 15px;
}
li .post-info .category {
Expand All @@ -105,7 +105,7 @@ $img-margin: 15px;
}

.blog .post-content .twitter-share {
margin-top: $spacing-unit / 2 + 5px;
margin-top: $spacing-unit * 0.5 + 5px;
line-height: 2;
span {
margin-right: 4px;
Expand Down
6 changes: 3 additions & 3 deletions _sass/careers.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
main > .careers-page {

@include media-query($on-palm) {
padding: 0 $spacing-unit / 2;
padding: 0 $spacing-unit * 0.5;
}

.header {

h1 {
margin: 0 auto $spacing-unit / 2;
margin: 0 auto $spacing-unit * 0.5;
max-width: 570px;
padding-top: $spacing-unit;
font-size: 40px;
Expand All @@ -35,7 +35,7 @@ main > .careers-page {

@include media-query($on-palm) {
h1 {
padding-top: $spacing-unit / 2;
padding-top: $spacing-unit * 0.5;
font-size: 34px;
}
}
Expand Down
20 changes: 10 additions & 10 deletions _sass/download.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
////////////////
main > .download-ebook-page {
margin: 0 auto;
padding: 0 $spacing-unit $spacing-unit / 2;
padding: 0 $spacing-unit $spacing-unit * 0.5;
max-width: calc(#{$post-content-width} - (#{$spacing-unit} * 2));

& > .title {
Expand Down Expand Up @@ -37,7 +37,7 @@ main > .download-ebook-page {
position: relative;

@include media-query($on-palm) {
margin: $spacing-unit / 2 auto;
margin: $spacing-unit * 0.5 auto;
}

.scroll-content {
Expand Down Expand Up @@ -116,13 +116,13 @@ main > .download-ebook-page {

.features {
flex: 1 1 50%;
padding: $spacing-unit / 2 + 5px;
padding: $spacing-unit * 0.5 + 5px;
border-radius: 8px;
background-color: white;
border: 1px solid $important-color;

& > p {
margin-bottom: $spacing-unit / 2;
margin-bottom: $spacing-unit * 0.5;
color: $secondary-text-color;
}

Expand Down Expand Up @@ -184,7 +184,7 @@ main > .download-ebook-page {
&:nth-child(2) {
position: absolute;
left: 50%;
margin-left: -1 * $width / 2;
margin-left: -1 * $width * 0.5;
}

@include media-query($on-laptop) {
Expand Down Expand Up @@ -221,15 +221,15 @@ main > .download-ebook-page {
background-color: $brand-color;
color: white;
border-radius: 8px;
padding: $spacing-unit / 2 $spacing-unit / 2 + 5px $spacing-unit / 2 + 5px;
padding: $spacing-unit * 0.5 $spacing-unit * 0.5 + 5px $spacing-unit * 0.5 + 5px;

h3 {
margin-bottom: 0;
font-size: 20px;
font-family: $base-font-family;
}
p.copy {
margin-bottom: $spacing-unit / 2 + 5px;
margin-bottom: $spacing-unit * 0.5 + 5px;
color: #C3CED2;
font-size: 14px;
line-height: 1.375;
Expand All @@ -246,7 +246,7 @@ main > .download-ebook-page {
}
.main-form {
flex-grow: 1;
gap: $spacing-unit / 2;
gap: $spacing-unit * 0.5;
}
input[type="email"] {
padding: 10px;
Expand Down Expand Up @@ -289,10 +289,10 @@ main > .download-ebook-page {

.email-octopus-form-row-subscribe {
margin-top: 0;
margin-left: $spacing-unit / 2 + 5px;
margin-left: $spacing-unit * 0.5 + 5px;

@include media-query($on-palm) {
margin-top: $spacing-unit / 2;
margin-top: $spacing-unit * 0.5;
margin-left: 0;
}
}
Expand Down
Loading

0 comments on commit 935b7b3

Please sign in to comment.