Skip to content

Commit e17c584

Browse files
committed
Fixed the css of cursors
1 parent 70fb480 commit e17c584

7 files changed

Lines changed: 28 additions & 28 deletions

File tree

_layouts/simulateur.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<style>
33
@import 'css/nav.css';
44
@import 'css/dialog.css';
5-
@import 'css/main.css';
5+
@import 'css/layout-sim.css';
66
@import 'css/numDisplay.css';
77
@import 'css/cursors.css';
88
@import 'css/pannel.css';

css/cursors.sass

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,17 @@
1818

1919
.cursCont
2020
display: flex
21-
justify-content: stretch
22-
gap: 20px
21+
align-items: space-between
22+
gap: 10px
23+
flex-wrap: wrap
24+
padding: 5px
2325

2426
.cursCtrl
27+
margin: 0px
2528
display: flex
2629
align-items: center
2730
flex-grow: 2
2831
gap: 3px
32+
2933
input
3034
flex-grow: 2
31-
32-
@media(width < 900px)
33-
.cursCont
34-
display: flex
35-
flex-direction: column
36-
justify-content: stretch
37-
gap: 5px

css/main.sass renamed to css/layout-sim.sass

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ body
1010
padding: 0px
1111

1212
main
13-
overflow: hidden
1413
box-sizing: border-box
1514
display: flex
1615
justify-content: space-between
1716
flex-direction: row-reverse
17+
flex-wrap: none
1818
margin: 0px
1919

2020
.waveformsContainer
@@ -23,6 +23,7 @@ main
2323
width: 100%
2424
max-width: 8in
2525
display: flex
26+
flex-shrink: 5
2627
flex-direction: column
2728

2829
svg

css/nav.sass

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
11
---
22
---
33
@keyframes flash
4-
0%
5-
border: 1px solid white
6-
box-shadow: 1px 1px 2px white
7-
50%
8-
border: 1px solid gainsboro
9-
box-shadow: 1px 1px 2px silver
104
100%
11-
border: 1px solid white
12-
box-shadow: 1px 1px 2px white
5+
fill: blue
136

147
nav
158
position: sticky
@@ -32,12 +25,18 @@ nav
3225
border-radius: 5px
3326
padding: 5px
3427
transition: 0.9s
28+
text-align: center
29+
svg
30+
vertical-align: middle
31+
fill: black
32+
height: 30px
3533
a
36-
animation: flash 1.5s ease-in-out
34+
svg
35+
animation: flash .75s linear alternate 4
3736

3837
button:hover, a:hover
39-
border: 1px solid gainsboro
40-
box-shadow: 1px 1px 2px silver
38+
svg
39+
fill: navy
4140

4241
button:disabled, a.disabled
4342
display: none
@@ -46,7 +45,6 @@ nav
4645
vertical-align: middle
4746
fill: black
4847
height: 1.8em
49-
width: 1.8em
5048

5149
div
5250
flex-basis: 500px

css/numDisplay.sass

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
---
33
.numDisplayContainer
44
width: max-content
5+
display: flex
6+
flex-direction: column
7+
gap: 8px
58
flex-shrink: 0
69
padding: 10px
710
height: max-content
@@ -12,7 +15,6 @@
1215
background: hsla(0, 0%, 100%, 0.9)
1316
padding: 8px
1417
border-radius: 8px
15-
margin-bottom: 5px
1618
height: 3.5em
1719

1820
.value
@@ -21,9 +23,7 @@
2123

2224
@media(width < 500px)
2325
.numDisplayContainer
24-
width: max-content
25-
display: flex
26-
gap: 5px
26+
flex-direction: row
2727
flex-shrink: 0
2828
padding: 10px
2929
height: max-content

src/animatedDisplay.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ export class display {
339339

340340
this.dwlLnk.classList.remove('disabled');
341341
this.dwlLnk.href = this.dataUrl;
342-
342+
10
343343
this.cursTbl = new cursTable(this.datasets);
344344
this.addCursor(0);
345345
this.addCursor(1);
@@ -348,6 +348,8 @@ export class display {
348348
this.fillCursTbl(0);
349349
this.fillCursTbl(1);
350350
pannel.append(this.cursTbl.container);
351+
console.log("Redrawing");
352+
this.redraw();
351353
}
352354
}
353355

@@ -451,6 +453,7 @@ function dwlLnk () {
451453
let lnk = document.createElement('a');
452454
lnk.append(icon('Télécharger'));
453455
lnk.download = 'simvent_data.csv';
456+
lnk.title = translate('Download data');
454457

455458
return lnk;
456459
}

src/translate.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ const uiFr = {
1111
'Control pannel': 'Paneau de contrôle',
1212
'Completed tasks': 'Tâches complétées',
1313
Cursors: 'Curseurs',
14+
'Download data': 'Télécharger les données',
1415
ESC: 'Échap',
1516
Lung: 'Poumons',
1617
'Ongoing tasks': 'Tâches en cours',

0 commit comments

Comments
 (0)