Przeglądaj źródła

Fixes wrapping

main
Eric Amodio 4 lat temu
rodzic
commit
49905127dc
3 zmienionych plików z 39 dodań i 31 usunięć
  1. +12
    -0
      src/webviews/apps/scss/settings.scss
  2. +13
    -15
      src/webviews/apps/settings/partials/views.commits.html
  3. +14
    -16
      src/webviews/apps/settings/partials/views.repositories.html

+ 12
- 0
src/webviews/apps/scss/settings.scss Wyświetl plik

@ -577,6 +577,18 @@ section {
}
}
.setting__input--inner-select {
& label:nth-of-type(1) {
flex-shrink: 0;
}
& label:nth-of-type(2) {
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
}
}
.setting__hint {
color: var(--color-foreground--75);
display: block;

+ 13
- 15
src/webviews/apps/settings/partials/views.commits.html Wyświetl plik

@ -27,7 +27,7 @@
<div class="section__content">
<div class="settings settings--fixed ml-1">
<div class="setting">
<div class="setting__input">
<div class="setting__input setting__input--inner-select">
<input
id="views.commits.showBranchComparison"
name="views.commits.showBranchComparison"
@ -35,20 +35,18 @@
value="working"
data-setting
/>
<label for="views.commits.showBranchComparison"
>Show a comparison of the
<div class="select-container">
<select
id="views.commits.showBranchComparison"
name="views.commits.showBranchComparison"
data-setting
data-enablement="views.commits.showBranchComparison !false"
>
<option value="branch">current branch</option>
<option value="working">working tree</option>
</select>
</div>
</label>
<label for="views.commits.showBranchComparison">Show a comparison of the </label>
<div class="select-container">
<select
id="views.commits.showBranchComparison"
name="views.commits.showBranchComparison"
data-setting
data-enablement="views.commits.showBranchComparison !false"
>
<option value="branch">current branch</option>
<option value="working">working tree</option>
</select>
</div>
<label for="views.commits.showBranchComparison"
>with a user-selected reference (branch, tag, etc)
</label>

+ 14
- 16
src/webviews/apps/settings/partials/views.repositories.html Wyświetl plik

@ -28,7 +28,7 @@
<div class="section__content">
<div class="settings settings--fixed ml-1">
<div class="setting" data-enablement="views.repositories.enabled">
<div class="setting__input">
<div class="setting__input setting__input--inner-select">
<input
id="views.repositories.showBranchComparison"
name="views.repositories.showBranchComparison"
@ -37,21 +37,19 @@
data-setting
disabled
/>
<label for="views.repositories.showBranchComparison"
>Show a comparison of the
<div class="select-container">
<select
id="views.repositories.showBranchComparison"
name="views.repositories.showBranchComparison"
data-setting
data-enablement="views.repositories.enabled &amp; views.repositories.showBranchComparison !false"
disabled
>
<option value="branch">current branch</option>
<option value="working">working tree</option>
</select>
</div>
</label>
<label for="views.repositories.showBranchComparison">Show a comparison of the </label>
<div class="select-container">
<select
id="views.repositories.showBranchComparison"
name="views.repositories.showBranchComparison"
data-setting
data-enablement="views.repositories.enabled &amp; views.repositories.showBranchComparison !false"
disabled
>
<option value="branch">current branch</option>
<option value="working">working tree</option>
</select>
</div>
<label for="views.repositories.showBranchComparison"
>with a user-selected reference (branch, tag, etc)
</label>

Ładowanie…
Anuluj
Zapisz