diff --git a/app/assets/javascripts/components/components/column_back_button_slim.jsx b/app/assets/javascripts/components/components/column_back_button_slim.jsx index f739b3f83d..7196900971 100644 --- a/app/assets/javascripts/components/components/column_back_button_slim.jsx +++ b/app/assets/javascripts/components/components/column_back_button_slim.jsx @@ -15,7 +15,7 @@ class ColumnBackButtonSlim extends React.PureComponent { render () { return (
-
+
diff --git a/app/assets/javascripts/components/features/compose/components/privacy_dropdown.jsx b/app/assets/javascripts/components/features/compose/components/privacy_dropdown.jsx index 537871bb5f..507fe7b580 100644 --- a/app/assets/javascripts/components/features/compose/components/privacy_dropdown.jsx +++ b/app/assets/javascripts/components/features/compose/components/privacy_dropdown.jsx @@ -14,6 +14,11 @@ const messages = defineMessages({ change_privacy: { id: 'privacy.change', defaultMessage: 'Adjust status privacy' } }); +const iconStyle = { + height: null, + lineHeight: '27px' +} + class PrivacyDropdown extends React.PureComponent { constructor (props, context) { @@ -72,7 +77,7 @@ class PrivacyDropdown extends React.PureComponent { return (
-
+
{options.map(item =>
diff --git a/app/assets/javascripts/components/features/compose/components/upload_button.jsx b/app/assets/javascripts/components/features/compose/components/upload_button.jsx index 80e5a0545c..9b2de0332f 100644 --- a/app/assets/javascripts/components/features/compose/components/upload_button.jsx +++ b/app/assets/javascripts/components/features/compose/components/upload_button.jsx @@ -6,6 +6,12 @@ const messages = defineMessages({ upload: { id: 'upload_button.label', defaultMessage: 'Add media' } }); + +const iconStyle = { + height: null, + lineHeight: '27px' +} + class UploadButton extends React.PureComponent { constructor (props, context) { @@ -30,11 +36,12 @@ class UploadButton extends React.PureComponent { } render () { + const { intl, resetFileKey, disabled } = this.props; return (
- +
); diff --git a/app/assets/javascripts/components/features/compose/components/upload_form.jsx b/app/assets/javascripts/components/features/compose/components/upload_form.jsx index a937cafb76..4aafe698e8 100644 --- a/app/assets/javascripts/components/features/compose/components/upload_form.jsx +++ b/app/assets/javascripts/components/features/compose/components/upload_form.jsx @@ -18,7 +18,7 @@ class UploadForm extends React.PureComponent {
{({ scale }) => -
+
} diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss index ac9a264ee5..228c2f8ceb 100644 --- a/app/assets/stylesheets/components.scss +++ b/app/assets/stylesheets/components.scss @@ -261,6 +261,12 @@ margin: 5px; } +.compose-form__upload-thumbnail { + border-radius: 4px; + height: 100px; + width: 100%; +} + .compose-form__upload-cancel { background-size: cover; border-radius: 4px; @@ -1347,12 +1353,12 @@ a.status__content__spoiler-link { } .column-back-button { - padding: 15px; - font-size: 16px; background: lighten($color1, 4%); - flex: 0 0 auto; - cursor: pointer; color: $color4; + cursor: pointer; + flex: 0 0 auto; + font-size: 16px; + padding: 15px; z-index: 3; &:hover { @@ -2375,10 +2381,6 @@ button.icon-button.active i.fa-retweet { box-shadow: 0 -4px 4px rgba($color8, 0.1); } - .privacy-dropdown__value-icon { - line-height: 27px; - } - .privacy-dropdown__dropdown { display: block; box-shadow: 2px 4px 6px rgba($color8, 0.1); @@ -3061,7 +3063,7 @@ button.icon-button.active i.fa-retweet { .media-spoiler-video-play-icon { border-radius: 100px; color: rgba(255, 255, 255, 0.8); - fontSize: 36px; + font-size: 36px; padding: 5px; position: absolute; top: 50%;