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

Small enhancements #101

Merged
merged 3 commits into from
Dec 29, 2023
+20 −109
Merged

Small enhancements #101

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
3563d07
Use css variables for navbar customization
pehala Dec 29, 2023
f139b52
Enhance "Search" translation
pehala Dec 29, 2023
aa04431
Add margin to inputgroups
pehala Dec 29, 2023
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
2 changes: 1 addition & 1 deletion backend/locale/cs/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ msgstr "Zabránit uspání"

#: backend/templates/songs/index.html:77
msgid "Search"
msgstr "Hledat"
msgstr "Vyhledávání"

#: backend/templates/songs/index.html:79
msgid "Number, text or author"
Expand Down
6 changes: 3 additions & 3 deletions backend/templates/songs/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ <h6 class="d-inline" ><%:author%></h6>
</span>
</a>
<div id="id<%:number%>" class="accordion-collapse collapse" data-bs-parent="#datatable">
<div class="input-group mb-3">
<div class="input-group mb-3 mt-1">
<%if link%>
<a href="<%:link%>" class="btn btn-primary" role="button" aria-pressed="true">
<i class="icon-youtube-play"></i>
Expand All @@ -83,14 +83,14 @@ <h6 class="d-inline" ><%:author%></h6>
</div>
</script>
<div>
<div class="input-group mb-2 pe-sm-1">
<div class="input-group pe-sm-1">
<div class="input-group-prepend">
<div class="input-group-text">{% trans "Search" %}</div>
</div>
<input type="text" class="form-control" id="searchInput" placeholder="{% trans "Number, text or author" %}">
</div>
</div>
<table id="datatable" class="accordion accordion-flush w-100 table table-borderless">
<table id="datatable" class="accordion accordion-flush w-100 h-100 table table-borderless">
<thead class="d-none"></thead>
<tbody class="w-100 m-0"></tbody>
</table>
Expand Down
4 changes: 0 additions & 4 deletions frontend/static/_colors.sass
View file
Open in desktop

This file was deleted.

97 changes: 0 additions & 97 deletions frontend/static/navbar4.sass
View file
Open in desktop

This file was deleted.

15 changes: 14 additions & 1 deletion frontend/static/styles.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
@import colors
$bgDefault : #f9f9f9
$bgHighlight : #c4c2bd
$colDefault : #7793f3
$colHighlight : #e81c1c
$border-color: $bgHighlight

.navbar
--bs-navbar-color: #{$colDefault}
--bs-navbar-hover-color: #{$colHighlight}
--bs-navbar-active-color: #{$colHighlight}
--bs-navbar-brand-color: #{$colDefault}
--bs-navbar-brand-hover-color: #{$colHighlight}

.dropdown-menu
--bs-dropdown-link-color: #{$colDefault}

.chord
position: absolute
line-height: 0
Expand Down
5 changes: 2 additions & 3 deletions frontend/templates/base/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,12 @@
defer></script>
<link rel="stylesheet" type="text/css" href="{% static 'icons/css/songs.css' %}">
<link rel="stylesheet" type="text/css" href="{% sass_src 'styles.sass' %}">
<link rel="stylesheet" type="text/css" href="{% sass_src 'navbar4.sass' %}">
{% block extra_head %} {% endblock %}
</head>
<body>
<div>
<nav class="navbar navbar-expand-lg navbar-light">
<a class="navbar-brand ms-3" href="#">{{ request.tenant.display_name }}</a>
<nav class="navbar navbar-expand-lg">
<a class="navbar-brand ms-3" href="{{ reqeust.tenant.index_redirect }}">{{ request.tenant.display_name }}</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent"
aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
Expand Down