diff --git a/assets/scss/styles.scss b/assets/scss/styles.scss index e6ae18625..e681d2b92 100644 --- a/assets/scss/styles.scss +++ b/assets/scss/styles.scss @@ -72,7 +72,7 @@ body { } .material-icons { - font-size: 1rem !important; + font-size: 1rem; } .svg-icons { @@ -144,6 +144,11 @@ a { } } +[interactive] > div { + @apply flex; + @apply h-full; +} + .tippy-content > div { @apply flex flex-col; @apply max-h-48; @@ -215,11 +220,13 @@ pre.ace_editor { &::after { @apply absolute; - @apply inline-block; + @apply flex; + @apply inset-y-0; + @apply items-center; + @apply justify-center; @apply pointer-events-none; @apply font-icon; @apply text-secondaryLight; - @apply top-2.5; @apply right-3; content: "\e313"; diff --git a/assets/scss/themes.scss b/assets/scss/themes.scss index ad1c86e8c..402141d24 100644 --- a/assets/scss/themes.scss +++ b/assets/scss/themes.scss @@ -303,6 +303,20 @@ --font-size: 0.75rem; // Line height --line-height: 1rem; + // Upper primary sticky fold + --upper-primary-sticky-fold: 4.125rem; + // Upper secondary sticky fold + --upper-secondary-sticky-fold: 6.125rem; + // Upper tertiary sticky fold + --upper-tertiary-sticky-fold: 8.125rem; + // Lower primary sticky fold + --lower-primary-sticky-fold: 3rem; + // Lower secondary sticky fold + --lower-secondary-sticky-fold: 5rem; + // Sidebar primary sticky fold + --sidebar-primary-sticky-fold: 2rem; + // Sidebar secondary sticky fold + --sidebar-secondary-sticky-fold: 4rem; } @mixin fontMedium { @@ -310,6 +324,20 @@ --font-size: 0.875rem; // Line height --line-height: 1.25rem; + // Upper primary sticky fold + --upper-primary-sticky-fold: 4.375rem; + // Upper secondary sticky fold + --upper-secondary-sticky-fold: 6.625rem; + // Upper tertiary sticky fold + --upper-tertiary-sticky-fold: 8.875rem; + // Lower primary sticky fold + --lower-primary-sticky-fold: 3.25rem; + // Lower secondary sticky fold + --lower-secondary-sticky-fold: 5.5rem; + // Sidebar primary sticky fold + --sidebar-primary-sticky-fold: 2.25rem; + // Sidebar secondary sticky fold + --sidebar-secondary-sticky-fold: 4.5rem; } @mixin fontLarge { @@ -317,6 +345,20 @@ --font-size: 1rem; // Line height --line-height: 1.5rem; + // Upper primary sticky fold + --upper-primary-sticky-fold: 4.625rem; + // Upper secondary sticky fold + --upper-secondary-sticky-fold: 7.125rem; + // Upper tertiary sticky fold + --upper-tertiary-sticky-fold: 9.625rem; + // Lower primary sticky fold + --lower-primary-sticky-fold: 3.5rem; + // Lower secondary sticky fold + --lower-secondary-sticky-fold: 6rem; + // Sidebar primary sticky fold + --sidebar-primary-sticky-fold: 2.5rem; + // Sidebar secondary sticky fold + --sidebar-secondary-sticky-fold: 5rem; } :root[data-font-size="xs"] { diff --git a/components/collections/graphql/index.vue b/components/collections/graphql/index.vue index f0a8a9fb1..b98258310 100644 --- a/components/collections/graphql/index.vue +++ b/components/collections/graphql/index.vue @@ -4,7 +4,7 @@ :class="{ 'rounded border border-divider': savingMode }" >
diff --git a/components/collections/index.vue b/components/collections/index.vue index cc0f28907..1bae2246b 100644 --- a/components/collections/index.vue +++ b/components/collections/index.vue @@ -5,7 +5,7 @@ >
-
+
- +
+ diff --git a/components/realtime/Socketio.vue b/components/realtime/Socketio.vue index f56cfda30..e90b021ee 100644 --- a/components/realtime/Socketio.vue +++ b/components/realtime/Socketio.vue @@ -21,11 +21,11 @@ flex-1 text-secondaryDark w-full - py-1 + py-2 px-4 transition truncate - focus:outline-none focus:border-accent + focus:border-accent focus:outline-none " :placeholder="$t('url')" @keyup.enter="urlValid ? toggleConnection() : null" @@ -41,11 +41,11 @@ flex-1 text-secondaryDark w-full - py-1 + py-2 px-4 transition truncate - focus:outline-none focus:border-accent + focus:border-accent focus:outline-none " spellcheck="false" /> diff --git a/components/realtime/Sse.vue b/components/realtime/Sse.vue index 5b3b7e7c7..5b66f6b61 100644 --- a/components/realtime/Sse.vue +++ b/components/realtime/Sse.vue @@ -16,7 +16,7 @@ font-semibold font-mono text-secondaryDark w-full - py-1 + py-2 px-4 transition truncate diff --git a/components/realtime/Websocket.vue b/components/realtime/Websocket.vue index ff3068bc1..248f5e9ff 100644 --- a/components/realtime/Websocket.vue +++ b/components/realtime/Websocket.vue @@ -16,11 +16,11 @@ font-semibold font-mono text-secondaryDark w-full - py-1 + py-2 px-4 transition truncate - focus:outline-none focus:border-accent + focus:border-accent focus:outline-none " type="url" spellcheck="false" @@ -45,8 +45,8 @@ bg-primary border-b border-dividerLight flex flex-1 + top-upperPrimaryStickyFold pl-4 - top-16 z-10 sticky items-center diff --git a/components/smart/FontSizePicker.vue b/components/smart/FontSizePicker.vue index 031e23a6b..7ee4b8f81 100644 --- a/components/smart/FontSizePicker.vue +++ b/components/smart/FontSizePicker.vue @@ -18,13 +18,9 @@ :label="`${fontSizes.find(({ code }) => code == active.code).name}`" /> - - -
- +
-
+
@@ -408,7 +416,7 @@
- +