Skip to content

Commit

Permalink
Merge branch 'release/v0.21.11'
Browse files Browse the repository at this point in the history
  • Loading branch information
holtwick committed Jul 2, 2024
2 parents ccd18a1 + 871a93f commit c8d51e1
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 15 deletions.
2 changes: 1 addition & 1 deletion lib/basic/oui-text.demo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { OuiText } from '@/lib'
Cum sociis natoque penatibus et magnis
<a href="#">dis parturient montes</a>, nascetur ridiculus mus. Aenean eu
leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Sed
posuere consectetur est at lobortis. Cras mattis consectetur purus sit
posuere consectetur est at lobortis. <a href="#">Regular Link</a> Cras mattis consectetur purus sit
amet fermentum. <a class="oui-button" href="https://holtwick.de" target="_blank">Button Link</a>
</p>
<blockquote>
Expand Down
2 changes: 1 addition & 1 deletion lib/basic/oui-text.styl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@require "../../stylus/index.styl";

.oui-text {
:where(.oui-text) {
oui-text();
}
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "oui-kit",
"type": "module",
"version": "0.21.10",
"version": "0.21.11",
"author": {
"email": "[email protected]",
"name": "Dirk Holtwick",
Expand Down Expand Up @@ -73,29 +73,29 @@
"upload": "nr build:demo && rsync -rvz dist/* cy:public_html/oui.holtwick.de"
},
"dependencies": {
"@floating-ui/vue": "^1.0.6",
"@floating-ui/vue": "^1.1.1",
"@vueuse/core": "^10.11.0",
"vue": "^3.4.30",
"vue": "^3.4.31",
"zeed": "^0.21.0"
},
"devDependencies": {
"@antfu/eslint-config": "^2.21.1",
"@antfu/eslint-config": "^2.21.2",
"@antfu/ni": "^0.21.12",
"@shikijs/markdown-it": "^1.9.0",
"@shikijs/markdown-it": "^1.10.0",
"@types/jest": "^29.5.12",
"@types/node": "^20.14.8",
"@types/node": "^20.14.9",
"@vite-pwa/assets-generator": "^0.2.4",
"@vitejs/plugin-vue": "^5.0.5",
"@vue/test-utils": "^2.4.6",
"eslint": "<9",
"stylus": "^0.63.0",
"tsup": "^8.1.0",
"typescript": "<5.5",
"typescript": "^5.5",
"unplugin-vue-markdown": "^0.26.2",
"vite": "^5.3.1",
"vite": "^5.3.2",
"vite-plugin-dts": "^3.9.1",
"vite-plugin-qrcode": "^0.2.3",
"vitest": "^1.6.0",
"vue-tsc": "^2.0.22"
"vue-tsc": "^2.0.24"
}
}
3 changes: 2 additions & 1 deletion stylus/preset/text.styl
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,12 @@ oui-text() {
text-decoration-skip: ink edges;
}

a[class=""], a:not([class]) {
a {
color: var(--link-fg);

&:hover {
color: var(--link-fg-hover);
text-decoration: underline;
}

&:active {
Expand Down
2 changes: 1 addition & 1 deletion stylus/preset/utopia.styl
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ oui-utopia() {
text-decoration-skip: ink edges;
}

a[class=""], a:not([class]) {
a {
color: var(--link-fg);

&:hover {
Expand Down
8 changes: 6 additions & 2 deletions stylus/ui/form.styl
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ oui-button-default() {
// A simple button template
oui-button() {
oui-button-default();
font-weight: 600;
border-radius: var(--button-radius, var(--input-radius));

&:hover:not([disabled]) {
Expand Down Expand Up @@ -110,7 +109,12 @@ oui-button() {
}

// Colors
color: var(--button-fg);
&, &:hover, &:active {
color: var(--button-fg);
text-decoration: none;
font-weight: 600;
}

background: var(--button-bg);
border: 1px solid var(--button-border, transparent);
// Sizes
Expand Down

0 comments on commit c8d51e1

Please sign in to comment.