From 59ed9bb9a445076c60cdb85d72e86de5b1e45957 Mon Sep 17 00:00:00 2001 From: igoradamenko Date: Sun, 16 Dec 2018 21:07:06 +0200 Subject: [PATCH] make user-info always white --- .../components/user-info/__id/user-info__id.scss | 3 ++- .../_theme/_light/user-info_theme_light.scss | 10 ---------- web/app/components/user-info/index.js | 5 ++--- web/app/components/user-info/user-info.jsx | 2 +- web/app/components/user-info/user-info.scss | 14 +++++++------- 5 files changed, 12 insertions(+), 22 deletions(-) delete mode 100644 web/app/components/user-info/_theme/_light/user-info_theme_light.scss diff --git a/web/app/components/user-info/__id/user-info__id.scss b/web/app/components/user-info/__id/user-info__id.scss index aa670db7..346f7252 100644 --- a/web/app/components/user-info/__id/user-info__id.scss +++ b/web/app/components/user-info/__id/user-info__id.scss @@ -1,7 +1,8 @@ .user-info__id { margin: 0 0 18px; + padding-left: 40px; font-size: 14px; font-weight: 400; line-height: 18px; - padding-left: 40px; + color: #888; } diff --git a/web/app/components/user-info/_theme/_light/user-info_theme_light.scss b/web/app/components/user-info/_theme/_light/user-info_theme_light.scss deleted file mode 100644 index bef46236..00000000 --- a/web/app/components/user-info/_theme/_light/user-info_theme_light.scss +++ /dev/null @@ -1,10 +0,0 @@ -.user-info_theme_light { - .user-info { - border-color: #efefef; - background: #fff; - } - - .user-info__id { - color: #888; - } -} diff --git a/web/app/components/user-info/index.js b/web/app/components/user-info/index.js index 2f238ab8..84ef920e 100644 --- a/web/app/components/user-info/index.js +++ b/web/app/components/user-info/index.js @@ -5,9 +5,8 @@ export const userInfoReducers = { userComments, isLoadingUserComments }; export { default } from './user-info'; require('./user-info.scss'); + +require('./__avatar/user-info__avatar.scss'); require('./__id/user-info__id.scss'); require('./__preloader/user-info__preloader.scss'); require('./__title/user-info__title.scss'); -require('./__avatar/user-info__avatar.scss'); - -require('./_theme/_light/user-info_theme_light.scss'); diff --git a/web/app/components/user-info/user-info.jsx b/web/app/components/user-info/user-info.jsx index f6a3ccf1..e32bd397 100644 --- a/web/app/components/user-info/user-info.jsx +++ b/web/app/components/user-info/user-info.jsx @@ -36,7 +36,7 @@ class UserInfo extends Component { globalOnKeyDown(e) { // ESCAPE key pressed - if (e.keyCode == 27) { + if (e.keyCode === 27) { const data = JSON.stringify({ isUserInfoShown: false }); window.parent.postMessage(data, '*'); } diff --git a/web/app/components/user-info/user-info.scss b/web/app/components/user-info/user-info.scss index 4c826743..09cbf4f7 100644 --- a/web/app/components/user-info/user-info.scss +++ b/web/app/components/user-info/user-info.scss @@ -1,15 +1,15 @@ .user-info { - border: 1px solid; - border-radius: 2px; position: absolute; top: 0; - bottom: 0; right: 0; - width: 100%; - padding: 10px; - box-sizing: border-box; - + bottom: 0; overflow: inherit; overflow-x: hidden; overflow-y: auto; + box-sizing: border-box; + width: 100%; + padding: 10px; + border: 1px solid #efefef; + border-radius: 2px; + background: #fff; }