Skip to content

Commit 6d0351c

Browse files
committed
Improve styles
1 parent eb45ab7 commit 6d0351c

7 files changed

Lines changed: 68 additions & 17 deletions

File tree

src/app/components/App.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,8 @@ export default {
197197
border-left-width: 4px;
198198
-webkit-border-radius: 6px 2px;
199199
-webkit-box-shadow:
200-
inset 0 0 0 0px rgba(128, 128, 128, 0.2),
201-
inset 0 0 0 4px rgba(128, 128, 128, 0.2);
200+
inset 0 0 0 0px rgba(112, 112, 112, 0.35),
201+
inset 0 0 0 4px rgba(112, 112, 112, 0.35);
202202
}
203203
::-webkit-scrollbar-track-piece {
204204
margin: 4px 0;

src/app/components/LanguageModal.vue

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
<h5 class="modal-title" id="staticBackdropLabel_language" v-html="$t('simulator:settings.language.title')"></h5>
2424
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
2525
</div>
26-
<div class="modal-body">
27-
<div class="d-flex align-items-center">
26+
<div class="modal-body language-modal-body">
27+
<div class="language-header d-flex align-items-center">
2828
<div class="d-flex w-100">
2929
<div class="col" v-html="$t('simulator:settings.language.title')"></div>
3030
<div class="col text-end" v-html="$t('simulator:languageModal.translatedFraction')"></div>
@@ -43,15 +43,18 @@
4343
</div>
4444
</a>
4545
</div>
46-
47-
<small>
48-
<a href="https://hosted.weblate.org/engage/ray-optics-simulation/" target="_blank" v-html="$t('simulator:languageModal.helpTranslate')">
49-
</a>
50-
</small>
5146
</div>
52-
<div class="modal-footer">
53-
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" v-html="$t('simulator:common.closeButton')">
54-
</button>
47+
<div class="modal-footer d-flex justify-content-between">
48+
<div>
49+
<small>
50+
<a href="https://hosted.weblate.org/engage/ray-optics-simulation/" target="_blank" v-html="$t('simulator:languageModal.helpTranslate')">
51+
</a>
52+
</small>
53+
</div>
54+
<div>
55+
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" v-html="$t('simulator:common.closeButton')">
56+
</button>
57+
</div>
5558
</div>
5659
</div>
5760
</div>
@@ -122,7 +125,17 @@ export default {
122125

123126
<style scoped>
124127
.language-list {
125-
margin: 1rem 0;
128+
margin: 0.25rem 0 1rem 0;
129+
}
130+
131+
.language-header {
132+
padding: 0 0.75rem;
133+
}
134+
135+
.language-modal-body {
136+
max-height: 70vh;
137+
overflow-y: auto;
138+
padding-right: 8px;
126139
}
127140
128141
.modal-backdrop {

src/app/components/toolbar/LayoutAidsBar.vue

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<template>
1818
<div v-if="layout === 'desktop'" class="col-auto d-none d-xxl-block">
1919
<div class="row justify-content-center">
20-
<div class="btn-group" role="group">
20+
<div class="btn-group layout-aids-controls" role="group">
2121
<input type="checkbox" class="btn-check" id="showGrid" autocomplete="off" v-model="showGrid" @click="e => e.target.blur()">
2222
<label id="showGrid_label" class="btn shadow-none btn-secondary" for="showGrid" v-tooltip-popover="{ title: $t('simulator:settings.layoutAids.showGrid') }">
2323
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-grid-3x3" viewBox="0 0 16 16">
@@ -116,4 +116,10 @@ export default {
116116
}
117117
}
118118
}
119-
</script>
119+
</script>
120+
121+
<style>
122+
.layout-aids-controls {
123+
width: max-content;
124+
}
125+
</style>

src/app/components/toolbar/SettingsList.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,7 @@ export default {
281281
<style scoped>
282282
.advanced-help {
283283
font-size: 9pt;
284+
max-width: 280px;
284285
}
285286
286287
#showAdvancedSettings {

src/app/components/toolbar/Toolbar.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,8 @@ export default {
301301
}
302302
303303
#more-options-dropdown {
304-
width:350px;
304+
min-width: 300px;
305+
width: max-content;
305306
max-height: 80vh;
306307
overflow-y: auto;
307308
}

src/app/components/toolbar/controls/SettingsWarning.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
alignItems: 'center',
2222
fontSize: '0.875rem',
2323
paddingLeft: '10px',
24-
marginRight: layout === 'mobile' ? '0' : '5px'
24+
width: '300px',
25+
marginLeft: 'auto',
26+
marginRight: 'auto'
2527
}"
2628
>
2729
<svg

src/pages/modules.hbs

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,34 @@
7373
font-size: 12pt;
7474
}
7575
76+
::-webkit-scrollbar {
77+
background: none;
78+
width: 12px;
79+
height: 12px;
80+
}
81+
::-webkit-scrollbar-thumb {
82+
border: solid 0 rgba(0, 0, 0, 0);
83+
border-right-width: 4px;
84+
border-left-width: 4px;
85+
-webkit-border-radius: 6px 2px;
86+
-webkit-box-shadow:
87+
inset 0 0 0 0px rgba(112, 112, 112, 0.35),
88+
inset 0 0 0 4px rgba(112, 112, 112, 0.35);
89+
}
90+
::-webkit-scrollbar-track-piece {
91+
margin: 4px 0;
92+
}
93+
::-webkit-scrollbar-thumb:hover {
94+
border-right-width: 3px;
95+
border-left-width: 3px;
96+
-webkit-box-shadow:
97+
inset 0 0 0 0px rgba(128,128,128,0.9),
98+
inset 0 0 0 4px rgba(128,128,128,0.9);
99+
}
100+
::-webkit-scrollbar-corner {
101+
background: transparent;
102+
}
103+
76104
</style>
77105
</head>
78106

0 commit comments

Comments
 (0)