mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-06-21 09:35:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed bootstrap aweseome checkbox

Browse source 
We now use Bootstrap 4's custom controls.
This commit is contained in:
Jan Böhmer 2019-09-18 18:40:59 +02:00
parent 2d34649ae6
commit 1a0e5408af
6 changed files with 51 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

16
assets/css/app.css
View file

@ -638,22 +638,6 @@ label:not(.form-check-label, custom-control-label) {
padding: .1rem 1.5rem; padding: .1rem 1.5rem;
} }
/* Font Awesome 5 with Checkbox support */
.abc-checkbox input[type="checkbox"]:checked+label::after,
.abc-checkbox input[type="radio"]:checked+label::after {
/*noinspection CssNoGenericFontName*/
font-family: "Font Awesome 5 Free";
font-weight: 900;
content: "\f00c";
font-weight: 900;
}
.form-check-dropdown {
display: flex;
width: auto;
padding-left: 10%;
}
.btn-group-append { .btn-group-append {
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-left-radius: 0 border-bottom-left-radius: 0

1
assets/js/app.js
View file

@ -22,7 +22,6 @@ import 'datatables.net-buttons-bs4/css/buttons.bootstrap4.css'
import 'datatables.net-fixedheader-bs4/css/fixedHeader.bootstrap4.css' import 'datatables.net-fixedheader-bs4/css/fixedHeader.bootstrap4.css'
import 'datatables.net-select-bs4/css/select.bootstrap4.css' import 'datatables.net-select-bs4/css/select.bootstrap4.css'
import 'bootstrap-select/dist/css/bootstrap-select.css' import 'bootstrap-select/dist/css/bootstrap-select.css'
import 'awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css'
import "patternfly-bootstrap-treeview/src/css/bootstrap-treeview.css" import "patternfly-bootstrap-treeview/src/css/bootstrap-treeview.css"

1
package.json
View file

@ -23,7 +23,6 @@
"@types/jquery": "^3.3.29", "@types/jquery": "^3.3.29",
"@types/jquery.form": "^3.26.30", "@types/jquery.form": "^3.26.30",
"@types/js-cookie": "^2.2.1", "@types/js-cookie": "^2.2.1",
"awesome-bootstrap-checkbox": "^1.0.1",
"bootbox": "^5.1.0", "bootbox": "^5.1.0",
"bootstrap-fileinput": "^5.0.1", "bootstrap-fileinput": "^5.0.1",
"bootstrap-select": "^1.13.8", "bootstrap-select": "^1.13.8",

71
templates/_navbar.html.twig
View file

@ -24,32 +24,57 @@
{% trans %}search.options.label{% endtrans %} {% trans %}search.options.label{% endtrans %}
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<div class="dropdown-menu" aria-labelledby="SearchOptions"> <div class="dropdown-menu p-2" aria-labelledby="SearchOptions">
<div class="abc-checkbox form-check-dropdown"><input type="checkbox" class="form-check-input" name="search_name" value="true" checked> <div class="custom-control custom-checkbox">
<label for="search_name" class="form-check-label">{% trans %}name.label{% endtrans %}</label></div> <input type="checkbox" class="custom-control-input" id="search_name" name="search_name" value="true" checked>
<div class="abc-checkbox form-check-dropdown"><input type="checkbox" class="form-check-input" name="search_category" value="true" checked> <label for="search_name" class="custom-control-label">{% trans %}name.label{% endtrans %}</label>
<label for="search_category" class="form-check-label">{% trans %}category.label{% endtrans %}</label></div> </div>
<div class="abc-checkbox form-check-dropdown"><input type="checkbox" class="form-check-input" name="search_description" value="true" checked> <div class="custom-control custom-checkbox">
<label for="search_description" class="form-check-label"></label>{% trans %}description.label{% endtrans %}</div> <input type="checkbox" class="custom-control-input" id="search_category" name="search_category" value="true" checked>
<div class="abc-checkbox form-check-dropdown"><input type="checkbox" class="form-check-input" name="search_storelocation" value="true" checked> <label for="search_category" class="custom-control-label">{% trans %}category.label{% endtrans %}</label>
<label for="search_storelocation" class="form-check-label">{% trans %}storelocation.label{% endtrans %}</label></div> </div>
<div class="form-check-dropdown abc-checkbox" class="form-check-label"><input type="checkbox" class="form-check-input" name="search_comment" value="true" checked> <div class="custom-control custom-checkbox">
<label for="search_comment" class="form-check-label">{% trans %}comment.label{% endtrans %}</label></div> <input type="checkbox" class="custom-control-input" id="search_description" name="search_description" value="true" checked>
<label for="search_description" class="custom-control-label"></label>{% trans %}description.label{% endtrans %}
</div>
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="search_storelocation" name="search_storelocation" value="true" checked>
<label for="search_storelocation" class="custom-control-label">{% trans %}storelocation.label{% endtrans %}</label>
</div>
<div class=" custom-control custom-checkbox">
<input type="checkbox" id="search_comment" class="custom-control-input" id="search_comment" name="search_comment" value="true" checked>
<label for="search_comment" class="custom-control-label">{% trans %}comment.label{% endtrans %}</label>
</div>
{% if true %} {% if true %}
<div class="form-check-dropdown abc-checkbox"><input type="checkbox" class="form-check-input" name="search_supplierpartnr" value="true" checked> <div class="custom-control custom-checkbox">
<label for="search_supplierpartnr" class="form-check-label">{% trans %}ordernumber.label.short{% endtrans %}</label></div> <input type="checkbox" class="custom-control-input" id="search_supplierpartnr" name="search_supplierpartnr" value="true" checked>
<li class="form-check-dropdown abc-checkbox"><input type="checkbox" class="form-check-input" name="search_supplier" value="true"> <label for="search_supplierpartnr" class="custom-control-label">{% trans %}ordernumber.label.short{% endtrans %}</label>
<label for="search_supplier" class="form-check-label">{% trans %}supplier.label{% endtrans %}</label></li> {% endif %} </div>
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="search_supplier" name="search_supplier" value="true">
<label for="search_supplier" class="custom-control-label">{% trans %}supplier.label{% endtrans %}</label>
</div>
{% endif %}
{% if true %} {% if true %}
<div class="form-check-dropdown abc-checkbox"><input type="checkbox" class="form-check-input" name="search_manufacturer" value="true"> <div class="custom-control custom-checkbox">
<label for="search_manufacturer" class="form-check-label">{% trans %}manufacturer.label{% endtrans %}</label></div>{% endif %} <input type="checkbox" class="custom-control-input" id="search_manufacturer" name="search_manufacturer" value="true">
<label for="search_manufacturer" class="custom-control-label">{% trans %}manufacturer.label{% endtrans %}</label>
</div>
{% endif %}
{% if true %} {% if true %}
<div class="form-check-dropdown abc-checkbox"><input type="checkbox" class="form-check-input" name="search_footprint" value="true"> <div class="custom-control custom-checkbox">
<label for="search_footprint" class="form-check-label">{% trans %}footprint.label{% endtrans %}</label></div>{% endif %} <input type="checkbox" class="custom-control-input" id="search_footprint" name="search_footprint" value="true">
<div class="form-c heck-dropdown abc-checkbox"><input type="checkbox" class="form-check-input" name="disable_pid_input" value="false"> <label for="search_footprint" class="custom-control-label">{% trans %}footprint.label{% endtrans %}</label>
<label for="disable_pid_input" class="form-check-label">{% trans %}search.deactivateBarcode{% endtrans %}</label></div> </div>
<div class="form-check-dropdown abc-checkbox"><input type="checkbox" class="form-check-input" name="regex" value="true"> {% endif %}
<label for="regex" class="form-check-label">{% trans %}search.regexmatching{% endtrans %}</label></div> <div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="disable_pid_input" name="disable_pid_input" value="false">
<label for="disable_pid_input" class="custom-control-label">{% trans %}search.deactivateBarcode{% endtrans %}</label>
</div>
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="regex" name="regex" value="true">
<label for="regex" class="custom-control-label">{% trans %}search.regexmatching{% endtrans %}</label>
</div>
</div> </div>
</div> </div>

6
templates/security/login.html.twig
View file

@ -44,9 +44,9 @@
<div class="form-group row"> <div class="form-group row">
<div class="col-md-9 offset-md-3 col-lg-10 offset-lg-2"> <div class="col-md-9 offset-md-3 col-lg-10 offset-lg-2">
<div class="form-check abc-checkbox form-check-inline"> <div class="custom-control custom-checkbox custom-control-inline">
<input class="form-check-input" name="_remember_me" type="checkbox"> <input class="custom-control-input" name="_remember_me" id="remember_me" type="checkbox">
<label class="form-check-label" for="checkbox1"> <label class="custom-control-label" for="remember_me">
{% trans %}login.rememberme{% endtrans %} {% trans %}login.rememberme{% endtrans %}
</label> </label>
</div> </div>

5
yarn.lock
View file

@ -1221,11 +1221,6 @@ atob@^2.1.1:
resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
awesome-bootstrap-checkbox@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/awesome-bootstrap-checkbox/-/awesome-bootstrap-checkbox-1.0.1.tgz#dab10146b6001129ab0a0ec1e54bb77c6c30457a"
integrity sha1-2rEBRrYAESmrCg7B5Uu3fGwwRXo=
babel-code-frame@^6.26.0: babel-code-frame@^6.26.0:
version "6.26.0" version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"