Skip to content

Commit

Permalink
Merge pull request #157 from libvue/feature/improve-misc
Browse files Browse the repository at this point in the history
Feature/improve misc
  • Loading branch information
harmendv authored Apr 11, 2024
2 parents 23258be + 2d48a56 commit 01d0a77
Show file tree
Hide file tree
Showing 9 changed files with 125 additions and 81 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@libvue/core",
"version": "1.2.0",
"version": "1.2.1",
"private": false,
"scripts": {
"dev": "vite",
Expand Down
14 changes: 11 additions & 3 deletions src/docs/components/CodePreview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ export default {
padding: 0.5rem;
color: var(--text-color);
font-weight: 500;
gap: .5rem;
font-size: var(--font-size-small);
line-height: var(--line-height-small);
font-family: var(--font-family);
Expand All @@ -163,7 +164,6 @@ export default {
position: relative;
&--active {
font-weight: bold;
&:after {
content: '';
border-bottom: 3px solid var(--color-primary);
Expand All @@ -175,8 +175,16 @@ export default {
}
}
&:hover {
background-color: var(--code-preview-button-color);
&:hover:not(&--active) {
&:after {
content: '';
border-bottom: 3px solid var(--text-color);
position: absolute;
width: 100%;
height: 0;
bottom: -8px;
left: 0;
}
}
}
Expand Down
96 changes: 48 additions & 48 deletions src/docs/views/documentation/components/lv-flex.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,54 +5,54 @@
<lv-heading v-space-after="1" :level="6">Row Direction (Default)</lv-heading>
<lv-card v-space-after="1">
<lv-flex v-space-after="1" gap="1rem">
<lv-card></lv-card>
<lv-card></lv-card>
<lv-card></lv-card>
<lv-card inline></lv-card>
<lv-card inline></lv-card>
<lv-card inline></lv-card>
</lv-flex>
<lv-flex v-space-after="1" gap="1rem" justify-content="center">
<lv-card></lv-card>
<lv-card></lv-card>
<lv-card></lv-card>
<lv-card inline></lv-card>
<lv-card inline></lv-card>
<lv-card inline></lv-card>
</lv-flex>
<lv-flex gap="1rem" justify-content="end">
<lv-card></lv-card>
<lv-card></lv-card>
<lv-card></lv-card>
<lv-card inline></lv-card>
<lv-card inline></lv-card>
<lv-card inline></lv-card>
</lv-flex>
</lv-card>
<code-preview v-space-after="1" lang="html" :code="codeRow" />

<lv-heading v-space-after="1" :level="6">Column Direction</lv-heading>
<lv-card v-space-after="1">
<lv-flex v-space-after="1" direction="column" align-items="center">
<lv-card></lv-card>
<lv-card></lv-card>
<lv-card></lv-card>
<lv-card inline></lv-card>
<lv-card inline></lv-card>
<lv-card inline></lv-card>
</lv-flex>
<lv-flex v-space-after="1" direction="column" align-items="start">
<lv-card></lv-card>
<lv-card></lv-card>
<lv-card></lv-card>
<lv-card inline></lv-card>
<lv-card inline></lv-card>
<lv-card inline></lv-card>
</lv-flex>
<lv-flex direction="column" align-items="end">
<lv-card></lv-card>
<lv-card></lv-card>
<lv-card></lv-card>
<lv-card inline></lv-card>
<lv-card inline></lv-card>
<lv-card inline></lv-card>
</lv-flex>
</lv-card>
<code-preview v-space-after="1" lang="html" :code="codeColumn" />

<lv-heading v-space-after="1" :level="6">Fill space</lv-heading>
<lv-card v-space-after="1">
<lv-flex v-space-after="1" direction="column" fill>
<lv-card></lv-card>
<lv-card></lv-card>
<lv-card></lv-card>
<lv-card inline></lv-card>
<lv-card inline></lv-card>
<lv-card inline></lv-card>
</lv-flex>
<lv-flex direction="row" fill>
<lv-card></lv-card>
<lv-card></lv-card>
<lv-card></lv-card>
<lv-card inline></lv-card>
<lv-card inline></lv-card>
<lv-card inline></lv-card>
</lv-flex>
</lv-card>
<code-preview v-space-after="1" lang="html" :code="codeFill" />
Expand All @@ -62,50 +62,50 @@
<script>
const codeColumn = `
<lv-flex v-space-after="1" direction="column" justify-content="center">
<lv-card></lv-card>
<lv-card></lv-card>
<lv-card></lv-card>
<lv-card inline></lv-card>
<lv-card inline></lv-card>
<lv-card inline></lv-card>
</lv-flex>
<lv-flex v-space-after="1" direction="column" align-items="start">
<lv-card></lv-card>
<lv-card></lv-card>
<lv-card></lv-card>
<lv-card inline></lv-card>
<lv-card inline></lv-card>
<lv-card inline></lv-card>
</lv-flex>
<lv-flex direction="column" align-items="end">
<lv-card></lv-card>
<lv-card></lv-card>
<lv-card></lv-card>
<lv-card inline></lv-card>
<lv-card inline></lv-card>
<lv-card inline></lv-card>
</lv-flex>
`.trim();
const codeRow = `
<lv-flex v-space-after="1" gap="1rem">
<lv-card></lv-card>
<lv-card></lv-card>
<lv-card></lv-card>
<lv-card inline></lv-card>
<lv-card inline></lv-card>
<lv-card inline></lv-card>
</lv-flex>
<lv-flex v-space-after="1" gap="1rem" justify-content="center">
<lv-card></lv-card>
<lv-card></lv-card>
<lv-card></lv-card>
<lv-card inline></lv-card>
<lv-card inline></lv-card>
<lv-card inline></lv-card>
</lv-flex>
<lv-flex gap="1rem" justify-content="end">
<lv-card></lv-card>
<lv-card></lv-card>
<lv-card></lv-card>
<lv-card inline></lv-card>
<lv-card inline></lv-card>
<lv-card inline></lv-card>
</lv-flex>
`.trim();
const codeFill = `
<lv-flex v-space-after="1" direction="column" fill>
<lv-card></lv-card>
<lv-card></lv-card>
<lv-card></lv-card>
<lv-card inline></lv-card>
<lv-card inline></lv-card>
<lv-card inline></lv-card>
</lv-flex>
<lv-flex direction="row" fill>
<lv-card></lv-card>
<lv-card></lv-card>
<lv-card></lv-card>
<lv-card inline></lv-card>
<lv-card inline></lv-card>
<lv-card inline></lv-card>
</lv-flex>
`.trim();
Expand Down
2 changes: 1 addition & 1 deletion src/lib/components/LvBlockquote/LvBlockquote.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export default {
margin: 0;
padding: .5rem;
font-style: italic;
border-left: 4px solid var(--color-primary-dimmed)
border-left: 4px solid var(--color-primary)
}
.lv-caption {
margin-top: 0.5rem;
Expand Down
2 changes: 1 addition & 1 deletion src/lib/components/LvButton/LvButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ export default {
}
}
@include color-mixin;
@include color-mixin(true);
@include size-mixin;
}
</style>
1 change: 1 addition & 0 deletions src/lib/components/LvSelect/LvSelect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,7 @@ export default {
padding: calc(var(--padding) * 0.5);
color: var(--color-white);
white-space: nowrap;
align-items: center;
}
&-remove {
margin-left: 0.5rem;
Expand Down
7 changes: 4 additions & 3 deletions src/lib/components/LvTabs/LvTabs.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div class="lv-tabs">
<lv-flex class="lv-tabs__buttons" gap="20px" role="tablist">
<lv-flex class="lv-tabs__buttons" gap="10px" role="tablist">
<div
v-for="tab in tabs"
:key="tab.id"
Expand All @@ -25,9 +25,10 @@

<script>
import LvFlex from "../LvFlex/LvFlex.vue";
import LvIcon from "../LvIcon/LvIcon.vue";
export default {
components: { LvFlex },
components: { LvIcon, LvFlex },
props: {
tabs: {
type: Array,
Expand Down Expand Up @@ -75,7 +76,7 @@ export default {
cursor: pointer;
border-bottom: 2px solid transparent;
background-color: transparent;
padding: 5px 0;
padding: 5px;
color: var(--text-color);
font-weight: bold;
font-size: var(--font-size);
Expand Down
Loading

0 comments on commit 01d0a77

Please sign in to comment.