diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss index ba6369f07db..4efbaa468ed 100644 --- a/app/assets/stylesheets/common/base/compose.scss +++ b/app/assets/stylesheets/common/base/compose.scss @@ -9,12 +9,15 @@ margin-left: auto; margin-right: auto; max-width: 1475px; - width: 100%; + width: 100%; + &.hide-preview { + max-width:740px; + } @media screen and (max-width: 1200px) { min-width: 0; } z-index: 999; - transition: height 250ms ease, background 250ms ease; + transition: height 250ms ease, background 250ms ease, transform 250ms ease, max-width 250ms ease; background-color: $secondary; box-shadow: 0 -2px 40px rgba($primary, .12); @@ -26,7 +29,7 @@ .saving-text, .draft-text { display: none; - padding-left: 10px; + padding-left: 10px; .spinner { margin-left: 5px; border-color: $secondary; @@ -55,6 +58,7 @@ background: $tertiary; color: $secondary; flex-direction: row; + width: 100%; .composer-controls { margin-left: auto; display: flex; diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss index b4facb993da..c47540f1447 100644 --- a/app/assets/stylesheets/common/base/discourse.scss +++ b/app/assets/stylesheets/common/base/discourse.scss @@ -190,7 +190,7 @@ input { height: 18px; padding: 4px 10px; margin-bottom: 9px; - font-size: 0.929em; + font-size: 1em; line-height: 1.25; color: $primary; background-color: $secondary; diff --git a/app/assets/stylesheets/common/select-kit/combo-box.scss b/app/assets/stylesheets/common/select-kit/combo-box.scss index 7e74318be23..f1f73828c59 100644 --- a/app/assets/stylesheets/common/select-kit/combo-box.scss +++ b/app/assets/stylesheets/common/select-kit/combo-box.scss @@ -27,7 +27,7 @@ border: 1px solid $primary-medium; padding: 6px 10px; font-weight: 500; - font-size: 0.929em; + font-size: 1em; line-height: 18px; &.is-focused { diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss index c83f86ffb6c..d4e53b65c8b 100644 --- a/app/assets/stylesheets/desktop/discourse.scss +++ b/app/assets/stylesheets/desktop/discourse.scss @@ -72,7 +72,7 @@ input, button, select, textarea { - font-size: 0.929em; + font-size: 1em; font-weight: normal; line-height: 18px; } @@ -82,7 +82,7 @@ textarea { display: inline-block; padding: 4px; margin-bottom: 9px; - font-size: 0.929em; + font-size: 1em; line-height: 18px; color: $primary; } diff --git a/app/assets/stylesheets/vendor/select2.scss b/app/assets/stylesheets/vendor/select2.scss index 05818528329..f66f81740fd 100644 --- a/app/assets/stylesheets/vendor/select2.scss +++ b/app/assets/stylesheets/vendor/select2.scss @@ -448,7 +448,7 @@ html[dir="rtl"] .select2-container-multi .select2-choices li margin: 1px 0; font-family: sans-serif; - font-size: 0.929em; + font-size: 1em; color: #666; outline: 0; border: 0;