Skip to content

Commit f672073

Browse files
ihalaij1ihalaij1
committed
Fix many styling issues
1 parent f4d40cd commit f672073

31 files changed

Lines changed: 170 additions & 103 deletions

File tree

‎assets/css/main.css‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/css/main.css.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/sass/components/_news.scss‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
.news-panel {
22
margin-bottom: 30px;
3-
.future-instance {
4-
color: #c0322d;
5-
background-color: #fff;
6-
}
7-
.current-instance {
8-
color: #333;
9-
background-color: #fff;
10-
}
113
.list-group-item-heading {
124
padding-top: 5px;
135
padding-bottom: 10px;
@@ -27,27 +19,37 @@
2719
position: relative;
2820
display: block;
2921
padding: 10px 15px;
22+
border: none;
23+
}
24+
.list-group-item:last-child {
25+
border-bottom-left-radius: var(--bs-card-inner-border-radius);
26+
border-bottom-right-radius: var(--bs-card-inner-border-radius);
3027
}
3128
.pinned-list-group-item {
3229
border-left: 2px solid $aplus-brand-primary;
33-
border-bottom: 1px solid #ccc;
30+
}
31+
.news-item.pinned-list-group-item:last-child {
32+
border-bottom-left-radius: var(--bs-card-inner-border-radius);
3433
}
3534
.folding-list-group-item {
36-
background-color: #fff;
3735
font-size: 16px;
3836
text-decoration: none;
3937
font-weight: bold;
40-
border-bottom-left-radius: 0px;
41-
border-bottom-right-radius: 0px;
4238
}
4339
.folding-list-group-item.collapsed {
44-
border-bottom-left-radius: 4px;
45-
border-bottom-right-radius: 4px;
40+
border-bottom-left-radius: var(--bs-card-inner-border-radius);
41+
border-bottom-right-radius: var(--bs-card-inner-border-radius);
4642
}
4743
.folding-list-group-item:hover {
48-
background-color: #eee;
44+
background-color: var(--bs-secondary-bg);
4945
}
5046
.list-group-item-text *:last-child {
5147
margin-bottom: 0;
5248
}
49+
.bi-chevron-down::before {
50+
transition: transform .2s ease;
51+
}
52+
.folding-list-group-item[aria-expanded="true"] .bi-chevron-down::before {
53+
transform: rotate(180deg);
54+
}
5355
}

‎assets/sass/components/_table.scss‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,44 @@ table {
1010
display: none !important;
1111
}
1212
}
13+
14+
/* Bootstrap 5 table variants do not have color mode adaptive styling (will be added in v6) */
15+
.table-striped > tbody > tr.table-success > th,
16+
.table-striped > tbody > tr.table-success > td {
17+
--bs-table-color-type: var(--bs-body-color);
18+
--bs-table-bg-type: var(--bs-success-bg-subtle);
19+
}
20+
21+
.table-striped > tbody > tr.table-success:nth-of-type(2n+1) > th,
22+
.table-striped > tbody > tr.table-success:nth-of-type(2n+1) > td {
23+
--bs-table-color-type: var(--bs-body-color);
24+
--bs-table-bg-type: var(--bs-success-bg-subtle);
25+
}
26+
27+
/* Fix borders for bordered tables within cards */
28+
.aplus-table-bordered > thead > tr > th:not(:first-child),
29+
.aplus-table-bordered > thead > tr > td:not(:first-child),
30+
.aplus-table-bordered > tbody > tr > td:not(:first-child) {
31+
border-left: 1px solid var(--bs-border-color);
32+
}
33+
34+
.aplus-table-bordered > tbody > tr:not(.hidden-group):not(:has(~ tr:not(.hidden-group))) > th,
35+
.aplus-table-bordered > tbody > tr:not(.hidden-group):not(:has(~ tr:not(.hidden-group))) > td {
36+
border-bottom: none;
37+
}
38+
39+
.aplus-table-bordered > tbody > tr:not(.hidden-group):not(:has(~ tr:not(.hidden-group))) > th,
40+
.aplus-table-bordered > tbody > tr:not(.hidden-group):not(:has(~ tr:not(.hidden-group))) > td:first-child {
41+
border-bottom-left-radius: var(--bs-border-radius);
42+
}
43+
44+
.aplus-table-bordered > tbody > tr:not(.hidden-group):not(:has(~ tr:not(.hidden-group))) > th,
45+
.aplus-table-bordered > tbody > tr:not(.hidden-group):not(:has(~ tr:not(.hidden-group))) > td:last-child {
46+
border-bottom-right-radius: var(--bs-border-radius);
47+
}
48+
49+
.aplus-table-bordered > tbody > tr.table-success,
50+
.aplus-table-bordered > tbody > tr.table-success > td {
51+
border-left: none;
52+
border-bottom: 1px solid var(--bs-border-color);
53+
}

‎assets/sass/legacy/_main.scss‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ iframe {
106106
}
107107
}*/ // TODO: CHECK FOR REMOVAL #1442
108108

109+
110+
109111
/* dropdown menu */
110112
.dropdown-menu > li button {
111113
display: block;
@@ -125,6 +127,12 @@ iframe {
125127
}*/
126128
}
127129

130+
.dropdown-toggle.btn {
131+
--bs-btn-border-width: 0;
132+
--bs-btn-focus-border-color: transparent;
133+
--bs-btn-active-border-color: transparent;
134+
}
135+
128136
/* Skip links */
129137

130138
.skip-link { /* This one is equally applicable to all skip links */

‎course/templates/course/groups.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
</div>
2626

2727
<form method="post" class="card form-horizontal">
28+
{% csrf_token %}
2829
<div class="card-body">
29-
{% csrf_token %}
3030
<p>
3131
{% blocktranslate trimmed %}
3232
GROUP_CREATION_INSTRUCTIONS

‎course/templates/course/staff/enroll_students.html‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,13 @@
2020
</p>
2121
<form method="post" class="card form">
2222
{% csrf_token %}
23-
<legend>{% translate "ENROLL_STUDENTS_IN_COURSE" %}</legend>
24-
{% bootstrap_form form %}
25-
<button type="submit" class="aplus-button--default aplus-button--md">
26-
{% translate "ENROLL_STUDENTS" %}
27-
</button>
23+
<div class="card-body">
24+
<legend>{% translate "ENROLL_STUDENTS_IN_COURSE" %}</legend>
25+
{% bootstrap_form form %}
26+
<button type="submit" class="aplus-button--default aplus-button--md">
27+
{% translate "ENROLL_STUDENTS" %}
28+
</button>
29+
</div>
2830
</form>
2931
</div>
3032
{% endblock %}

‎course/templates/course/staff/group_delete.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<div class="col-md-12">
1717

1818
<form method="post" class="card form">
19+
{% csrf_token %}
1920
<div class="card-body">
20-
{% csrf_token %}
2121
<legend>{% translate "CONFIRM_GROUP_REMOVAL" %}</legend>
2222

2323
<table class="table table-sm">

‎course/templates/course/staff/group_edit.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
{% block columns %}
1717
<div class="col-md-12">
1818
<form method="post" class="card form">
19+
{% csrf_token %}
1920
<div class="card-body">
20-
{% csrf_token %}
2121
<legend>{% translate "EDIT_GROUP_MEMBERS" %}</legend>
2222
{% bootstrap_form form %}
2323
<button type="submit" class="aplus-button--default aplus-button--md mt-2">

‎deviations/templates/deviations/add_dl.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
{% block columns %}
1616
<div class="col-md-12">
1717
<form method="post" class="card form-horizontal">
18+
{% csrf_token %}
1819
<div class="card-body">
19-
{% csrf_token %}
2020
<legend>{% translate "ADD_DEADLINE_DEVIATIONS" %}</legend>
2121
{% bootstrap_form form %}
2222
<div class="form-group">

0 commit comments

Comments
 (0)