Skip to content

Commit 6ff7db6

Browse files
authored
Merge pull request #49337 from nextcloud/fix/sass
2 parents c74ba56 + 5360ddb commit 6ff7db6

File tree

16 files changed

+55
-63
lines changed

16 files changed

+55
-63
lines changed

apps/files_sharing/css/icons.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: AGPL-3.0-or-later
44
*/
55
@use 'variables';
6-
@import 'functions';
6+
@use 'functions';
77

88
// This is the icons used in the sharing ui (multiselect)
99
.icon-room {

apps/files_sharing/css/publicView.css

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/files_sharing/css/publicView.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/files_sharing/css/publicView.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
* SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
33
* SPDX-License-Identifier: AGPL-3.0-or-later
44
*/
5-
@import 'public.scss';
6-
@import 'mobile.scss';
5+
@use 'public.scss';
6+
@use 'mobile.scss';

apps/settings/css/settings.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
@use 'variables';
77
@use 'sass:math';
8-
@import 'functions';
8+
@use 'functions';
99

1010
input {
1111
&#openid, &#webdav {
@@ -20,23 +20,23 @@ input {
2020

2121
/* icons for sidebar */
2222
.nav-icon-personal-settings {
23-
@include icon-color('personal', 'settings', variables.$color-black);
23+
@include functions.icon-color('personal', 'settings', variables.$color-black);
2424
}
2525

2626
.nav-icon-security {
27-
@include icon-color('toggle-filelist', 'settings', variables.$color-black);
27+
@include functions.icon-color('toggle-filelist', 'settings', variables.$color-black);
2828
}
2929

3030
.nav-icon-clientsbox {
31-
@include icon-color('change', 'settings', variables.$color-black);
31+
@include functions.icon-color('change', 'settings', variables.$color-black);
3232
}
3333

3434
.nav-icon-federated-cloud {
35-
@include icon-color('share', 'settings', variables.$color-black);
35+
@include functions.icon-color('share', 'settings', variables.$color-black);
3636
}
3737

3838
.nav-icon-second-factor-backup-codes, .nav-icon-ssl-root-certificate {
39-
@include icon-color('password', 'settings', variables.$color-black);
39+
@include functions.icon-color('password', 'settings', variables.$color-black);
4040
}
4141

4242
#personal-settings-avatar-container {

core/css/apps.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
@use 'variables';
77
@use 'sass:math';
8-
@import 'functions';
8+
@use 'functions';
99

1010
@media screen and (max-width: variables.$breakpoint-mobile) {
1111
// Make the body full width on mobile
@@ -449,7 +449,7 @@ kbd {
449449
margin: 0;
450450
padding: 0;
451451
background: none;
452-
@include icon-color('triangle-s', 'actions', variables.$color-black, 1, true);
452+
@include functions.icon-color('triangle-s', 'actions', variables.$color-black, 1, true);
453453
background-size: 16px;
454454
background-repeat: no-repeat;
455455
background-position: center;
@@ -517,7 +517,7 @@ kbd {
517517
.app-navigation-entry-utils-menu-button {
518518
/* Prevent bg img override if an icon class is set */
519519
button:not([class^='icon-']):not([class*=' icon-']) {
520-
@include icon-color('more', 'actions', variables.$color-black, 1, true);
520+
@include functions.icon-color('more', 'actions', variables.$color-black, 1, true);
521521
}
522522
&:hover button,
523523
&:focus button {

core/css/guest.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
44
* SPDX-License-Identifier: AGPL-3.0-or-later
55
*/
6-
@import 'animations.scss';
6+
@use 'animations.scss';
77

88
/* Default and reset */
99
html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section { margin:0; padding:0; border:0; outline:0; font-weight:inherit; font-size:100%; font-family:inherit; vertical-align:baseline; cursor:default; }

core/css/icons.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/css/icons.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/css/icons.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: AGPL-3.0-or-later
44
*/
55
@use 'variables';
6-
@import 'functions';
6+
@use 'functions';
77

88
/* GLOBAL ------------------------------------------------------------------- */
99
[class^='icon-'], [class*=' icon-'] {

0 commit comments

Comments
 (0)