Discource-C/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-16 16:24:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tweaks for better modal distinction between fixed/inline

Browse Source
This commit is contained in:
Robin Ward 2017-08-30 17:38:49 -04:00
parent 6361618188
commit a48abc6556
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/components/d-modal-body.js.es6
View File

@ -4,7 +4,7 @@ export default Ember.Component.extend({
didInsertElement() { didInsertElement() {
this._super(); this._super();
$('#modal-alert').hide(); $('#modal-alert').hide();
$('.d-modal').modal('show'); $('.d-modal.fixed-modal').modal('show');
Ember.run.scheduleOnce('afterRender', this, this._afterFirstRender); Ember.run.scheduleOnce('afterRender', this, this._afterFirstRender);
this.appEvents.on('modal-body:flash', msg => this._flash(msg)); this.appEvents.on('modal-body:flash', msg => this._flash(msg));
}, },

2
app/assets/javascripts/discourse/components/hide-modal-trigger.js.es6
View File

@ -1,6 +1,6 @@
export default Ember.Component.extend({ export default Ember.Component.extend({
didInsertElement() { didInsertElement() {
this._super(); this._super();
$('.d-modal').modal('hide').addClass('hidden'); $('.d-modal.fixed-modal').modal('hide').addClass('hidden');
} }
}); });

4
app/assets/javascripts/discourse/routes/application.js.es6
View File

@ -121,11 +121,11 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
user clicks "No", reopenModal. If user clicks "Yes", be sure to call closeModal. user clicks "No", reopenModal. If user clicks "Yes", be sure to call closeModal.
**/ **/
hideModal() { hideModal() {
$('.d-modal').modal('hide'); $('.d-modal.fixed-modal').modal('hide');
}, },
reopenModal() { reopenModal() {
$('.d-modal').modal('show'); $('.d-modal.fixed-modal').modal('show');
}, },
editCategory(category) { editCategory(category) {

8
app/assets/stylesheets/common/base/modal.scss
View File

@ -83,7 +83,13 @@
} }
.modal { .inline-modal {
.modal-inner-container {
border: 1px solid $secondary-medium;
}
}
.fixed-modal {
position: fixed; position: fixed;
top: 0; top: 0;
width: 100%; width: 100%;