Align design of Change Notetype screen with rest of UI (#1522)

* Remove background and border from scrollArea

* Fix 1px of background text showing above template header on scroll

I couldn't figure out the reason for this "clipping" issue. What I tried:
- check HTML structure for any elements that might add extra padding/margin
- remove the 1px border of the header

* Adjust spacing to be more in line with rest of UI
This commit is contained in:
Matthias Metelka 2021-12-04 05:53:16 +01:00 committed by GitHub
parent 80e6e7ab62
commit 933ee647bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 11 deletions

View file

@ -5,7 +5,6 @@
--text-fg: black; --text-fg: black;
--window-bg: #ececec; --window-bg: #ececec;
--frame-bg: white; --frame-bg: white;
--pane-bg: #e5e5e5;
--border: #aaa; --border: #aaa;
--medium-border: #b6b6b6; --medium-border: #b6b6b6;
--faint-border: #e7e7e7; --faint-border: #e7e7e7;
@ -45,7 +44,6 @@
--text-fg: white; --text-fg: white;
--window-bg: #2f2f31; --window-bg: #2f2f31;
--frame-bg: #3a3a3a; --frame-bg: #3a3a3a;
--pane-bg: #3a3a3a;
--border: #777; --border: #777;
--medium-border: #444; --medium-border: #444;
--faint-border: #29292b; --faint-border: #29292b;

View file

@ -12,7 +12,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
import NotetypeSelector from "./NotetypeSelector.svelte"; import NotetypeSelector from "./NotetypeSelector.svelte";
import StickyNav from "./StickyNav.svelte"; import StickyNav from "./StickyNav.svelte";
import Mapper from "./Mapper.svelte"; import Mapper from "./Mapper.svelte";
import Spacer from "../components/Spacer.svelte";
export let state: ChangeNotetypeState; export let state: ChangeNotetypeState;
$: info = state.info; $: info = state.info;
@ -21,7 +20,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
<div bind:offsetHeight={offset}> <div bind:offsetHeight={offset}>
<NotetypeSelector {state} /> <NotetypeSelector {state} />
<Spacer --height="1em" />
</div> </div>
<div id="scrollArea" style="--offset: {offset}px; --gutter-inline: 0.25rem;"> <div id="scrollArea" style="--offset: {offset}px; --gutter-inline: 0.25rem;">
@ -49,9 +47,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
#scrollArea { #scrollArea {
padding: 0; padding: 0;
overflow: hidden auto; overflow: hidden auto;
background: var(--pane-bg);
height: calc(100% - var(--offset)); height: calc(100% - var(--offset));
border: 1px solid var(--medium-border);
border-radius: 0.25rem;
} }
</style> </style>

View file

@ -27,7 +27,11 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
} }
</script> </script>
<StickyContainer --gutter-block="0.1rem"> <StickyContainer
--gutter-block="0.1rem"
--gutter-inline="0.25rem"
--sticky-borders="0 0 1px"
>
<ButtonToolbar class="justify-content-between" size={2.3} wrap={false}> <ButtonToolbar class="justify-content-between" size={2.3} wrap={false}>
<Item> <Item>
<ButtonGroupItem> <ButtonGroupItem>

View file

@ -27,7 +27,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
</script> </script>
<StickyContainer <StickyContainer
--sticky-bg={"var(--pane-bg)"} --sticky-top={ctx === MapContext.Template ? "-1px" : "0"}
--sticky-border="var(--border)" --sticky-border="var(--border)"
--sticky-borders="0px 0 1px" --sticky-borders="0px 0 1px"
> >

View file

@ -24,7 +24,7 @@ html {
} }
#main { #main {
padding: 0.5em 1em 1em 1em; padding: 0.5em 0.5em 1em 0.5em;
height: 100vh; height: 100vh;
} }

View file

@ -24,7 +24,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
<style lang="scss"> <style lang="scss">
.sticky-container { .sticky-container {
position: sticky; position: sticky;
top: 0; top: var(--sticky-top, 0);
bottom: 0; bottom: 0;
left: 0; left: 0;
right: 0; right: 0;