FIX: tweaking topic footer dropdowns (#6882)

- no description on mobile for notifications
- better reason text positioning
This commit is contained in:
Joffrey JAFFEUX 2019-01-16 10:27:27 +01:00 committed by GitHub
parent 60790eb006
commit 486df57a23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 40 deletions

View File

@ -22,6 +22,10 @@ export default DropdownSelectBoxRoxComponent.extend({
@computed("_start") @computed("_start")
description(_start) { description(_start) {
if (this.site && this.site.mobileView) {
return null;
}
return Handlebars.escapeExpression(I18n.t(`${_start}.description`)); return Handlebars.escapeExpression(I18n.t(`${_start}.description`));
}, },

View File

@ -1,7 +1,7 @@
#topic-footer-buttons { #topic-footer-buttons {
.pinned-button { .pinned-button {
min-width: auto; min-width: auto;
margin: 10px 0 5px 0; margin: 1em 0;
&.is-hidden { &.is-hidden {
display: none; display: none;
@ -12,32 +12,19 @@
} }
.reason { .reason {
display: inline;
line-height: $line-height-medium; line-height: $line-height-medium;
margin: 0 0 0 10px;
} }
} }
} }
.pinned-button { .pinned-button {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-pack: start;
-ms-flex-pack: start;
justify-content: flex-start;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
margin: 0; margin: 0;
min-width: auto; min-width: auto;
.pinned-options { .pinned-options {
display: -webkit-inline-box; display: inline;
display: -ms-inline-flexbox;
display: inline-flex;
}
.pinned-options {
.select-kit-body { .select-kit-body {
min-width: unset; min-width: unset;
max-width: unset; max-width: unset;

View File

@ -1,15 +1,15 @@
#topic-footer-buttons { #topic-footer-buttons {
.topic-notifications-button { .topic-notifications-button {
min-width: auto; min-width: auto;
margin: 10px 0 15px 0; margin: 1em 0;
.btn { .btn {
margin: 0; margin: 0;
} }
.reason { .reason {
display: inline;
line-height: $line-height-medium; line-height: $line-height-medium;
margin: 0 0 0 10px;
} }
} }
} }
@ -19,20 +19,9 @@
} }
.topic-notifications-button { .topic-notifications-button {
display: -webkit-inline-box;
display: -ms-inline-flexbox;
display: inline-flex;
-webkit-box-pack: start;
-ms-flex-pack: start;
justify-content: flex-start;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
margin: 0; margin: 0;
.topic-notifications-options { .topic-notifications-options {
display: -webkit-inline-box;
display: -ms-inline-flexbox;
display: inline-flex; display: inline-flex;
} }
} }

View File

@ -245,8 +245,7 @@ a.reply-to-tab {
} }
} }
#topic-footer-buttons p { #topic-footer-buttons .reason {
clear: both;
/* this is to force the drop-down notification state description para below the button */ /* this is to force the drop-down notification state description para below the button */
margin: 0; margin: 0;
color: dark-light-choose($primary-medium, $secondary-medium); color: dark-light-choose($primary-medium, $secondary-medium);

View File

@ -36,15 +36,6 @@
display: inline; display: inline;
} }
/* both blocks that appear under the standard post control buttons */
.notification-options,
.pinned-options {
float: left;
margin-top: 0;
padding-top: 1px;
clear: both;
}
.topic-status-info { .topic-status-info {
padding-left: 10px; padding-left: 10px;
border-top: 1px solid $primary-low; border-top: 1px solid $primary-low;