Skip to content
Open
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
4 changes: 1 addition & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ jobs:
restore-keys: |
${{ runner.OS }}-node-
- name: Install dependencies
run: |
yarn --frozen-lockfile
npm rebuild node-sass
run: yarn --frozen-lockfile
- name: Run tests
run: yarn test
4 changes: 1 addition & 3 deletions .github/workflows/visual_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,7 @@ jobs:
restore-keys: |
${{ runner.OS }}-node-
- name: Install dependencies
run: |
yarn --frozen-lockfile
npm rebuild node-sass
run: yarn --frozen-lockfile
- name: Download Chromium
run: npx puppeteer browsers install chrome
- name: Extract jsdocs and environment info
Expand Down
2 changes: 1 addition & 1 deletion docs/assets/main.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~/assets/definitions';
@use '~/assets/definitions' as *;

.visuallyhidden {
position: absolute;
Expand Down
2 changes: 1 addition & 1 deletion docs/common/DocsAnchorTarget.vue
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@

<style lang="scss" scoped>

@import '~/assets/definitions';
@use '~/assets/definitions' as *;

.section-link-with-target {
position: relative;
Expand Down
2 changes: 1 addition & 1 deletion docs/common/DocsFilter/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@

<style lang="scss" scoped>

@import '~/assets/definitions';
@use '~/assets/definitions' as *;

.filter-wrapping-div {
position: relative;
Expand Down
2 changes: 1 addition & 1 deletion docs/common/DocsPageTemplate/Header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@

<style lang="scss" scoped>

@import '~/assets/definitions';
@use '~/assets/definitions' as *;

.header {
padding-top: 16px;
Expand Down
2 changes: 1 addition & 1 deletion docs/common/DocsPageTemplate/SideNav/NavLink.vue
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@

<style lang="scss" scoped>

@import '~/assets/definitions';
@use '~/assets/definitions' as *;

.block {
display: block;
Expand Down
2 changes: 1 addition & 1 deletion docs/common/DocsPageTemplate/SideNav/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@

<style lang="scss" scoped>

@import '~/assets/definitions';
@use '~/assets/definitions' as *;

.header {
margin-top: 24px;
Expand Down
4 changes: 2 additions & 2 deletions docs/common/DocsPageTemplate/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,8 @@

<style lang="scss" scoped>

@import '~/assets/definitions';
@import '../../../lib/styles/definitions';
@use '~/assets/definitions' as *;
@use '../../../lib/styles/definitions' as *;

.floating-header {
position: fixed;
Expand Down
2 changes: 1 addition & 1 deletion docs/common/DocsPageTemplate/jsdocs/EventsTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,6 @@

<style lang="scss" scoped>

@import './styles';
@use './styles' as *;

</style>
2 changes: 1 addition & 1 deletion docs/common/DocsPageTemplate/jsdocs/MethodsTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@

<style lang="scss" scoped>

@import './styles';
@use './styles' as *;

</style>
2 changes: 1 addition & 1 deletion docs/common/DocsPageTemplate/jsdocs/PropsTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,6 @@

<style lang="scss" scoped>

@import './styles';
@use './styles' as *;

</style>
2 changes: 1 addition & 1 deletion docs/common/DocsPageTemplate/jsdocs/SlotsTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@

<style lang="scss" scoped>

@import './styles';
@use './styles' as *;

</style>
2 changes: 1 addition & 1 deletion docs/common/DocsTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<style lang="scss" scoped>

@import '~/assets/definitions';
@use '~/assets/definitions' as *;

table {
border-collapse: collapse;
Expand Down
2 changes: 1 addition & 1 deletion docs/common/DocsToggleButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@

<style lang="scss" scoped>

@import '~/assets/definitions';
@use '~/assets/definitions' as *;

.toggle {
display: inline-block; // prevents trailing spaces
Expand Down
2 changes: 1 addition & 1 deletion docs/common/DocsToggleContent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

<style lang="scss" scoped>

@import '~/assets/definitions';
@use '~/assets/definitions' as *;

.content {
display: none;
Expand Down
8 changes: 4 additions & 4 deletions docs/pages/styling/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<!-- eslint-disable -->
<!-- prettier-ignore -->
<DocsShowCode language="css">
@import '~kolibri-design-system/lib/styles/definitions'
@use '~kolibri-design-system/lib/styles/definitions' as *;

.box {
@extend %dropshadow-2dp;
Expand Down Expand Up @@ -146,7 +146,7 @@
<!-- eslint-disable -->
<!-- prettier-ignore -->
<DocsShowCode language="css">
@import '~kolibri-design-system/lib/styles/definitions'
@use '~kolibri-design-system/lib/styles/definitions' as *;

.box-1dp {
@extend %dropshadow-1dp;
Expand Down Expand Up @@ -225,7 +225,7 @@
<!-- eslint-disable -->
<!-- prettier-ignore -->
<DocsShowCode language="css">
@import '~kolibri-design-system/lib/styles/definitions'
@use '~kolibri-design-system/lib/styles/definitions' as *;

.ease:hover {
@extend %dropshadow-6dp;
Expand Down Expand Up @@ -255,7 +255,7 @@

<style lang="scss" scoped>

@import '~~/lib/styles/definitions';
@use '~~/lib/styles/definitions' as *;

dt {
font-weight: bold;
Expand Down
2 changes: 1 addition & 1 deletion lib/KBreadcrumbs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@

<style lang="scss" scoped>

@import './styles/definitions';
@use './styles/definitions' as *;
$crumb-max-width: 300px;

.breadcrumbs {
Expand Down
2 changes: 1 addition & 1 deletion lib/KIcon/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@

<style lang="scss" scoped>

@import '../styles/definitions';
@use '../styles/definitions' as *;

svg {
position: relative;
Expand Down
2 changes: 1 addition & 1 deletion lib/KModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@

<style lang="scss" scoped>

@import './styles/definitions';
@use './styles/definitions' as *;

.modal-overlay {
position: fixed;
Expand Down
2 changes: 1 addition & 1 deletion lib/KPageContainer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@

<style lang="scss" scoped>

@import './styles/definitions';
@use './styles/definitions' as *;

.page-container {
@extend %dropshadow-1dp;
Expand Down
4 changes: 2 additions & 2 deletions lib/KSelect/KSelectOption.vue
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@

<style lang="scss" scoped>

@import '../styles/definitions';
@import '../keen/styles/imports';
@use '../styles/definitions' as *;
@use '../keen/styles/imports' as *;

/* stylelint-disable csstree/validator */

Expand Down
4 changes: 2 additions & 2 deletions lib/KSelect/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -923,8 +923,8 @@

<style lang="scss" scoped>

@import '../styles/definitions';
@import '../keen/styles/imports';
@use '../styles/definitions' as *;
@use '../keen/styles/imports' as *;

/* stylelint-disable csstree/validator */

Expand Down
4 changes: 2 additions & 2 deletions lib/KSwitch.vue
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@

<style lang="scss">

@import './styles/definitions';
@use './styles/definitions' as *;
$k-switch-height: 32px !default;
$k-switch-thumb-size: 20px !default;
$k-switch-thumb-color: #f5f5f5 !default;
Expand Down Expand Up @@ -261,7 +261,7 @@

.k-switch-track {
position: absolute;
top: (($k-switch-thumb-size - $k-switch-track-height) / 2);
top: calc(($k-switch-thumb-size - $k-switch-track-height) / 2);
width: $k-switch-track-width;
height: $k-switch-track-height;
background-color: #cccccc;
Expand Down
4 changes: 2 additions & 2 deletions lib/KToolbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@

<style lang="scss">

@import './styles/definitions';
@import './keen/styles/imports';
@use './styles/definitions' as *;
@use './keen/styles/imports' as *;

$k-toolbar-font-size: rem(18px) !default;
$k-toolbar-height: rem(56px) !default;
Expand Down
2 changes: 1 addition & 1 deletion lib/KTooltip/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@

<style lang="scss" scoped>

@import '../styles/definitions';
@use '../styles/definitions' as *;

.k-tooltip {
@extend %dropshadow-1dp;
Expand Down
2 changes: 1 addition & 1 deletion lib/buttons-and-links/KButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@

<style lang="scss" scoped>

@import './buttons';
@use './buttons' as *;

.icon-container {
position: relative;
Expand Down
2 changes: 1 addition & 1 deletion lib/buttons-and-links/KExternalLink.vue
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,6 @@

<style lang="scss" scoped>

@import './buttons';
@use './buttons' as *;

</style>
2 changes: 1 addition & 1 deletion lib/buttons-and-links/KRouterLink.vue
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,6 @@

<style lang="scss" scoped>

@import './buttons';
@use './buttons' as *;

</style>
2 changes: 1 addition & 1 deletion lib/buttons-and-links/buttons.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../styles/definitions';
@use '../styles/definitions' as *;

$transition: color $core-time ease,
background-color $core-time ease,
Expand Down
2 changes: 1 addition & 1 deletion lib/cards/KCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@

<style lang="scss" scoped>

@import '../styles/definitions';
@use '../styles/definitions' as *;

$spacer: 16px;

Expand Down
2 changes: 1 addition & 1 deletion lib/cards/SkeletonCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@

<style lang="scss" scoped>

@import '../styles/definitions';
@use '../styles/definitions' as *;

@keyframes loading {
0% {
Expand Down
2 changes: 1 addition & 1 deletion lib/grids/KFixedGridItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@

<style lang="scss" scoped>

@import '../styles/definitions';
@use '../styles/definitions' as *;

.grid-item {
// override pure grid default font family
Expand Down
2 changes: 1 addition & 1 deletion lib/keen/UiAlert.vue
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@

<style lang="scss">

@import './styles/imports';
@use './styles/imports' as *;

$ui-alert-color: rgba(black, 0.75) !default;
$ui-alert-font-size: rem(15px) !default;
Expand Down
4 changes: 2 additions & 2 deletions lib/keen/UiAutocomplete.vue
Original file line number Diff line number Diff line change
Expand Up @@ -449,8 +449,8 @@

<style lang="scss">

@import './styles/imports';
@import '../styles/definitions';
@use './styles/imports' as *;
@use '../styles/definitions' as *;

.ui-autocomplete {
position: relative;
Expand Down
2 changes: 1 addition & 1 deletion lib/keen/UiAutocompleteSuggestion.vue
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@

<style lang="scss">

@import './styles/imports';
@use './styles/imports' as *;

.ui-autocomplete-suggestion {
padding: rem(8px 12px);
Expand Down
Loading