Skip to content

Commit 23b0c21

Browse files
FlynnD273FlynnD273
committed
Finally finish all the SCSS migration 😭
1 parent 14b4ab8 commit 23b0c21

35 files changed

+1108
-1129
lines changed

‎Gemfile‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,30 @@
1515
source 'https://rubygems.org'
1616
ruby '3.3.7'
1717

18-
gem 'slugize', '>= 0.0.3'
19-
gem 'jekyll', '>= 3.0.3'
18+
gem 'slugize'
19+
gem 'jekyll'
2020
gem 'jekyll-paginate'
21-
gem 'bundler', '>= 1.7.9'
22-
gem 'rack', '< 1.6.0'
23-
gem 'rack-contrib', '>= 1.2.0'
24-
gem 'nokogiri', '>= 1.6.3.1'
25-
gem 'algoliasearch', '>= 1.6.1'
26-
gem 'htmlentities', '>= 4.3.2'
27-
gem 'rubyzip', '>=1.1.6'
28-
gem 'dotenv', '>= 0.11.1'
29-
gem 'newrelic_rpm', '>= 3.9.8.273'
30-
gem 'rack-wwwhisper', '>= 1.0'
31-
gem 'uglifier', '>= 2.7.0'
32-
gem 'googlestaticmap', '>= 1.2.2'
33-
gem 'rack-rewrite', '>= 1.5.0'
34-
gem 'rack-ssl-enforcer', '>= 0.2.9'
35-
gem 'rack-xframe-options', '>= 0.1.2'
21+
gem 'bundler'
22+
gem 'rack'
23+
gem 'rack-contrib'
24+
gem 'nokogiri'
25+
gem 'algoliasearch'
26+
gem 'htmlentities'
27+
gem 'rubyzip'
28+
gem 'dotenv'
29+
gem 'newrelic_rpm'
30+
gem 'rack-wwwhisper'
31+
gem 'uglifier'
32+
gem 'googlestaticmap'
33+
gem 'rack-rewrite'
34+
gem 'rack-ssl-enforcer'
35+
gem 'rack-xframe-options'
3636
gem 'rack-host-redirect'
3737
gem 'pygments.rb'
3838
gem 'redcarpet'
3939

4040
group :development, :test do
41-
gem 'rspec', '>= 3.1.0'
42-
gem 'simplecov', '>= 0.9.1'
43-
gem 'rubocop', '>= 0.28.0'
41+
gem 'rspec'
42+
gem 'simplecov'
43+
gem 'rubocop'
4444
end

‎Gemfile.lock‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ GEM
117117
public_suffix (6.0.1)
118118
pygments.rb (3.0.0)
119119
racc (1.8.1)
120-
rack (1.5.5)
120+
rack (3.1.10)
121121
rack-contrib (2.5.0)
122122
rack (< 4)
123123
rack-host-redirect (1.3.0)
@@ -212,33 +212,33 @@ PLATFORMS
212212
x86_64-linux-musl
213213

214214
DEPENDENCIES
215-
algoliasearch (>= 1.6.1)
216-
bundler (>= 1.7.9)
217-
dotenv (>= 0.11.1)
218-
googlestaticmap (>= 1.2.2)
219-
htmlentities (>= 4.3.2)
220-
jekyll (>= 3.0.3)
215+
algoliasearch
216+
bundler
217+
dotenv
218+
googlestaticmap
219+
htmlentities
220+
jekyll
221221
jekyll-paginate
222-
newrelic_rpm (>= 3.9.8.273)
223-
nokogiri (>= 1.6.3.1)
222+
newrelic_rpm
223+
nokogiri
224224
pygments.rb
225-
rack (< 1.6.0)
226-
rack-contrib (>= 1.2.0)
225+
rack
226+
rack-contrib
227227
rack-host-redirect
228-
rack-rewrite (>= 1.5.0)
229-
rack-ssl-enforcer (>= 0.2.9)
230-
rack-wwwhisper (>= 1.0)
231-
rack-xframe-options (>= 0.1.2)
228+
rack-rewrite
229+
rack-ssl-enforcer
230+
rack-wwwhisper
231+
rack-xframe-options
232232
redcarpet
233-
rspec (>= 3.1.0)
234-
rubocop (>= 0.28.0)
235-
rubyzip (>= 1.1.6)
236-
simplecov (>= 0.9.1)
237-
slugize (>= 0.0.3)
238-
uglifier (>= 2.7.0)
233+
rspec
234+
rubocop
235+
rubyzip
236+
simplecov
237+
slugize
238+
uglifier
239239

240240
RUBY VERSION
241241
ruby 3.3.7p123
242242

243243
BUNDLED WITH
244-
2.6.0
244+
2.6.5

‎source/_layouts/sidebar_narrow.html‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# you may not use this file except in compliance with the License.
66
# You may obtain a copy of the License at
77
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
8+
# http://www.apache.org/licenses/LICENSE-2.0
99
#
1010
# Unless required by applicable law or agreed to in writing, software
1111
# distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,7 +16,8 @@
1616

1717
layout: master
1818
---
19-
<div class="sidebar__wrapper{% unless (page.sidebar_only or layout.sidebar_only) %} sidebar__wrapper--sectionmenu{% endunless %}">
19+
<div
20+
class="sidebar__wrapper{% unless page.sidebar_only or layout.sidebar_only %} sidebar__wrapper--sectionmenu{% endunless %}">
2021
<div class="sidebar sidebar--narrow">
2122
<a href="/" class="sidebar__header">
2223
<span>pebble</span>
@@ -31,4 +32,4 @@
3132
</div>
3233
<a href="{{ site.links.devportal }}" target="_blank" class="sidebar__footer">Publish</a>
3334
</div>
34-
{{ content }}
35+
{{ content }}

‎source/_layouts/utils/redirect_permanent.html‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,31 @@
11
{% comment %}
2-
Copyright 2025 Google LLC
2+
Copyright 2025 Google LLC
33

4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
77

8-
http://www.apache.org/licenses/LICENSE-2.0
8+
http://www.apache.org/licenses/LICENSE-2.0
99

10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
1515
{% endcomment %}
1616

1717
{% comment %}
1818
This layout file is used for generating permanent redirects from old URLs to
1919
new ones.
2020
{% endcomment %}
2121

22-
{% capture redirect_url %}{{ page.redirect_to | prepend: site.baseurl | prepend: site.url }}{% endcapture %}
22+
{% assign redirect_url = page.redirect_to | prepend: site.baseurl | prepend: site.url %}
23+
{% assign http = page.redirect_to | downcase | slice: 0, 7 %}
24+
{% assign https = page.redirect_to | downcase | slice: 0, 8 %}
2325

24-
{% if page.redirect_to | downcase | slice: 0, 6 == "http://" or page.redirect_to | downcase | slice: 0, 7 == "https://" %}
25-
{% capture redirect_url %}{{ page.redirect_to }}{% endcapture %}
26+
{% if http == "http://" or https == "https://" %}
27+
{% assign redirect_url = page.redirect_to %}
2628
{% endif %}
2729

2830
<meta http-equiv="refresh" content="0; url={{ redirect_url }}">
29-
<link rel="canonical" href="{{ redirect_url }}" />
31+
<link rel="canonical" href="{{ redirect_url }}" />

‎source/_sass/base/_forms.scss‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
fieldset {
1818
background: lighten($base-border-color, 10);
1919
border: 1px solid $base-border-color;
20-
margin: 0 0 ($base-line-height / 2) 0;
20+
margin: 0 0 (calc($base-line-height / 2)) 0;
2121
padding: $base-line-height;
2222
}
2323

@@ -31,7 +31,7 @@ select {
3131

3232
label {
3333
font-weight: bold;
34-
margin-bottom: $base-line-height / 4;
34+
margin-bottom: calc($base-line-height / 4);
3535

3636
&.required:after {
3737
content: "*";
@@ -53,7 +53,7 @@ select[multiple=multiple] {
5353
box-shadow: $form-box-shadow;
5454
font-family: $form-font-family;
5555
font-size: $form-font-size;
56-
margin-bottom: $base-line-height / 2;
56+
margin-bottom: calc($base-line-height / 2);
5757
padding: ($base-line-height / 3) ($base-line-height / 3);
5858
width: 100%;
5959

@@ -76,14 +76,15 @@ input[type="search"] {
7676
@include appearance(none);
7777
}
7878

79-
input[type="checkbox"], input[type="radio"] {
79+
input[type="checkbox"],
80+
input[type="radio"] {
8081
display: inline;
81-
margin-right: $base-line-height / 4;
82+
margin-right: calc($base-line-height / 4);
8283
}
8384

8485
input[type="file"] {
85-
margin-bottom: $base-line-height / 2;
86-
padding-bottom: ($base-line-height / 3);
86+
margin-bottom: calc($base-line-height / 2);
87+
padding-bottom: calc($base-line-height / 3);
8788
width: 100%;
8889
}
8990

‎source/_sass/base/_lists.scss‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,31 @@
1414
* limitations under the License.
1515
*/
1616

17-
ul, ol {
17+
ul,
18+
ol {
1819
margin: 0;
1920
padding: 0;
2021
list-style-type: none;
2122

2223
&%default-ul {
2324
list-style-type: disc;
24-
margin-bottom: $base-line-height / 2;
25+
margin-bottom: calc($base-line-height / 2);
2526
padding-left: $base-line-height;
2627
}
2728

2829
&%default-ol {
2930
list-style-type: decimal;
30-
margin-bottom: $base-line-height / 2;
31+
margin-bottom: calc($base-line-height / 2);
3132
padding-left: $base-line-height;
3233
}
3334
}
3435

3536
dl {
36-
margin-bottom: $base-line-height / 2;
37+
margin-bottom: calc($base-line-height / 2);
3738

3839
dt {
3940
font-weight: bold;
40-
margin-top: $base-line-height / 2;
41+
margin-top: calc($base-line-height / 2);
4142
}
4243

4344
dd {

‎source/_sass/base/_tables.scss‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,16 @@ table {
2020

2121
th {
2222
font-weight: bold;
23-
padding: ($base-line-height / 2) 0;
23+
padding: calc($base-line-height / 2) 0;
2424
text-align: left;
2525
}
2626

2727
td {
28-
padding: ($base-line-height / 2) 0;
28+
padding: calc($base-line-height / 2) 0;
2929
}
3030

31-
tr, td, th {
31+
tr,
32+
td,
33+
th {
3234
vertical-align: middle;
3335
}

‎source/_sass/base/_typography.scss‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,12 @@ body {
2323
line-height: $unitless-line-height;
2424
}
2525

26-
h1, h2, h3, h4, h5, h6 {
26+
h1,
27+
h2,
28+
h3,
29+
h4,
30+
h5,
31+
h6 {
2732
font-family: $header-font-family;
2833
line-height: $header-line-height;
2934
margin: 0 0 0.5em 0;
@@ -67,7 +72,8 @@ a {
6772
color: $hover-link-color;
6873
}
6974

70-
&:active, &:focus {
75+
&:active,
76+
&:focus {
7177
color: $hover-link-color;
7278
outline: none;
7379
}
@@ -90,7 +96,7 @@ blockquote {
9096
border-left: 2px solid $base-border-color;
9197
color: lighten($base-font-color, 15);
9298
margin: $base-line-height 0;
93-
padding-left: $base-line-height / 2;
99+
padding-left: calc($base-line-height / 2);
94100
}
95101

96102
cite {

‎source/_sass/base/_variables.scss‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
@use 'sass:color';
1617

1718
// Typography
1819
$sans-serif: 'Open Sans';
@@ -52,10 +53,10 @@ $success-color: $green;
5253

5354
// Forms
5455
$form-border-color: $base-border-color;
55-
$form-border-color-hover: darken($base-border-color, 10);
56+
$form-border-color-hover: color.adjust($base-border-color, lighten, -10);
5657
$form-border-color-focus: $base-accent-color;
5758
$form-border-radius: $base-border-radius;
58-
$form-box-shadow: inset 0 1px 3px rgba(0,0,0,0.06);
59+
$form-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.06);
5960
$form-box-shadow-focus: $form-box-shadow, 0 0 5px rgba(darken($form-border-color-focus, 5), 0.7);
6061
$form-font-size: $base-font-size;
6162
$form-font-family: $base-font-family;

‎source/_sass/base/mixins/_flash.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
background: $color;
1919
color: darken($color, 60);
2020
font-weight: bold;
21-
margin-bottom: $base-line-height / 2;
22-
padding: $base-line-height / 2;
21+
margin-bottom: calc($base-line-height / 2);
22+
padding: calc($base-line-height / 2);
2323

2424
a {
2525
color: darken($color, 70);

0 commit comments

Comments
 (0)