Sync merge manuel

This commit is contained in:
2023-03-09 23:49:37 +01:00
parent ac1da6e979
commit 3bf5beb67b
8 changed files with 194 additions and 199 deletions

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="675" height="675" version="1.1" viewBox="0 0 178.59 178.59" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<metadata>
<rdf:RDF>
<cc:Work rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
<dc:title/>
</cc:Work>
</rdf:RDF>
</metadata>
<circle cx="89.297" cy="89.297" r="4.6257" style="fill:#214478"/>
<g transform="matrix(.98563 -.98178 .98563 .98178 -87.392 88.66)">
<rect x="88.635" y="7.9375" width="1.3229" height="82.021" style="fill:#214478"/>
<path d="m88.635 72.76s-2.6458-1e-6 -2.6458-2.6458c-1e-6 -5.2917 1.2526-5.291 1.2149-13.168-0.01237-2.5872 1.4309-4.0295 1.4309-15.936 2e-6 -9.7014 0-29.104 0-29.104s-0.96823-1.3508-1.3297-2.5446c-0.65159-2.152 0.35906-1.9377 1.0888-4.0645 0.32001-0.93267 0.86732-5.2972 0.86732-5.2972s0.59836 4.3708 0.91836 5.3035c0.72973 2.1268 1.6581 1.9061 1.0065 4.0582-0.36144 1.1937-1.2284 2.5446-1.2284 2.5446v29.104c0 11.906 1.3229 13.229 1.2284 15.936-0.27485 7.8725 1.4174 7.8768 1.4174 13.168 1e-6 2.6458-2.6458 2.6458-2.6458 2.6458z" style="fill:#214478"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@ -78,15 +78,15 @@
--gradient-purple-black: linear-gradient(150deg, rgba(0, 0, 0, 0.7), rgba(100, 45, 124, 0.4), rgba(82, 17, 131, 0.3),rgba(100, 45, 124, 0.4), rgba(0, 0, 0, 0.7));
--gradient-silver-light: linear-gradient(30deg, rgba(61, 55, 93, 0.2), rgba(178, 179, 196, 0.1), rgba(59, 62, 63, 0.2), rgba(206, 204, 199, 0.1), rgba(61, 46, 49, 0.2));
--gradient-daylight: conic-gradient(
from 315deg,
hsla(50, 20%, 30%, 0.1) ,
hsla(50, 30%, 60%, 0.7) 25%,
hsla(50, 20%, 30%, 0.1) 50%,
hsla(250, 20%, 30%, 0.1) 50%,
hsla(250, 30%, 60%, 0.7) 75%,
hsla(250, 20%, 30%, 0.1)
from 0deg,
hsla(50, 50%, 80%, 0.7),
hsla(50, 50%, 80%, 0.1) 25%,
hsla(250, 50%, 20%, 0.1) 25%,
hsla(250, 50%, 20%, 0.5) 50%,
hsla(250, 50%, 20%, 0.1) 75%,
hsla(50, 50%, 80%, 0.1) 75%,
hsla(50, 50%, 80%, 0.7)
);
--gradient-daylight2: radial-gradient(210deg, hsla(50, 30%, 60%, 0.6), hsla(50, 20%, 30%, 0.1) 50%, hsla(250, 20%, 30%, 0.1) 50%, hsla(250, 30%, 60%, 0.6));
--background-custom-button: linear-gradient(to bottom, rgba(33, 55, 74, 0.988) 5%, rgba(21, 40, 51, 0.671) 100%);
--background-custom-button-hover: linear-gradient(to bottom, rgb(128, 0, 0) 5%, rgb(62, 1, 1) 100%);
@ -885,29 +885,46 @@ div.astro-roue {
}
div.astro-roue div.astro-heure {
position: absolute;
width: 2rem;
height: 2rem;
width: 1.8rem;
height: 1.8rem;
}
div.astro-roue div.astro-cercle1 {
position: absolute;
background: var(--gradient-daylight);
border: 0.2rem solid rgba(100, 45, 124, 0.6);
border-radius: calc(6rem);
top: calc(50% - 6rem);
left: calc(50% - 6rem);
width: calc(100% - 1rem);
height: calc(100% - 1rem);
}
div.astro-roue div.astro-cercle2 {
position: absolute;
border: 0.1rem solid rgba(100, 45, 124, 0.4);
border-radius: calc(6.1rem);
top: calc(50% - 6.1rem);
left: calc(50% - 6.1rem);
width: calc(100% - 0.8rem);
height: calc(100% - 0.8rem);
top: calc(50% - 4.5rem);
left: calc(50% - 4.5rem);
width: calc(100% - 4rem);
height: calc(100% - 4rem);
}
div.astro-roue div.astro-disque {
position: absolute;
border: none;
top: calc(50% - 4rem);
left: calc(50% - 4rem);
width: calc(100% - 5rem);
height: calc(100% - 5rem);
top: calc(50% - 3.4rem);
left: calc(50% - 3.4rem);
width: calc(100% - 6.2rem);
height: calc(100% - 6.2rem);
}
div.astro-roue div.astro-horloge {
div.astro-roue div.astro-horloge-heure {
position: absolute;
border: none;
top: calc(50% - 2.5rem);
left: calc(50% - 2.5rem);
width: calc(100% - 8rem);
height: calc(100% - 8rem);
}
div.astro-roue div.astro-horloge-minute {
position: absolute;
border: none;
top: calc(50% - 3.5rem);
@ -915,7 +932,22 @@ div.astro-roue div.astro-horloge {
width: calc(100% - 6rem);
height: calc(100% - 6rem);
}
div.astro-roue div:is(.astro-disque,.astro-horloge) img { border: none; }
div.astro-roue div.astro-ajustement {
position: absolute;
width: 0.8rem;
height: 0.8rem;
color: hsl(120, 50%, 15%);
font-size: 0.8rem;
text-align: center;
vertical-align: middle;
border-radius: 0.4rem;
background-color: hsla(300, 100%, 95%, 0.3);
}
div.astro-roue div.astro-disque img { border: none; }
div.astro-roue div:is(.astro-horloge-heure, .astro-horloge-minute) img {
border: none;
text-shadow: #403f3e;
}
div.astro-roue div.astro-heure img.astro-heure-img {
width: 2rem;
height: 2rem;
@ -925,37 +957,32 @@ div.astro-roue div.astro-heure img.astro-heure-img {
opacity: 0.9;
border: none;
}
div.astro-roue div.astro-heure.heure-12 { top: calc(50% - 1rem - 1.3rem); left: calc(50% - 1rem - 4.8rem); }
div.astro-roue div.astro-heure.heure-01 { top: calc(50% - 1rem - 3.5rem); left: calc(50% - 1rem - 3.5rem); }
div.astro-roue div.astro-heure.heure-02 { top: calc(50% - 1rem - 4.8rem); left: calc(50% - 1rem - 1.3rem); }
div.astro-roue div.astro-heure.heure-03 { top: calc(50% - 1rem - 4.8rem); left: calc(50% - 1rem + 1.3rem); }
div.astro-roue div.astro-heure.heure-04 { top: calc(50% - 1rem - 3.5rem); left: calc(50% - 1rem + 3.5rem); }
div.astro-roue div.astro-heure.heure-05 { top: calc(50% - 1rem - 1.3rem); left: calc(50% - 1rem + 4.8rem); }
div.astro-roue div.astro-heure.heure-06 { top: calc(50% - 1rem + 1.3rem); left: calc(50% - 1rem + 4.8rem); }
div.astro-roue div.astro-heure.heure-07 { top: calc(50% - 1rem + 3.5rem); left: calc(50% - 1rem + 3.5rem); }
div.astro-roue div.astro-heure.heure-08 { top: calc(50% - 1rem + 4.8rem); left: calc(50% - 1rem + 1.3rem); }
div.astro-roue div.astro-heure.heure-09 { top: calc(50% - 1rem + 4.8rem); left: calc(50% - 1rem - 1.3rem); }
div.astro-roue div.astro-heure.heure-10 { top: calc(50% - 1rem + 3.5rem); left: calc(50% - 1rem - 3.5rem); }
div.astro-roue div.astro-heure.heure-11 { top: calc(50% - 1rem + 1.3rem); left: calc(50% - 1rem - 4.8rem); }
div.astro-roue div.astro-ajustement {
position: absolute;
width: 1rem;
height: 1rem;
}
div.astro-roue div.astro-heure.heure-01 { top: calc(50% - 1rem + sin(-180deg) * 5rem); left: calc(50% - 1rem + cos(-180deg) * 5rem); }
div.astro-roue div.astro-heure.heure-02 { top: calc(50% - 1rem + sin(-150deg) * 5rem); left: calc(50% - 1rem + cos(-150deg) * 5rem); }
div.astro-roue div.astro-heure.heure-03 { top: calc(50% - 1rem + sin(-120deg) * 5rem); left: calc(50% - 1rem + cos(-120deg) * 5rem); }
div.astro-roue div.astro-heure.heure-04 { top: calc(50% - 1rem + sin(-90deg) * 5rem); left: calc(50% - 1rem + cos(-90deg) * 5rem); }
div.astro-roue div.astro-heure.heure-05 { top: calc(50% - 1rem + sin(-60deg) * 5rem); left: calc(50% - 1rem + cos(-60deg) * 5rem); }
div.astro-roue div.astro-heure.heure-06 { top: calc(50% - 1rem + sin(-30deg) * 5rem); left: calc(50% - 1rem + cos(-30deg) * 5rem); }
div.astro-roue div.astro-heure.heure-07 { top: calc(50% - 1rem + sin(-0deg) * 5rem); left: calc(50% - 1rem + cos(-0deg) * 5rem); }
div.astro-roue div.astro-heure.heure-08 { top: calc(50% - 1rem + sin(30deg) * 5rem); left: calc(50% - 1rem + cos(30deg) * 5rem); }
div.astro-roue div.astro-heure.heure-09 { top: calc(50% - 1rem + sin(60deg) * 5rem); left: calc(50% - 1rem + cos(60deg) * 5rem); }
div.astro-roue div.astro-heure.heure-10 { top: calc(50% - 1rem + sin(90deg) * 5rem); left: calc(50% - 1rem + cos(90deg) * 5rem); }
div.astro-roue div.astro-heure.heure-11 { top: calc(50% - 1rem + sin(120deg) * 5rem); left: calc(50% - 1rem + cos(120deg) * 5rem); }
div.astro-roue div.astro-heure.heure-12 { top: calc(50% - 1rem + sin(150deg) * 5rem); left: calc(50% - 1rem + cos(150deg) * 5rem); }
div.astro-roue div.astro-ajustement.ajustement-12 { top: calc(50% - 0.5rem - 0.8rem); left: calc(50% - 0.5rem - 2.9rem); }
div.astro-roue div.astro-ajustement.ajustement-01 { top: calc(50% - 0.5rem - 2.1rem); left: calc(50% - 0.5rem - 2.1rem); }
div.astro-roue div.astro-ajustement.ajustement-02 { top: calc(50% - 0.5rem - 2.9rem); left: calc(50% - 0.5rem - 0.8rem); }
div.astro-roue div.astro-ajustement.ajustement-03 { top: calc(50% - 0.5rem - 2.9rem); left: calc(50% - 0.5rem + 0.8rem); }
div.astro-roue div.astro-ajustement.ajustement-04 { top: calc(50% - 0.5rem - 2.1rem); left: calc(50% - 0.5rem + 2.1rem); }
div.astro-roue div.astro-ajustement.ajustement-05 { top: calc(50% - 0.5rem - 0.8rem); left: calc(50% - 0.5rem + 2.9rem); }
div.astro-roue div.astro-ajustement.ajustement-06 { top: calc(50% - 0.5rem + 0.8rem); left: calc(50% - 0.5rem + 2.9rem); }
div.astro-roue div.astro-ajustement.ajustement-07 { top: calc(50% - 0.5rem + 2.1rem); left: calc(50% - 0.5rem + 2.1rem); }
div.astro-roue div.astro-ajustement.ajustement-08 { top: calc(50% - 0.5rem + 2.9rem); left: calc(50% - 0.5rem + 0.8rem); }
div.astro-roue div.astro-ajustement.ajustement-09 { top: calc(50% - 0.5rem + 2.9rem); left: calc(50% - 0.5rem - 0.8rem); }
div.astro-roue div.astro-ajustement.ajustement-10 { top: calc(50% - 0.5rem + 2.1rem); left: calc(50% - 0.5rem - 2.1rem); }
div.astro-roue div.astro-ajustement.ajustement-11 { top: calc(50% - 0.5rem + 0.8rem); left: calc(50% - 0.5rem - 2.9rem); }
div.astro-roue div.astro-ajustement.heure-01 { top: calc(50% - 0.4rem + sin(180deg) * 3.9rem); left: calc(50% - 0.4rem + cos(180deg) * 3.9rem); }
div.astro-roue div.astro-ajustement.heure-02 { top: calc(50% - 0.4rem + sin(-150deg) * 3.9rem); left: calc(50% - 0.4rem + cos(-150deg) * 3.9rem); }
div.astro-roue div.astro-ajustement.heure-03 { top: calc(50% - 0.4rem + sin(-120deg) * 3.9rem); left: calc(50% - 0.4rem + cos(-120deg) * 3.9rem); }
div.astro-roue div.astro-ajustement.heure-04 { top: calc(50% - 0.4rem + sin(-90deg) * 3.9rem); left: calc(50% - 0.4rem + cos(-90deg) * 3.9rem); }
div.astro-roue div.astro-ajustement.heure-05 { top: calc(50% - 0.4rem + sin(-60deg) * 3.9rem); left: calc(50% - 0.4rem + cos(-60deg) * 3.9rem); }
div.astro-roue div.astro-ajustement.heure-06 { top: calc(50% - 0.4rem + sin(-30deg) * 3.9rem); left: calc(50% - 0.4rem + cos(-30deg) * 3.9rem); }
div.astro-roue div.astro-ajustement.heure-07 { top: calc(50% - 0.4rem + sin(0deg) * 3.9rem); left: calc(50% - 0.4rem + cos(0deg) * 3.9rem); }
div.astro-roue div.astro-ajustement.heure-08 { top: calc(50% - 0.4rem + sin(30deg) * 3.9rem); left: calc(50% - 0.4rem + cos(30deg) * 3.9rem); }
div.astro-roue div.astro-ajustement.heure-09 { top: calc(50% - 0.4rem + sin(60deg) * 3.9rem); left: calc(50% - 0.4rem + cos(60deg) * 3.9rem); }
div.astro-roue div.astro-ajustement.heure-10 { top: calc(50% - 0.4rem + sin(90deg) * 3.9rem); left: calc(50% - 0.4rem + cos(90deg) * 3.9rem); }
div.astro-roue div.astro-ajustement.heure-11 { top: calc(50% - 0.4rem + sin(120deg) * 3.9rem); left: calc(50% - 0.4rem + cos(120deg) * 3.9rem); }
div.astro-roue div.astro-ajustement.heure-12 { top: calc(50% - 0.4rem + sin(150deg) * 3.9rem); left: calc(50% - 0.4rem + cos(150deg) * 3.9rem); }
.window-app .window-content, .window-app.sheet .window-content .sheet-body{
background: rgb(245,245,240) url(img/bg_left.webp) no-repeat left top;