merge
This commit is contained in:
parent
06aef5beb3
commit
4ae4a6d509
10 changed files with 68 additions and 43 deletions
|
|
@ -1,11 +1,5 @@
|
|||
.settings-section {
|
||||
|
||||
margin-top: 3em;
|
||||
|
||||
|
||||
// .cons
|
||||
|
||||
|
||||
margin: var(--space-m) 0;
|
||||
|
||||
h2 {
|
||||
margin-bottom: var(--space);
|
||||
|
|
@ -14,10 +8,9 @@
|
|||
font-size: 1.4rem;
|
||||
border-bottom: 1px solid var(--color-200);
|
||||
color: var(--color-800);
|
||||
|
||||
}
|
||||
|
||||
.infos{
|
||||
.infos {
|
||||
font-size: 0.8rem;
|
||||
color: var(--color-interface-400);
|
||||
}
|
||||
|
|
@ -30,14 +23,10 @@
|
|||
padding: var(--space-xs) 0;
|
||||
|
||||
h3 {
|
||||
margin-top: calc(var(--space-xs)*1.5);
|
||||
margin-bottom: calc(var(--space-xs)*2);
|
||||
font-size: 1rem;
|
||||
font-weight: 600;
|
||||
|
||||
margin-top: calc(var(--space-xs) * 1.5);
|
||||
margin-bottom: calc(var(--space-xs) * 2);
|
||||
font-size: 1rem;
|
||||
font-weight: 600;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
@ -5,7 +5,9 @@ input[type="number"] {
|
|||
border: 1px solid var(--color-interface-200);
|
||||
background-color: var(--color-interface-100);
|
||||
font-family: var(--sans-serif);
|
||||
color: var(--color-txt);
|
||||
font-size: 1rem;
|
||||
padding-left: 0.5ch;
|
||||
// min-width: var(--input-w);
|
||||
// width: 100%;
|
||||
// padding: 0 1ch;
|
||||
|
|
@ -80,10 +82,22 @@ input[type="number"] {
|
|||
label{
|
||||
font-weight: 400;
|
||||
margin-left: 0.75ch;
|
||||
color: var(--color-txt);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.field-text-size{
|
||||
input[type="number"]{
|
||||
width: var(--input-w-small);
|
||||
padding-left: 0.75ch;
|
||||
}
|
||||
input[type="range"]{
|
||||
flex-grow: 2;
|
||||
flex-shrink: 2;
|
||||
}
|
||||
}
|
||||
|
||||
.field-margin, .field-size{
|
||||
display: inline-grid;
|
||||
width: calc(50% - 1ch);
|
||||
|
|
@ -188,9 +202,13 @@ input[type="number"] {
|
|||
top: 0;
|
||||
|
||||
button{
|
||||
height: calc(var(--input-h)*0.6);
|
||||
height: calc(var(--input-h)*0.5);
|
||||
cursor: pointer;
|
||||
padding: 0;
|
||||
svg{
|
||||
width: 10px;
|
||||
height: auto;
|
||||
}
|
||||
svg path{
|
||||
fill: var(--color-interface-600);
|
||||
}
|
||||
|
|
@ -202,8 +220,9 @@ input[type="number"] {
|
|||
}
|
||||
.spinner-down{
|
||||
svg{
|
||||
position: relative;
|
||||
top: -2px;
|
||||
|
||||
// position: relative;
|
||||
// top: -2px;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
|
||||
|
||||
--color-txt: var(--color-interface-800);
|
||||
--color-txt: var(--color-interface-900);
|
||||
--color-panel-bg: var(--color-interface-050);
|
||||
|
||||
--color-page-highlight: #ff8a50;
|
||||
|
|
@ -20,6 +20,8 @@
|
|||
--space-xs: 0.5rem;
|
||||
--space-s: 1rem;
|
||||
--space: 1.5rem;
|
||||
--space-m: 2rem;
|
||||
--space-big: 3em;
|
||||
|
||||
--curve: cubic-bezier(0.86, 0, 0.07, 1);
|
||||
|
||||
|
|
@ -34,4 +36,5 @@
|
|||
font-size: 14px;
|
||||
|
||||
--panel-w: 540px;
|
||||
--panel-nav-h: 60px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -223,7 +223,7 @@ img {
|
|||
:root {
|
||||
--color-browngray-050: #f5f3f0;
|
||||
--color-browngray-200: #d0c4ba;
|
||||
--color-txt: var(--color-interface-800);
|
||||
--color-txt: var(--color-interface-900);
|
||||
--color-panel-bg: var(--color-interface-050);
|
||||
--color-page-highlight: #ff8a50;
|
||||
--color-purple: #7136ff;
|
||||
|
|
@ -231,6 +231,8 @@ img {
|
|||
--space-xs: 0.5rem;
|
||||
--space-s: 1rem;
|
||||
--space: 1.5rem;
|
||||
--space-m: 2rem;
|
||||
--space-big: 3em;
|
||||
--curve: cubic-bezier(0.86, 0, 0.07, 1);
|
||||
--sans-serif: "DM Sans", sans-serif;
|
||||
--mono: "Inconsolata", monospace;
|
||||
|
|
@ -240,6 +242,7 @@ img {
|
|||
--label-w: 18ch;
|
||||
font-size: 14px;
|
||||
--panel-w: 540px;
|
||||
--panel-nav-h: 60px;
|
||||
}
|
||||
|
||||
body {
|
||||
|
|
@ -273,7 +276,9 @@ input[type=number] {
|
|||
border: 1px solid var(--color-interface-200);
|
||||
background-color: var(--color-interface-100);
|
||||
font-family: var(--sans-serif);
|
||||
color: var(--color-txt);
|
||||
font-size: 1rem;
|
||||
padding-left: 0.5ch;
|
||||
}
|
||||
|
||||
.field {
|
||||
|
|
@ -333,6 +338,16 @@ input[type=number] {
|
|||
.field-font .field-checkbox label {
|
||||
font-weight: 400;
|
||||
margin-left: 0.75ch;
|
||||
color: var(--color-txt);
|
||||
}
|
||||
|
||||
.field-text-size input[type=number] {
|
||||
width: var(--input-w-small);
|
||||
padding-left: 0.75ch;
|
||||
}
|
||||
.field-text-size input[type=range] {
|
||||
flex-grow: 2;
|
||||
flex-shrink: 2;
|
||||
}
|
||||
|
||||
.field-margin, .field-size {
|
||||
|
|
@ -421,23 +436,22 @@ input[type=number] {
|
|||
top: 0;
|
||||
}
|
||||
.number-input .spinner-buttons button {
|
||||
height: calc(var(--input-h) * 0.6);
|
||||
height: calc(var(--input-h) * 0.5);
|
||||
cursor: pointer;
|
||||
padding: 0;
|
||||
}
|
||||
.number-input .spinner-buttons button svg {
|
||||
width: 10px;
|
||||
height: auto;
|
||||
}
|
||||
.number-input .spinner-buttons button svg path {
|
||||
fill: var(--color-interface-600);
|
||||
}
|
||||
.number-input .spinner-buttons button:hover svg path {
|
||||
fill: var(--color-interface-900);
|
||||
}
|
||||
.number-input .spinner-buttons .spinner-down svg {
|
||||
position: relative;
|
||||
top: -2px;
|
||||
}
|
||||
|
||||
.settings-section {
|
||||
margin-top: 3em;
|
||||
margin: var(--space-m) 0;
|
||||
}
|
||||
.settings-section h2 {
|
||||
margin-bottom: var(--space);
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
2
public/vendor/composer/autoload_psr4.php
vendored
2
public/vendor/composer/autoload_psr4.php
vendored
|
|
@ -16,7 +16,7 @@ return array(
|
|||
'PHPMailer\\PHPMailer\\' => array($vendorDir . '/phpmailer/phpmailer/src'),
|
||||
'League\\ColorExtractor\\' => array($vendorDir . '/league/color-extractor/src'),
|
||||
'Laminas\\Escaper\\' => array($vendorDir . '/laminas/laminas-escaper/src'),
|
||||
'Kirby\\' => array($vendorDir . '/getkirby/composer-installer/src', $baseDir . '/kirby/src'),
|
||||
'Kirby\\' => array($baseDir . '/kirby/src', $vendorDir . '/getkirby/composer-installer/src'),
|
||||
'Composer\\Semver\\' => array($vendorDir . '/composer/semver/src'),
|
||||
'Base32\\' => array($vendorDir . '/christian-riesen/base32/src'),
|
||||
);
|
||||
|
|
|
|||
4
public/vendor/composer/autoload_static.php
vendored
4
public/vendor/composer/autoload_static.php
vendored
|
|
@ -96,8 +96,8 @@ class ComposerStaticInit0b7fb803e22a45eb87e24172337208aa
|
|||
),
|
||||
'Kirby\\' =>
|
||||
array (
|
||||
0 => __DIR__ . '/..' . '/getkirby/composer-installer/src',
|
||||
1 => __DIR__ . '/../..' . '/kirby/src',
|
||||
0 => __DIR__ . '/../..' . '/kirby/src',
|
||||
1 => __DIR__ . '/..' . '/getkirby/composer-installer/src',
|
||||
),
|
||||
'Composer\\Semver\\' =>
|
||||
array (
|
||||
|
|
|
|||
12
public/vendor/composer/installed.php
vendored
12
public/vendor/composer/installed.php
vendored
|
|
@ -1,9 +1,9 @@
|
|||
<?php return array(
|
||||
'root' => array(
|
||||
'name' => 'getkirby/plainkit',
|
||||
'pretty_version' => '5.1.4',
|
||||
'version' => '5.1.4.0',
|
||||
'reference' => null,
|
||||
'pretty_version' => 'dev-main',
|
||||
'version' => 'dev-main',
|
||||
'reference' => '76274fff04c54514230ad2bb0aca362139618411',
|
||||
'type' => 'project',
|
||||
'install_path' => __DIR__ . '/../../',
|
||||
'aliases' => array(),
|
||||
|
|
@ -65,9 +65,9 @@
|
|||
'dev_requirement' => false,
|
||||
),
|
||||
'getkirby/plainkit' => array(
|
||||
'pretty_version' => '5.1.4',
|
||||
'version' => '5.1.4.0',
|
||||
'reference' => null,
|
||||
'pretty_version' => 'dev-main',
|
||||
'version' => 'dev-main',
|
||||
'reference' => '76274fff04c54514230ad2bb0aca362139618411',
|
||||
'type' => 'project',
|
||||
'install_path' => __DIR__ . '/../../',
|
||||
'aliases' => array(),
|
||||
|
|
|
|||
|
|
@ -128,11 +128,11 @@ nav {
|
|||
position: relative;
|
||||
left: calc(var(--panel-w) * -1);
|
||||
|
||||
padding: 4rem 0;
|
||||
|
||||
background-color: var(--color-panel-bg);
|
||||
box-shadow: -5px 0px 12px;
|
||||
|
||||
|
||||
transition: left 0.3s var(--curve);
|
||||
pointer-events: all;
|
||||
}
|
||||
|
|
@ -142,10 +142,10 @@ nav {
|
|||
}
|
||||
|
||||
.tab-panel {
|
||||
height: 100%;
|
||||
height: calc(100% - var(--panel-nav-h)*2);
|
||||
overflow-y: auto;
|
||||
overflow-x: hidden;
|
||||
padding: 0 2em;
|
||||
// padding-left: 1em;
|
||||
margin-top: var(--panel-nav-h);
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
<!-- Taille du texte -->
|
||||
<div class="settings-subsection">
|
||||
<div class="field">
|
||||
<div class="field field-text-size">
|
||||
<label for="text-size-range" class="label-with-tooltip" data-css="font-size">Taille du texte</label>
|
||||
<InputWithUnit
|
||||
v-model="fontSize"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue