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

Pm 2022 03 issues #4234

Merged
merged 3 commits into from
Mar 4, 2022
Merged

Pm 2022 03 issues #4234

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
57f8325
assets/item_detail: rm mobile stacking inline with new design fixes #…
philli-m Mar 3, 2022
2e77cdd
assets/form: small fixes to form inputs
philli-m Mar 3, 2022
769e753
assets/input_group: remobe bottom margin on inputgroup inputs part fi…
philli-m Mar 3, 2022
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 meinberlin/apps/account/templates/meinberlin_account/account_dashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<div class="l-menu">

<nav class="l-menu__menu dashboard-nav" aria-label="{% trans 'User Dashboard navigation' %}">
<div class="dropdown dashboard-nav__dropdown">
<div class="dashboard-nav__dropdown">
<div class="dashboard-nav__item">
{{ request.user.username }}
</div>
Expand Down
2 changes: 1 addition & 1 deletion meinberlin/apps/projects/templates/meinberlin_projects/includes/users_from_email_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</div>
{% endif %}
<div class="input-group">
<div class="input-group__input widget widget--{{ form.add_users|widget_type }}">
<div class="widget widget--{{ form.add_users|widget_type }}">
{{ form.add_users }}
</div>
<span>
Expand Down
4 changes: 4 additions & 0 deletions meinberlin/assets/scss/_form.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,10 @@ div.cke_focus {
margin-bottom: 0;
}

.widget--textinput {
flex-grow: 1;
}

.widget--radioselect,
.widget--checkboxselectmultiple,
.widget--radioselectwithtextinputwidget {
Expand Down
4 changes: 4 additions & 0 deletions meinberlin/assets/scss/components/_input_group.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

.input-group {
display: flex;

input {
margin-bottom: 0;
}
}

.input-group__input {
Expand Down
23 changes: 10 additions & 13 deletions meinberlin/assets/scss/components/_item_detail_2.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,19 @@

.item-detail-2__factsheet-table {
padding-left: 0;
display: table;

@media screen and (min-width: $breakpoint-xs) {
display: table;

div {
display: table-row;
}
div {
display: table-row;
}

dt {
display: table-cell;
border-right: 2em solid transparent;
}
dt {
display: table-cell;
border-right: 2em solid transparent;
}

dd {
display: table-cell;
}
dd {
display: table-cell;
}
}

Expand Down