Skip to content

Fix SASS deprecations, replace / with math.div #915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
christianlupus merged 3 commits into from
Mar 13, 2022
Merged

Fix SASS deprecations, replace / with math.div #915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4dc67eb
Fix SASS deprecations, replace / with math.div
MarcelRobitaille Mar 12, 2022
0caab4e
Correct stylelint configuration to cope with problems
christianlupus Mar 13, 2022
1b4b6d3
Update changelog
christianlupus Mar 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
[#909](https://github.com/nextcloud/cookbook/pull/909) @christianlupus
- Remove some packages from the dependencies to keep the footprint smaller
[#912](https://github.com/nextcloud/cookbook/pull/912) @christianlupus

- Remove deprecation in preparation for Sass 2.0.0
[#915](https://github.com/nextcloud/cookbook/pull/915) @MarcelRobitaille

### Documentation
- Introduction about how to start coding
Expand Down
6 changes: 4 additions & 2 deletions src/components/AppNavigationCaption.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,8 @@ export default {
</script>

<style lang="scss" scoped>
@use "sass:math";

// Taken from @nextcloud/vue/src/assets/variables.scss
// https://uxplanet.org/7-rules-for-mobile-ui-button-design-e9cf2ea54556
// recommended is 48px
Expand All @@ -190,7 +192,7 @@ $icon-size: 16px;

// icon padding for a $clickable-area width and a $icon-size icon
// ( 44px - 16px ) / 2
$icon-margin: ($clickable-area - $icon-size) / 2;
$icon-margin: math.div($clickable-area - $icon-size, 2);

.app-navigation-caption-mod {
display: flex;
Expand All @@ -202,7 +204,7 @@ $icon-margin: ($clickable-area - $icon-size) / 2;

// extra top space if it's not the first item on the list
.app-navigation-caption-mod:not(:first-child) {
margin-top: $clickable-area / 2;
margin-top: math.div($clickable-area, 2);
}

// Main entry link
Expand Down
3 changes: 3 additions & 0 deletions stylelint.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,8 @@ stylelintConfig.extends.push('stylelint-config-prettier', 'stylelint-config-idio
stylelintConfig.rules.indentation = null
stylelintConfig.rules['string-quotes'] = 'double'
stylelintConfig.rules['selector-list-comma-newline-after'] = 'always-multi-line'
stylelintConfig.rules['function-no-unknown'] = [true, {
'ignoreFunctions': ["math.div"]
}]

module.exports = stylelintConfig