codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-24 08:09:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3938 from scossar/popup-message-in-preview

Browse source 
Show composer messages popup overtop of preview window
This commit is contained in:
Jeff Atwood 2015-12-28 15:25:26 -08:00
commit 931da1db18
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/discourse/views/composer-messages.js.es6
View file

@ -18,8 +18,7 @@ export default Ember.CollectionView.extend({
}.on('init'), }.on('init'),
_initCss: function() { _initCss: function() {
var composerHeight = $('#reply-control').height() || 0; this.$().show();
this.$().css('bottom', composerHeight + "px").show();
}.on('didInsertElement') }.on('didInsertElement')
}) })
}); });

1
app/assets/javascripts/discourse/views/composer.js.es6
View file

@ -24,7 +24,6 @@ const ComposerView = Ember.View.extend({
movePanels(sizePx) { movePanels(sizePx) {
$('#main-outlet').css('padding-bottom', sizePx); $('#main-outlet').css('padding-bottom', sizePx);
$('.composer-popup').css('bottom', sizePx);
// signal the progress bar it should move! // signal the progress bar it should move!
this.appEvents.trigger("composer:resized"); this.appEvents.trigger("composer:resized");

17
app/assets/stylesheets/desktop/compose.scss
View file

@ -21,6 +21,19 @@
} }
.composer-popup { .composer-popup {
position: absolute;
width: calc(50% - 55px);
max-width: 724px;
top: 16px;
bottom: 16px;
left: 50%;
// The composer goes off-center at 1550px
@media (min-width: 1550px) {
left: calc(50% - 15px);
}
overflow-y: auto;
z-index: 110;
padding: 10px;
box-shadow: 3px 3px 3px rgba(0,0,0, 0.34); box-shadow: 3px 3px 3px rgba(0,0,0, 0.34);
background: dark-light-diff($highlight, $secondary, 50%, -80%); background: dark-light-diff($highlight, $secondary, 50%, -80%);
@ -52,9 +65,6 @@
opacity: 1.0; opacity: 1.0;
} }
padding: 10px;
width: 600px;
position: absolute;
ul.topics { ul.topics {
list-style: none; list-style: none;
@ -96,6 +106,7 @@
.composer-popup:nth-of-type(2) { .composer-popup:nth-of-type(2) {
margin-left: 10px; margin-left: 10px;
width: calc(50% - 65px);
} }
// hide cancel upload link on IE9 (not supported) // hide cancel upload link on IE9 (not supported)