Skip to content

Commit 9af4e30

Browse files
authored
Merge branch 'main' into lilia_work
2 parents 924f73c + 1785c39 commit 9af4e30

File tree

7 files changed

+21
-11
lines changed

7 files changed

+21
-11
lines changed

apps/stage-tamagotchi/src/pages/settings/appearance/color-scheme.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ const { t } = useI18n()
5555
/>
5656
<div
5757
v-motion
58-
class="color-bar"
58+
class="color-bar text-[10px] md:text-base sm:text-xs"
5959
:initial="{ opacity: 0, y: 10 }"
6060
:enter="{ opacity: 1, y: 0 }"
6161
:duration="250 + (7 * 10)"
@@ -86,7 +86,7 @@ const { t } = useI18n()
8686
</div>
8787
<div
8888
v-motion
89-
class="color-bar transparency-grid"
89+
class="color-bar transparency-grid text-[10px] md:text-base sm:text-xs"
9090
:initial="{ opacity: 0, y: 10 }"
9191
:enter="{ opacity: 1, y: 0 }"
9292
:duration="250 + (9 * 10)"
@@ -120,7 +120,7 @@ const { t } = useI18n()
120120
<div
121121
v-for="({ title, description, colors }, i) in $tm('settings.pages.themes.sections.section.theme-presets.presets')" :key="i"
122122
v-motion
123-
class="w-full flex items-center justify-between rounded-lg px-4 py-3 outline-none transition-all duration-250 ease-in-out"
123+
class="w-full flex flex-col items-start justify-between gap-2 rounded-lg px-4 py-3 outline-none transition-all duration-250 ease-in-out md:flex-row md:items-center md:gap-0"
124124
bg="neutral-100 dark:neutral-800"
125125
hover="bg-neutral-200 dark:bg-neutral-700"
126126
:initial="{ opacity: 0, y: 10 }"

apps/stage-web/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="UTF-8" />
55
<title>AIRI</title>
66
<meta name="description" content="Open source attempt to create cyber companion">
7-
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0" />
7+
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
88
<link rel="icon" type="image/svg+xml" href="/favicon.svg" sizes="any" />
99
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
1010
<meta name="theme-color" content="rgb(18,18,18)" id="themeColor" />

apps/stage-web/src/components/Layouts/MobileInteractiveArea.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ onMounted(() => {
116116
</Transition>
117117
</KeepAlive>
118118
<div relative w-full self-end>
119-
<div fixed top="50%" translate-y="[-50%]" px-2>
119+
<div top="50%" translate-y="[-50%]" fixed z-15 px-2>
120120
<ViewControlInputs ref="viewControlsInputs" :mode="viewControlsActiveMode" />
121121
</div>
122122
<div translate-y="[-100%]" absolute right-0 w-full px-2 pb-2 font-sans>

apps/stage-web/src/pages/settings/appearance/color-scheme.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ const { t } = useI18n()
5555
/>
5656
<div
5757
v-motion
58-
class="color-bar"
58+
class="color-bar text-[10px] md:text-base sm:text-xs"
5959
:initial="{ opacity: 0, y: 10 }"
6060
:enter="{ opacity: 1, y: 0 }"
6161
:duration="250 + (7 * 10)"
@@ -86,7 +86,7 @@ const { t } = useI18n()
8686
</div>
8787
<div
8888
v-motion
89-
class="color-bar transparency-grid"
89+
class="color-bar transparency-grid text-[10px] md:text-base sm:text-xs"
9090
:initial="{ opacity: 0, y: 10 }"
9191
:enter="{ opacity: 1, y: 0 }"
9292
:duration="250 + (9 * 10)"
@@ -120,7 +120,7 @@ const { t } = useI18n()
120120
<div
121121
v-for="({ title, description, colors }, i) in $tm('settings.pages.themes.sections.section.theme-presets.presets')" :key="i"
122122
v-motion
123-
class="w-full flex items-center justify-between rounded-lg px-4 py-3 outline-none transition-all duration-250 ease-in-out"
123+
class="w-full flex flex-col items-start justify-between gap-2 rounded-lg px-4 py-3 outline-none transition-all duration-250 ease-in-out md:flex-row md:items-center md:gap-0"
124124
bg="neutral-100 dark:neutral-800"
125125
hover="bg-neutral-200 dark:bg-neutral-700"
126126
:initial="{ opacity: 0, y: 10 }"

apps/stage-web/src/styles/main.css

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,16 @@
77
--bg-color: var(--bg-color-light);
88
}
99

10+
/**
11+
Disable double-tap "zoom" option in browser on touch devices
12+
13+
https://stackoverflow.com/a/54207844
14+
https://stackoverflow.com/questions/10614481/disable-double-tap-zoom-option-in-browser-on-touch-devices
15+
*/
16+
* {
17+
touch-action: manipulation;
18+
}
19+
1020
html,
1121
body,
1222
#app {

packages/stage-ui/src/components/Widgets/ColorPalette.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const settings = useSettings()
2222
transition="all ease-in-out duration-250"
2323
size-8 cursor-pointer rounded-full bg-primary-500
2424
:style="hex ? { background: hex } : { '--chromatic-hue': DEFAULT_THEME_COLORS_HUE }"
25-
:class="settings.isColorSelectedForPrimary(hex) ? 'scale-150 mx-1' : 'hover:scale-110'"
25+
:class="settings.isColorSelectedForPrimary(hex) ? 'scale-120 md:scale-150 mx-1' : 'hover:scale-110'"
2626
@click="settings.applyPrimaryColorFrom(hex)"
2727
/>
2828
<TooltipPortal>

packages/ui/src/components/Form/Range/RoundRange.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ https://toughengineer.github.io/demo/slider-styler*/
7474
transition: background-color 0.2s ease;
7575
7676
--thumb-width: var(--height);
77-
--thumb-height: 0px;
77+
--thumb-height: var(--height);
7878
--thumb-box-shadow: none;
7979
--thumb-border: none;
8080
--thumb-border-radius: 0px;
81-
--thumb-background: rgb(255, 255, 255);
81+
--thumb-background: transparent;
8282
8383
--track-height: calc(var(--height) - var(--track-value-padding) * 2);
8484
--track-box-shadow: 0 0 12px -2px rgb(0 0 0 / 22%);

0 commit comments

Comments
 (0)