8000 Upgrade Bootstrap to version 5.2.2 by UnniKohonen · Pull Request #648 · NatLibFi/Annif · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Upgrade Bootstrap to version 5.2.2 #648

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

Merged
merged 1 commit into from
Nov 25, 2022
Merged

Upgrade Bootstrap to version 5.2.2 #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions annif/static/css/bootstrap.min.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion annif/static/css/bootstrap.min.css.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion annif/static/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,14 @@ h1 { font-size: 2rem; }
}
label, #suggestions {
border-top: 1px solid #343260;
margin-bottom: 0.5rem;
padding-top: 0.5rem;
text-transform: uppercase;
font-size: 1.1rem;
display: block;
}
.form-control { border-radius: 0px; }
.form-group { margin-bottom: 1rem; }
select {
-moz-appearance: none;
-webkit-appearance: none;
Expand Down Expand Up @@ -67,7 +69,7 @@ select {
border-width: 0px;
font-weight: 500;
}
#limit-buttons .active {
#limit-buttons .btn-check:checked + .btn {
background-color: #6280dc;
color: white;
}
Expand Down
8 changes: 4 additions & 4 deletions annif/static/js/bootstrap.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion annif/static/js/bootstrap.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 11 additions & 17 deletions annif/templates/home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<img src="static/img/annif-RGB.svg" class="img-fluid" alt="Annif">
</div>
<div class="col-10 my-auto px-0">
<h1 class="text-right my-0">Web UI</h1>
<h1 class="text-end my-0">Web UI</h1>
</div>
</div>
</div></header>
Expand Down Expand Up @@ -158,22 +158,16 @@ <h2 v-if="problem.hasTitle()"><% problem.title %></h2>
}
},
template: '<div class="form-group">\
<label>Max # of suggestions</label>\
<div id="limit-buttons" class="btn-group btn-group-toggle" data-toggle="buttons" @click="handleLimitSelected">\
<label class="btn btn-secondary">\
<input v-bind="limit" type="radio" name="limit" value="10" checked>\
10\
</label>\
<label class="btn btn-secondary">\
<input v-bind="limit" type="radio" name="limit" value="15">\
15\
</label>\
<label class="btn btn-secondary">\
<input v-bind="limit" type="radio" name="limit" value="20">\
20\
</label>\
</div>\
</div>'
<label>Max # of suggestions</label>\
<div id="limit-buttons" @click="handleLimitSelected">\
<input type="radio" class="btn-check" v-bind="limit" name="limit" value="10" id="l1" checked>\
<label class="btn btn-secondary" for="l1">10</label>\
<input type="radio" class="btn-check" v-bind="limit" name="limit" value="15" id="l2">\
<label class="btn btn-secondary" for="l2">15</label>\
<input type="radio" class="btn-check" v-bind="limit" name="limit" value="20" id="l3">\
<label class="btn btn-secondary" for="l3">20</label>\
</div>\
</div>'
});

// Component with the list of results
Expand Down
0