Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 81d13cb

Browse filesBrowse files
lukachilukachi
committed
hotfix and restructure stylelint rules
1 parent 8d8a826 commit 81d13cb
Copy full SHA for 81d13cb

File tree

Expand file treeCollapse file tree

4 files changed

+52
-21
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+52
-21
lines changed

‎src/common/AppNavbar.vue

Copy file name to clipboardExpand all lines: src/common/AppNavbar.vue
+30Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,33 @@
11
<template>
22
<div class="app-navbar">
33
<app-logo class="app-navbar__logo" />
4+
5+
<app-button
6+
class="app-navbar__link"
7+
:scheme="'flat'"
8+
:text="$routes.uiKit"
9+
:route="{ name: $routes.uiKit }"
10+
/>
11+
12+
<app-button
13+
class="app-navbar__link"
14+
:scheme="'flat'"
15+
:text="$routes.complexForm"
16+
:route="{ name: $routes.complexForm }"
17+
/>
418
</div>
519
</template>
620

721
<script lang="ts" setup>
822
import { AppLogo } from '@/common'
23+
import AppButton from '@/common/AppButton.vue'
924
</script>
1025

1126
<style lang="scss" scoped>
1227
.app-navbar {
1328
display: flex;
1429
align-items: center;
30+
gap: toRem(24);
1531
padding: toRem(24) var(--app-padding-right) toRem(24) var(--app-padding-left);
1632
background: var(--background-primary-main);
1733
border-bottom: var(--border-primary-main);
@@ -22,9 +38,23 @@ import { AppLogo } from '@/common'
2238
}
2339
2440
.app-navbar__logo {
41+
margin-right: auto;
42+
2543
@include respond-to(xsmall) {
2644
width: 100%;
2745
margin-bottom: toRem(24);
2846
}
2947
}
48+
49+
.app-navbar__link {
50+
opacity: 0.25;
51+
52+
&:first-child {
53+
margin-left: auto;
54+
}
55+
56+
&.router-link-active {
57+
opacity: 1;
58+
}
59+
}
3060
</style>

‎src/pages/UiKitPage.vue

Copy file name to clipboardExpand all lines: src/pages/UiKitPage.vue
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ const handleProcessError = () => {
536536
display: flex;
537537
flex-direction: column;
538538
gap: toRem(24);
539-
padding: toRem(24);
539+
padding: toRem(24) var(--app-padding-right) toRem(24) var(--app-padding-left);
540540
}
541541
542542
.ui-kit-page__buttons {

‎src/styles/variables.scss

Copy file name to clipboardExpand all lines: src/styles/variables.scss
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,17 +76,17 @@
7676
/* App variables */
7777
--app-txt: #{$text-primary-main};
7878
--app-font-family: 'Roboto', 'Arial', sans-serif;
79-
--app-padding-right: #{toRem(192)};
80-
--app-padding-left: #{toRem(192)};
79+
--app-padding-right: #{toRem(64)};
80+
--app-padding-left: #{toRem(64)};
8181

8282
@include respond-to(xmedium) {
83-
--app-padding-right: #{toRem(92)};
84-
--app-padding-left: #{toRem(92)};
83+
--app-padding-right: #{toRem(32)};
84+
--app-padding-left: #{toRem(32)};
8585
}
8686

8787
@include respond-to(small) {
88-
--app-padding-right: #{toRem(24)};
89-
--app-padding-left: #{toRem(24)};
88+
--app-padding-right: #{toRem(12)};
89+
--app-padding-left: #{toRem(12)};
9090
}
9191

9292
/* --------------------------------------- */

‎stylelint.config.js

Copy file name to clipboardExpand all lines: stylelint.config.js
+15-14Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,19 @@ module.exports = {
1111
/* disable unnecessary rules from recommended extends */
1212
'function-no-unknown': null,
1313
'at-rule-no-unknown': null,
14+
'no-empty-first-line': null,
15+
'selector-class-pattern': null,
16+
'function-name-case': null,
17+
'selector-no-vendor-prefix': null,
18+
'custom-property-empty-line-before': null,
19+
'no-empty-source': null,
20+
'scss/at-else-empty-line-before': null,
21+
'scss/at-if-closing-brace-space-after': null,
22+
'scss/at-if-closing-brace-newline-after': null,
23+
'scss/at-else-closing-brace-newline-after': null,
24+
'scss/at-else-closing-brace-space-after': null,
25+
'declaration-colon-newline-after': null,
26+
'scss/at-function-pattern': null,
1427

1528
'color-no-invalid-hex': [true, { severity: 'warning' }],
1629
'font-family-no-duplicate-names': [true, { severity: 'warning' }],
@@ -161,23 +174,10 @@ module.exports = {
161174
'color-function-notation': 'legacy',
162175
'scss/at-mixin-parentheses-space-before': 'always',
163176
'alpha-value-notation': 'number',
164-
/* TEMP. disable */
165-
'no-empty-first-line': null,
166-
'selector-class-pattern': null,
167-
'function-name-case': null,
168-
'selector-no-vendor-prefix': null,
169-
'custom-property-empty-line-before': null,
170-
'no-empty-source': null,
171-
'scss/at-else-empty-line-before': null,
172-
'scss/at-if-closing-brace-space-after': null,
173-
'scss/at-if-closing-brace-newline-after': null,
174-
'scss/at-else-closing-brace-newline-after': null,
175-
'scss/at-else-closing-brace-space-after': null,
176-
'declaration-colon-newline-after': null,
177-
'scss/at-function-pattern': null,
178177
'selector-not-notation': 'simple',
179178

180179
// FIXME: deprecated
180+
/* eslint-disable max-len */
181181
// 'at-rule-name-case': ['lower', { severity: 'warning' }],
182182
// 'at-rule-semicolon-space-before': ['never', { severity: 'warning' }],
183183
// 'at-rule-name-space-after': ['always', { severity: 'warning' }],
@@ -323,5 +323,6 @@ module.exports = {
323323
// ignore: ['param'],
324324
// },
325325
// ],
326+
/* eslint-enable max-len */
326327
},
327328
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.