From f1d386a3ad357cbc9a79ded642a1f215db009edf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= Date: Mon, 16 Oct 2017 22:10:14 +0200 Subject: [PATCH 1/2] double-decker tootbox --- .../compose/components/compose_form.js | 56 +++++++++---------- app/javascript/styles/components.scss | 3 +- 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js index 5b06cef7c5..a443f2980d 100644 --- a/app/javascript/mastodon/features/compose/components/compose_form.js +++ b/app/javascript/mastodon/features/compose/components/compose_form.js @@ -247,36 +247,34 @@ export default class ComposeForm extends ImmutablePureComponent { -
-
- - - - - - -
+
+ + + + + + +
-
-
-
- { - showSideArm ? -
+
+
+
+ { + showSideArm ? +
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss index 7ef3dcc438..d73809228a 100644 --- a/app/javascript/styles/components.scss +++ b/app/javascript/styles/components.scss @@ -302,7 +302,7 @@ font-family: inherit; font-size: 14px; background: $simple-background-color; - border-radius: 0 0 4px; + //border-radius: 0 0 4px; } .compose-form__buttons-wrapper { @@ -452,6 +452,7 @@ .compose-form__publish { display: flex; + justify-content: flex-end; min-width: 0; } From c3ded60ec982373aab973c0f9b2113251ebc358e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= Date: Mon, 16 Oct 2017 22:12:38 +0200 Subject: [PATCH 2/2] rem a comment --- app/javascript/styles/components.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss index d73809228a..43d484e6e2 100644 --- a/app/javascript/styles/components.scss +++ b/app/javascript/styles/components.scss @@ -302,7 +302,6 @@ font-family: inherit; font-size: 14px; background: $simple-background-color; - //border-radius: 0 0 4px; } .compose-form__buttons-wrapper {