mirror of
https://github.com/ivabus/gui
synced 2025-06-07 15:50:27 +03:00
Merge branch 'styling-work' of https://github.com/teaxyz/gui into styling-work
This commit is contained in:
commit
05db005434
1 changed files with 4 additions and 0 deletions
|
@ -23,7 +23,11 @@
|
||||||
</header>
|
</header>
|
||||||
{/if}
|
{/if}
|
||||||
<figure />
|
<figure />
|
||||||
|
<<<<<<< HEAD
|
||||||
<div style="padding: 0vw 3.33vw;">
|
<div style="padding: 0vw 3.33vw;">
|
||||||
|
=======
|
||||||
|
<div style="padding: 0vw 6.667vw;">
|
||||||
|
>>>>>>> 67c9bb5a7f9db7158481cca1606f6bf441b90bad
|
||||||
<!-- all pages get inserted in this slot -->
|
<!-- all pages get inserted in this slot -->
|
||||||
<slot />
|
<slot />
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in a new issue