Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix <select> dropdown background color #73

Merged
merged 3 commits into from
Mar 19, 2024
Merged

Fix <select> dropdown background color #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a20432
Remove .form-control on select elements
erdnaxe Mar 15, 2024
8f700aa
main.scss: keep bootstrap background color
erdnaxe Mar 15, 2024
1e1a452
yarn build
erdnaxe Mar 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions assets/scss/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,9 @@ blockquote {
font-size: 50%;
}

select.form-control {
height: auto !important;
}

.form-select {
background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e")
no-repeat right 0.75rem center/8px 10px !important;
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e");
background-size: 8px 10px;
}

// HMM
Expand Down
2 changes: 1 addition & 1 deletion static/assets/main.0aaf0d88.css → static/assets/main.af2a52b9.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
]
},
"assets/scss/main.scss": {
"file": "assets/main.0aaf0d88.css",
"file": "assets/main.af2a52b9.css",
"src": "assets/scss/main.scss",
"isEntry": true
}
Expand Down
2 changes: 1 addition & 1 deletion templates/macros/forms.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
{% endif %}
</div>

{{ field(class="form-control form-select") }}
{{ field(class="form-select") }}

{% if show_descriptions %}
{% if field.description %}
Expand Down
4 changes: 2 additions & 2 deletions templates/settings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ <h1>

<div class="mb-3">
<b>{{ form.language.label(class="form-label") }}</b>
{{ form.language(class="form-control form-select", value=language) }}
{{ form.language(class="form-select", value=language) }}
</div>

<hr>
Expand All @@ -79,7 +79,7 @@ <h1>
</div>
<div class="mb-3">
<b>{{ form.country.label(class="form-label") }}</b>
{{ form.country(class="form-control form-select", value=country) }}
{{ form.country(class="form-select", value=country) }}
</div>

<hr>
Expand Down
4 changes: 2 additions & 2 deletions templates/teams/private.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ <h2 class="modal-action text-center w-100">{% trans %}Edit Team{% endtrans %}</h

<div class="mb-2">
<b>{{ form.country.label(clas="mb-2") }}</b>
{{ form.country(class="form-control form-select") }}
{{ form.country(class="form-select") }}
<small class="form-text text-muted">
{{ form.country.description }}
</small>
Expand Down Expand Up @@ -114,7 +114,7 @@ <h2 class="modal-action text-center w-100">{% trans %}Choose Captain{% endtrans
{# Append members to the select choices #}
{% set _ = form.captain_id.choices.append((member.id, member.name)) %}
{% endfor %}
{{ form.captain_id(class="form-control form-select mb-2") }}
{{ form.captain_id(class="form-select mb-2") }}
</div>
<div id="results">
<div
Expand Down
2 changes: 1 addition & 1 deletion templates/teams/teams.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ <h6 class="text-muted text-center pb-3">
{% with form = Forms.teams.PublicTeamSearchForm(field=field, q=q) %}
<form method="GET" class="row justify-content-around align-items-center">
<div class="mb-3 col-md-2">
{{ form.field(class="form-control form-select w-100") }}
{{ form.field(class="form-select w-100") }}
</div>

<div class="mb-3 col-md-8">
Expand Down
2 changes: 1 addition & 1 deletion templates/users/users.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ <h6 class="text-muted text-center pb-3">
{% with form = Forms.users.PublicUserSearchForm(field=field, q=q) %}
<form method="GET" class="row justify-content-around align-items-center">
<div class="mb-3 col-md-2">
{{ form.field(class="form-control form-select w-100") }}
{{ form.field(class="form-select w-100") }}
</div>
<div class="mb-3 col-md-8">
{{ form.q(class="form-control w-100", placeholder=form.q.description) }}
Expand Down
Loading