From 5bc765c70fa3d2ffafc65c4e467b42278f32375b Mon Sep 17 00:00:00 2001 From: Gabriel Engel Date: Wed, 30 Aug 2017 02:58:32 -0300 Subject: [PATCH] Small alignment fixes --- .../client/imports/components/messages.css | 2 +- .../components/sidebar/sidebar-account.css | 2 +- .../client/imports/forms/input.css | 4 ++-- .../client/imports/general/base_old.css | 16 +++++----------- .../client/imports/general/variables.css | 2 +- 5 files changed, 10 insertions(+), 16 deletions(-) diff --git a/packages/rocketchat-theme/client/imports/components/messages.css b/packages/rocketchat-theme/client/imports/components/messages.css index 9bda032ab66f..9050a20ad9d5 100644 --- a/packages/rocketchat-theme/client/imports/components/messages.css +++ b/packages/rocketchat-theme/client/imports/components/messages.css @@ -22,7 +22,7 @@ } &__label { - padding: 2px 10px; + padding: 2px 0; cursor: pointer; diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css index 71b33c2a0348..6962e7681d18 100644 --- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css +++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css @@ -1,7 +1,7 @@ .sidebar__account { display: flex; - margin-bottom: 40px; + margin-bottom: 12px; align-items: center; &--lighten { diff --git a/packages/rocketchat-theme/client/imports/forms/input.css b/packages/rocketchat-theme/client/imports/forms/input.css index 9f455b689857..5a3291769311 100644 --- a/packages/rocketchat-theme/client/imports/forms/input.css +++ b/packages/rocketchat-theme/client/imports/forms/input.css @@ -34,11 +34,11 @@ justify-content: center; & + .rc-input__element { - padding: 0.75rem 1rem 0.75rem 3.25rem; + padding: 0.75rem 1rem 0.75rem 2.75rem; } & + .rc-input__element--small { - padding: 0.5rem 1rem 0.5rem 3.25rem; + padding: 0.5rem 1rem 0.5rem 2.75rem; } &--right { diff --git a/packages/rocketchat-theme/client/imports/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css index 48b880a2cfad..70b270eb0b48 100644 --- a/packages/rocketchat-theme/client/imports/general/base_old.css +++ b/packages/rocketchat-theme/client/imports/general/base_old.css @@ -3024,16 +3024,16 @@ & .thumb { position: absolute; - left: 20px; + left: 24px; display: block; - width: 40px; - height: 40px; + width: 36px; + height: 36px; &:not(.thumb-small) .avatar { - width: 40px; - height: 40px; + width: 36px; + height: 36px; } &.thumb-small { @@ -3124,10 +3124,6 @@ } } - & .body { - margin-top: 0; - } - &:hover .edited { display: none; } @@ -3158,8 +3154,6 @@ } & .body { - margin-top: 2px; - transition: opacity 1s linear; opacity: 1; diff --git a/packages/rocketchat-theme/client/imports/general/variables.css b/packages/rocketchat-theme/client/imports/general/variables.css index 395bdcf0872a..316b8ceda965 100644 --- a/packages/rocketchat-theme/client/imports/general/variables.css +++ b/packages/rocketchat-theme/client/imports/general/variables.css @@ -252,7 +252,7 @@ --message-box-user-typing-color: var(--color-gray); --message-box-user-typing-text-size: 0.75rem; --message-box-user-typing-user-color: var(--color-dark); - --message-box-container-border-color: var(--color-gray-light); + --message-box-container-border-color: var(--color-gray-medium); --message-box-container-border-width: var(--border); --message-box-container-border-radius: var(--border-radius); --message-box-editing-color: #fff5df;