From 7b073c536ba7affef9f6064d28de5449bb2210ce Mon Sep 17 00:00:00 2001 From: ndom91 Date: Thu, 27 Jun 2024 16:44:12 +0200 Subject: [PATCH] fix: prettier --- package.json | 2 +- packages/ui/src/app.html | 20 ++- packages/ui/src/styles/main.css | 222 ++++++++++++++++---------------- packages/ui/vite.config.ts | 4 +- 4 files changed, 122 insertions(+), 126 deletions(-) diff --git a/package.json b/package.json index 2d44da87a..0e46b48d8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "root", "private": true, - "repository": "https://github.com/gitbutlerapp/gitbutler.git", + "repository": "https://github.com/gitbutlerapp/gitbutler.git", "engines": { "node": ">=20.11" }, diff --git a/packages/ui/src/app.html b/packages/ui/src/app.html index 14da77817..919069e07 100644 --- a/packages/ui/src/app.html +++ b/packages/ui/src/app.html @@ -1,15 +1,13 @@ + + + + + %sveltekit.head% + - - - - - %sveltekit.head% - - - -
%sveltekit.body%
- - + +
%sveltekit.body%
+ diff --git a/packages/ui/src/styles/main.css b/packages/ui/src/styles/main.css index 5d04b10e2..7dfb47d0f 100644 --- a/packages/ui/src/styles/main.css +++ b/packages/ui/src/styles/main.css @@ -14,74 +14,74 @@ /* CSS VARIABLES */ :root { - --transition-fast: 0.06s ease-in-out; - --transition-medium: 0.15s ease-in-out; - --transition-slow: 0.2s ease-in-out; + --transition-fast: 0.06s ease-in-out; + --transition-medium: 0.15s ease-in-out; + --transition-slow: 0.2s ease-in-out; - /* Z-index */ - --z-ground: 1; - --z-lifted: 2; - --z-floating: 3; - --z-modal: 4; - --z-tooltip: 9; - --z-blocker: 10; + /* Z-index */ + --z-ground: 1; + --z-lifted: 2; + --z-floating: 3; + --z-modal: 4; + --z-tooltip: 9; + --z-blocker: 10; - /* TODO: add focus color */ - --focus-color: var(--clr-scale-pop-50); - --resizer-color: var(--clr-scale-pop-50); + /* TODO: add focus color */ + --focus-color: var(--clr-scale-pop-50); + --resizer-color: var(--clr-scale-pop-50); } /* scrollbar helpers */ .hide-native-scrollbar { - -ms-overflow-style: none; - scrollbar-width: none; + -ms-overflow-style: none; + scrollbar-width: none; - &::-webkit-scrollbar { - display: none; - } + &::-webkit-scrollbar { + display: none; + } } .truncate { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } /* custom scrollbar */ .scrollbar, pre { - &::-webkit-scrollbar { - background-color: transaparent; - width: 14px; - } + &::-webkit-scrollbar { + background-color: transaparent; + width: 14px; + } - &::-webkit-scrollbar-track { - background-color: transaparent; - } + &::-webkit-scrollbar-track { + background-color: transaparent; + } - &::-webkit-scrollbar-thumb { - background-color: var(--clr-border-1); - background-clip: padding-box; - border-radius: 12px; - border: 4px solid rgba(0, 0, 0, 0); - opacity: 0.3; - } + &::-webkit-scrollbar-thumb { + background-color: var(--clr-border-1); + background-clip: padding-box; + border-radius: 12px; + border: 4px solid rgba(0, 0, 0, 0); + opacity: 0.3; + } - &::-webkit-scrollbar-thumb:hover { - opacity: 0.8; - } + &::-webkit-scrollbar-thumb:hover { + opacity: 0.8; + } - &::-webkit-scrollbar-button { - display: none; - } + &::-webkit-scrollbar-button { + display: none; + } } .link { - text-decoration: underline; + text-decoration: underline; - &:hover { - text-decoration: none; - } + &:hover { + text-decoration: none; + } } /** @@ -90,115 +90,115 @@ pre { * frequently. */ .drop-zone-hover * { - pointer-events: none; + pointer-events: none; } /* FOCUS STATE */ .focus-state { - &:focus-within { - outline: 1px solid transaparent; - animation: focus-animation var(--transition-fast) forwards; - } + &:focus-within { + outline: 1px solid transaparent; + animation: focus-animation var(--transition-fast) forwards; + } } @keyframes focus-animation { - 0% { - outline-offset: 0; - } + 0% { + outline-offset: 0; + } - 100% { - outline-offset: 2px; - outline: 1px solid var(--focus-color); - } + 100% { + outline-offset: 2px; + outline: 1px solid var(--focus-color); + } } /* CODE */ .code-string { - font-family: 'Spline Sans Mono', monospace; - border-radius: var(--radius-s); - background: oklch(from var(--clr-scale-ntrl-50) l c h / 0.2); - padding: 2px 4px; + font-family: 'Spline Sans Mono', monospace; + border-radius: var(--radius-s); + background: oklch(from var(--clr-scale-ntrl-50) l c h / 0.2); + padding: 2px 4px; } /* TRANSITION ANIMATION */ .transition-fly { - animation: transition-fly 0.25s forwards ease-in-out; + animation: transition-fly 0.25s forwards ease-in-out; } @keyframes transition-fly { - 0% { - transform: translateY(6px); - opacity: 0; - } + 0% { + transform: translateY(6px); + opacity: 0; + } - 100% { - transform: translateY(0); - opacity: 1; - } + 100% { + transform: translateY(0); + opacity: 1; + } } /* STATES */ .wiggle { - animation: wiggle-animation 0.35s forwards; + animation: wiggle-animation 0.35s forwards; } @keyframes wiggle-animation { - 0% { - transform: translateX(-3px); - } + 0% { + transform: translateX(-3px); + } - 25% { - transform: translateX(3px); - } + 25% { + transform: translateX(3px); + } - 50% { - transform: translateX(-2px); - } + 50% { + transform: translateX(-2px); + } - 75% { - transform: translateX(2px); - } + 75% { + transform: translateX(2px); + } - 100% { - transform: translateX(0); - } + 100% { + transform: translateX(0); + } } .locked-file-animation { - --locked-color: oklch(from var(--clr-scale-warn-50) l c h / 0.2); - border: 1px solid var(--clr-bg-1); - animation: locked-file-animation 1.4s ease-out forwards; + --locked-color: oklch(from var(--clr-scale-warn-50) l c h / 0.2); + border: 1px solid var(--clr-bg-1); + animation: locked-file-animation 1.4s ease-out forwards; } @keyframes locked-file-animation { - 0% { - transform: translateX(-3px); - background-color: var(--clr-bg-1); - } + 0% { + transform: translateX(-3px); + background-color: var(--clr-bg-1); + } - 10% { - transform: translateX(3px); - background-color: var(--locked-color); - } + 10% { + transform: translateX(3px); + background-color: var(--locked-color); + } - 15% { - transform: translateX(-3px); - } + 15% { + transform: translateX(-3px); + } - 25% { - transform: translateX(3px); - background-color: var(--locked-color); - } + 25% { + transform: translateX(3px); + background-color: var(--locked-color); + } - 30%, - 70% { - transform: translateX(0); - } + 30%, + 70% { + transform: translateX(0); + } - 100% { - background-color: var(--clr-bg-1); - } + 100% { + background-color: var(--clr-bg-1); + } } diff --git a/packages/ui/vite.config.ts b/packages/ui/vite.config.ts index 542fb54ff..1e77340de 100644 --- a/packages/ui/vite.config.ts +++ b/packages/ui/vite.config.ts @@ -1,9 +1,7 @@ import { sveltekit } from '@sveltejs/kit/vite'; export default { - plugins: [ - sveltekit() - ], + plugins: [sveltekit()], // Vite options tailored for Tauri development and only applied in `tauri dev` or `tauri build` // prevent vite from obscuring rust errors