mirror/acronomy
1
0
Fork 0
mirror of https://github.com/Findus23/acronomy.git synced 2024-09-19 15:33:45 +02:00
Code Releases Activity

use bootstrap 5

Browse source
This commit is contained in:
Lukas Winkler 2020-07-22 14:24:40 +02:00
parent 5af4236248
commit 4a3d4f7c4e
Signed by: lukas
GPG key ID: 54DE4D798D244853
8 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
acros/templates/acros/detail.html
View file

@ -56,7 +56,7 @@
{# {% endfor %}#}
<div class="tags">
{% for tag in acro.tags.all %}
<a href="{% url "tag" tag.slug %}" class="badge badge-primary">{{ tag.name }}</a>
<a href="{% url "tag" tag.slug %}" class="btn btn-primary btn-tag">{{ tag.name }}</a>
{% endfor %}
</div>
<div class="row">

2
acros/templates/acros/taglist.html
View file

@ -3,7 +3,7 @@
{% block content %}
<div class="taglist">
{% for tag in tags %}
<a href="{% url "tag" tag.slug %}" class="badge badge-primary">{{ tag.name }}</a>
<a href="{% url "tag" tag.slug %}" class="btn btn-primary btn-tag">{{ tag.name }}</a>
{% endfor %}
</div>
{% endblock %}

7
bootstrap.min.js vendored Normal file
View file

File diff suppressed because one or more lines are too long

3
package.json
View file

@ -2,9 +2,8 @@
"dependencies": {
"@trevoreyre/autocomplete-js": "^2.1.1",
"@yaireo/tagify": "^3.9.3",
"bootstrap": "^4.5.0",
"bootstrap": "^5.0.0-alpha1",
"codemirror": "^5.54.0",
"jquery": "^3.5.1",
"katex": "^0.11.1",
"popper.js": "^1.16.1"
}

1
static/libs/jquery.slim.min.js vendored
View file

@ -1 +0,0 @@
../../node_modules/jquery/dist/jquery.slim.min.js

21
static/scss/main.scss
View file

@ -9,11 +9,13 @@
@import "node_modules/bootstrap/scss/functions";
@import "node_modules/bootstrap/scss/variables";
@import "node_modules/bootstrap/scss/mixins";
@import "node_modules/bootstrap/scss/utilities";
@import "node_modules/bootstrap/scss/root";
@import "node_modules/bootstrap/scss/reboot";
@import "node_modules/bootstrap/scss/type";
@import "node_modules/bootstrap/scss/images";
@import "node_modules/bootstrap/scss/code";
@import "node_modules/bootstrap/scss/containers";
@import "node_modules/bootstrap/scss/grid";
@import "node_modules/bootstrap/scss/tables";
@import "node_modules/bootstrap/scss/forms";
@ -21,18 +23,14 @@
@import "node_modules/bootstrap/scss/transitions";
@import "node_modules/bootstrap/scss/dropdown";
@import "node_modules/bootstrap/scss/button-group";
@import "node_modules/bootstrap/scss/input-group";
@import "node_modules/bootstrap/scss/custom-forms";
@import "node_modules/bootstrap/scss/nav";
@import "node_modules/bootstrap/scss/navbar";
@import "node_modules/bootstrap/scss/card";
//@import "node_modules/bootstrap/scss/breadcrumb";
//@import "node_modules/bootstrap/scss/pagination";
@import "node_modules/bootstrap/scss/badge";
//@import "node_modules/bootstrap/scss/jumbotron";
@import "node_modules/bootstrap/scss/alert";
//@import "node_modules/bootstrap/scss/progress";
//@import "node_modules/bootstrap/scss/media";
//@import "node_modules/bootstrap/scss/list-group";
@import "node_modules/bootstrap/scss/close";
//@import "node_modules/bootstrap/scss/toasts";
@ -41,9 +39,16 @@
//@import "node_modules/bootstrap/scss/popover";
//@import "node_modules/bootstrap/scss/carousel";
//@import "node_modules/bootstrap/scss/spinners";
@import "node_modules/bootstrap/scss/utilities";
@import "node_modules/bootstrap/scss/print";
@import "node_modules/bootstrap/scss/helpers";
@import "node_modules/bootstrap/scss/utilities/api";
.btn-tag {
@include button-size($badge-padding-y, $badge-padding-x, $badge-font-size, $badge-border-radius);
font-weight: $badge-font-weight;
line-height: 1;
}
.accountStatus {
@include media-breakpoint-up(md) {
@ -149,7 +154,7 @@ h1.acronym {
justify-content: space-around;
}
.taglist .badge {
.taglist .btn {
font-size: 150%;
margin: 5px;
}

1
templates/base.html
View file

@ -68,7 +68,6 @@
</div>
{% include 'footer.html' %}
<script src="{% static "libs/jquery.slim.min.js" %}"></script>
<script src="{% static "libs/popper.min.js" %}"></script>
<script src="{% static "libs/bootstrap.min.js" %}"></script>
<script src="{% static "libs/autocomplete.min.js" %}"></script>

13
yarn.lock
View file

@ -12,10 +12,10 @@
resolved "https://registry.yarnpkg.com/@yaireo/tagify/-/tagify-3.11.1.tgz#eb5b70ec9fbe44e8d38a15bf194f150b0f3588d1"
integrity sha512-NfUak7TJ3Co8YqQElcEiUmPpyWk2ut6G/Z5sy7rQLnCxziVEBS2WC/UfTsfq1XV/FCs4c9y9WNALnZ6nXUZzOA==
bootstrap@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.0.tgz#97d9dbcb5a8972f8722c9962483543b907d9b9ec"
integrity sha512-Z93QoXvodoVslA+PWNdk23Hze4RBYIkpb5h8I2HY2Tu2h7A0LpAgLcyrhrSUyo2/Oxm2l1fRZPs1e5hnxnliXA==
bootstrap@^5.0.0-alpha1:
version "5.0.0-alpha1"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.0.0-alpha1.tgz#cd35be4282bc930322bcbf1db23a8729c60a31cb"
integrity sha512-iwKneP2pLXl8lN0YpnOuOARiNPTzmh/4cw+Un86u4OqrMLuQpyMC7nO07hvivvcg0B/ektJPjuPnS1s+YmRK9A==
codemirror@^5.54.0:
version "5.54.0"
@ -27,11 +27,6 @@ commander@^2.19.0:
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
jquery@^3.5.1:
version "3.5.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==
katex@^0.11.1:
version "0.11.1"
resolved "https://registry.yarnpkg.com/katex/-/katex-0.11.1.tgz#df30ca40c565c9df01a466a00d53e079e84ffaa2"