Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ repos:
description: This hook handles all frontend linting for Kolibri Studio
entry: yarn run lint-frontend:format
language: system
files: \.(js|vue|scss|less|css)$
files: \.(js|vue|scss|css)$
12 changes: 9 additions & 3 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,14 @@ module.exports = {
* Inline comments explain why rule is ignored
*/
'selector-max-id': null, // This would require a major refactor
'at-rule-no-unknown': null, // we're using LESS
'scss/at-rule-no-unknown': null, // we're using LESS
'csstree/validator': null // this triggers issues with unknown at rules too.
'csstree/validator': null, // this triggers issues with unknown at rules too.
'selector-pseudo-element-no-unknown': [
true,
{
// In Vue 2.6 and later, `::v-deep` is used for deep selectors.
// This rule allows `::v-deep` to prevent linting errors.
ignorePseudoElements: ['v-deep'],
}
]
},
};
Original file line number Diff line number Diff line change
Expand Up @@ -562,13 +562,13 @@
</script>


<style lang="less" scoped>
<style lang="scss" scoped>

.v-text-field {
margin-top: 8px !important;
}

.policy-checkbox /deep/ .v-input__slot {
.policy-checkbox ::v-deep .v-input__slot {
margin-bottom: 4px !important;

label {
Expand All @@ -593,11 +593,11 @@
.span-spacing {
display: flex;
margin-left: 40px;
}

.span-spacing span {
margin-left: 2px;
font-size: 16px;
span {
margin-left: 2px;
font-size: 16px;
}
}

.span-spacing-email {
Expand Down
18 changes: 11 additions & 7 deletions contentcuration/contentcuration/frontend/accounts/pages/Main.vue
Original file line number Diff line number Diff line change
Expand Up @@ -206,20 +206,24 @@
</script>


<style lang="less" scoped>
<style lang="scss" scoped>

.main {
overflow: auto;
/* stylelint-disable-next-line custom-property-pattern */
background-color: var(--v-backgroundColor-base);
}

.links span:not(:last-child)::after {
margin: 0 8px 0 12px;
font-size: 14pt;
color: var(--v-grey-base);
vertical-align: middle;
content: '•';
.links {
span {
&:not(:last-child)::after {
margin: 0 8px 0 12px;
font-size: 14pt;
color: var(--v-grey-base);
vertical-align: middle;
content: '•';
}
}
}

.w-100 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@

</script>

<style lang="less" scoped>
<style lang="scss" scoped>

.w-100 {
width: 100%;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@

</script>

<style lang="less" scoped>
<style lang="scss" scoped>

.w-100 {
width: 100%;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@

</script>

<style lang="less" scoped>
<style lang="scss" scoped>

.w-100 {
width: 100%;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@

</script>


<style lang="less" scoped>
<style lang="scss" scoped>

div {
white-space: nowrap;
Expand All @@ -68,9 +67,4 @@
text-overflow: ellipsis;
}

.VBtn:hover::before,
.VBtn:focus::before {
background-color: transparent;
}

</style>
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,5 @@
</script>


<style lang="less" scoped>
<style lang="scss" scoped>
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -225,5 +225,5 @@
</script>


<style lang="less" scoped>
<style lang="scss" scoped>
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -248,9 +248,9 @@
</script>


<style lang="less" scoped>
<style lang="scss" scoped>

/deep/ .v-chip__close {
::v-deep .v-chip__close {
padding-top: 4px;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,5 +168,5 @@
</script>


<style lang="less" scoped>
<style lang="scss" scoped>
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@
</script>


<style lang="less" scoped>
<style lang="scss" scoped>

.user-table {
max-width: 1024px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,6 @@

</script>

<style lang="less" scoped>
<style lang="scss" scoped>

</style>
Original file line number Diff line number Diff line change
Expand Up @@ -236,12 +236,12 @@

</script>

<style lang="less" scoped>
<style lang="scss" scoped>

.list-item-disabled {
opacity: 0.5;

/deep/ .v-list__tile--link:hover {
::v-deep .v-list__tile--link:hover {
color: inherit;
background-color: transparent;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -425,10 +425,10 @@

</script>

<style lang="less" scoped>
<style lang="scss" scoped>

@exercise-answer-correct: #4caf50;
@exercise-answer-wrong: #ef5350;
$exercise-answer-correct: #4caf50;
$exercise-answer-wrong: #ef5350;

.card-border-light {
/* stylelint-disable-next-line custom-property-pattern */
Expand All @@ -448,11 +448,11 @@
}

&.closed.answer-correct:hover {
background-color: fade(@exercise-answer-correct, 15%);
background-color: rgba($exercise-answer-correct, 0.15);
}

&.closed.answer-wrong:hover {
background-color: fade(@exercise-answer-wrong, 15%);
background-color: rgba($exercise-answer-wrong, 0.15);
}

.indicator {
Expand All @@ -461,11 +461,11 @@
height: 100%;

&.correct {
background-color: @exercise-answer-correct;
background-color: $exercise-answer-correct;
}

&.wrong {
background-color: @exercise-answer-wrong;
background-color: $exercise-answer-wrong;
}
}
}
Expand All @@ -475,8 +475,8 @@
}

/* Remove the underline on text fields that are not focused */
/deep/.no-border.v-text-field > .v-input__control > .v-input__slot::before,
/deep/.no-border.v-text-field > .v-input__control > .v-input__slot::after {
::v-deep .no-border.v-text-field > .v-input__control > .v-input__slot::before,
::v-deep .no-border.v-text-field > .v-input__control > .v-input__slot::after {
border-style: none;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@

</script>

<style lang="less" scoped>
<style lang="scss" scoped>

.item {
position: relative;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@

</script>

<style lang="less" scoped>
<style lang="scss" scoped>

.question-text {
transition: 0.7s;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@

</script>

<style lang="less" scoped>
<style lang="scss" scoped>

.hints-toggle {
cursor: pointer;
Expand All @@ -247,7 +247,7 @@
/*! rtl:end:ignore */
}

/deep/ .v-input--selection-controls {
::v-deep .v-input--selection-controls {
margin-top: 0;

.accent--text {
Expand All @@ -259,7 +259,7 @@
}
}

/deep/ img {
::v-deep img {
max-width: 100%;
height: auto;
}
Expand All @@ -268,7 +268,7 @@
padding: 11px;
}

.item-answers-preview /deep/ .checkbox-icon {
.item-answers-preview ::v-deep .checkbox-icon {
top: 8px;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@

</script>

<style lang="less" scoped>
<style lang="scss" scoped>

.toolbar-item {
max-width: 50px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
};

</script>
<style lang="less" scoped>
<style lang="scss" scoped>

.channel-item {
background: #ffffff;
Expand All @@ -119,12 +119,12 @@
.channel-tile,
.v-list__tile__title,
.v-list__tile__title > h4,
/deep/ .channel-tile > .v-list__tile {
::v-deep .channel-tile > .v-list__tile {
width: 100%;
max-width: 100%;
}

/deep/ .channel-tile > .v-list__tile {
::v-deep .channel-tile > .v-list__tile {
padding-right: 0;
}

Expand All @@ -137,12 +137,13 @@
}

.text-truncate {
/* fix clipping of dangling characters */
// Fix clipping of dangling characters
line-height: 1.3 !important;
}

/deep/ .selectedIndeterminate svg {
::v-deep .selectedIndeterminate svg {
fill: gray !important;
}

</style>

Loading