Skip to content

Commit 385da91

Browse files
authored
Merge pull request #3982 from SwiftPackageIndex/fix-sass-deprecation-errors
Fix SASS deprecation warnings about `@import`
2 parents f16c356 + d62cdaa commit 385da91

40 files changed

Lines changed: 85 additions & 42 deletions

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
stable
1+
22

FrontEnd/docc.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// Wrapped DocC documentation pages.
1717
// -------------------------------------------------------------------------
1818

19-
$mobile-breakpoint: 740px;
19+
@use 'styles/variables' as *;
2020

2121
header.spi,
2222
footer.spi {

FrontEnd/main.scss

Lines changed: 30 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,33 @@
1414

1515
@use 'normalize.css/normalize.css';
1616
@use 'highlight.js/styles/atom-one-dark.css';
17-
18-
$mobile-breakpoint: 740px;
19-
20-
@import 'styles/base';
21-
@import 'styles/blog';
22-
@import 'styles/breadcrumbs';
23-
@import 'styles/build_logs';
24-
@import 'styles/build_monitor';
25-
@import 'styles/build_results';
26-
@import 'styles/copyable_input';
27-
@import 'styles/error';
28-
@import 'styles/github_highlighting';
29-
@import 'styles/header_footer';
30-
@import 'styles/home';
31-
@import 'styles/keywords';
32-
@import 'styles/layout';
33-
@import 'styles/maintainer_info';
34-
@import 'styles/maintenance';
35-
@import 'styles/markdown';
36-
@import 'styles/matrix';
37-
@import 'styles/modal_panel';
38-
@import 'styles/overflowing_list';
39-
@import 'styles/package_list';
40-
@import 'styles/package';
41-
@import 'styles/panel_button';
42-
@import 'styles/readme';
43-
@import 'styles/search_results';
44-
@import 'styles/search';
45-
@import 'styles/spinner';
46-
@import 'styles/supporters';
47-
@import 'styles/tab_bar';
48-
@import 'styles/validate_manifest';
49-
@import 'styles/vega_charts';
17+
@use 'styles/base';
18+
@use 'styles/blog';
19+
@use 'styles/breadcrumbs';
20+
@use 'styles/build_logs';
21+
@use 'styles/build_monitor';
22+
@use 'styles/build_results';
23+
@use 'styles/copyable_input';
24+
@use 'styles/error';
25+
@use 'styles/github_highlighting';
26+
@use 'styles/header_footer';
27+
@use 'styles/home';
28+
@use 'styles/keywords';
29+
@use 'styles/layout';
30+
@use 'styles/maintainer_info';
31+
@use 'styles/maintenance';
32+
@use 'styles/markdown';
33+
@use 'styles/matrix';
34+
@use 'styles/modal_panel';
35+
@use 'styles/overflowing_list';
36+
@use 'styles/package_list';
37+
@use 'styles/package';
38+
@use 'styles/panel_button';
39+
@use 'styles/readme';
40+
@use 'styles/search_results';
41+
@use 'styles/search';
42+
@use 'styles/spinner';
43+
@use 'styles/supporters';
44+
@use 'styles/tab_bar';
45+
@use 'styles/validate_manifest';
46+
@use 'styles/vega_charts';

FrontEnd/shared.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// Any styles shared between SPI and the SPI documentation pages.
1717
// -------------------------------------------------------------------------
1818

19-
@import 'styles/colors';
20-
@import 'styles/utility';
21-
@import 'styles/debug_panel';
22-
@import 'styles/images';
19+
@use 'styles/colors';
20+
@use 'styles/utility';
21+
@use 'styles/debug_panel';
22+
@use 'styles/images';
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
@use 'variables' as *;
16+
1517
// -------------------------------------------------------------------------
1618
// Blog styling.
1719
// -------------------------------------------------------------------------
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
@use 'variables' as *;
16+
1517
// -------------------------------------------------------------------------
1618
// Breadcrumb bar from the main site (DocC breadcrumbs are in `docc.scss`.
1719
// -------------------------------------------------------------------------
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
@use 'variables' as *;
16+
1517
// -------------------------------------------------------------------------
1618
// Individual build log page.
1719
// -------------------------------------------------------------------------
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
@use 'variables' as *;
16+
1517
// -------------------------------------------------------------------------
1618
// Build results page, showing all builds for a package.
1719
// -------------------------------------------------------------------------

0 commit comments

Comments
 (0)