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

Jump to bottom

Fix close button position in modal window #4812

Merged
merged 1 commit into from
Apr 10, 2019
Merged

Fix close button position in modal window #4812

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: 3 additions & 9 deletions contribs/gmf/src/controllers/desktop.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,10 +349,6 @@ $theme-selector-columns: 2;
margin-right: 0;
}

.close {
padding: 0;
}

textarea {
resize: vertical;
}
Expand All @@ -363,6 +359,9 @@ $theme-selector-columns: 2;
margin-bottom: $app-margin;
margin-top: $grid-gutter-width / 2;
border-bottom: 0.06rem solid $color-light;
.close {
padding: 0;
}
}

.profile-panel button {
Expand Down Expand Up @@ -707,11 +706,6 @@ gmf-objecteditingtools {
}

.gmf-filterselector-managefilter-modal {
.modal-header .close {
padding: 1rem;
line-height: inherit;
margin: -1rem -1rem -1rem auto;
}
.modal-body {
padding: 0 $app-margin;

Expand Down
4 changes: 1 addition & 3 deletions contribs/gmf/src/editing/editFeatureComponent.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,14 @@
</div>
<ngeo-modal ng-model="efCtrl.unsavedModificationsModalShown">
<div class="modal-header">
<h4 class="modal-title">{{'Unsaved modifications!' | translate}}</h4>
<button
type="button"
class="close"
data-dismiss="modal"
aria-label="{{'Close' | translate}}">
<span aria-hidden="true">&times;</span>
</button>
<h4 class="modal-title">
{{'Unsaved modifications!' | translate}}
</h4>
</div>
<div class="modal-body">
{{'There are unsaved changes.' | translate}}
Expand Down