From 64748212710af046c36cab679037b757083f67bb Mon Sep 17 00:00:00 2001
From: Pavel Mineev <pavel@mineev.me>
Date: Thu, 7 Jan 2021 13:45:58 +0300
Subject: [PATCH] Fix styles order

---
 frontend/app/components/comment/comment.css          |  4 +---
 frontend/app/components/comment/comment.tsx          |  4 ++--
 .../components/dropdown/__item/dropdown__item.css    |  8 ++++----
 .../_theme/_light/raw-content_theme_light.css        |  2 +-
 frontend/app/components/root/root.css                |  6 +++---
 frontend/app/components/root/root.tsx                | 12 ++++++------
 frontend/app/remark.tsx                              |  3 ---
 7 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/frontend/app/components/comment/comment.css b/frontend/app/components/comment/comment.css
index 1908008b..399ee4ca 100644
--- a/frontend/app/components/comment/comment.css
+++ b/frontend/app/components/comment/comment.css
@@ -23,10 +23,8 @@
 
 .comment-form_type_reply {
   margin-left: 17px;
-}
 
-@media (-moz-touch-enabled: 1) and (max-width: 768px), (pointer: coarse) and (max-width: 768px) {
-  & .comment-form_type_reply {
+  @media (-moz-touch-enabled: 1) and (max-width: 768px), (pointer: coarse) and (max-width: 768px) {
     margin-left: 0;
   }
 }
diff --git a/frontend/app/components/comment/comment.tsx b/frontend/app/components/comment/comment.tsx
index 6a2aa302..82751f05 100644
--- a/frontend/app/components/comment/comment.tsx
+++ b/frontend/app/components/comment/comment.tsx
@@ -1,5 +1,3 @@
-import './styles';
-
 import { h, JSX, Component, createRef, ComponentType } from 'preact';
 import b from 'bem-react-helper';
 
@@ -24,6 +22,8 @@ import { getVoteMessage, VoteMessagesTypes } from './getVoteMessage';
 import { getBlockingDurations } from './getBlockingDurations';
 import { boundActions } from './connected-comment';
 
+import './styles';
+
 const messages = defineMessages({
   deleteMessage: {
     id: 'comment.delete-message',
diff --git a/frontend/app/components/dropdown/__item/dropdown__item.css b/frontend/app/components/dropdown/__item/dropdown__item.css
index 01b73758..f7db19d7 100644
--- a/frontend/app/components/dropdown/__item/dropdown__item.css
+++ b/frontend/app/components/dropdown/__item/dropdown__item.css
@@ -6,9 +6,9 @@
     text-align: left;
     padding: 5px;
   }
+}
 
-  &_separator {
-    border-bottom: 1px solid var(--color15);
-    margin-bottom: 5px;
-  }
+.dropdown__item_separator {
+  border-bottom: 1px solid var(--color15);
+  margin-bottom: 5px;
 }
diff --git a/frontend/app/components/raw-content/_theme/_light/raw-content_theme_light.css b/frontend/app/components/raw-content/_theme/_light/raw-content_theme_light.css
index 6d7deb43..6a2ed845 100644
--- a/frontend/app/components/raw-content/_theme/_light/raw-content_theme_light.css
+++ b/frontend/app/components/raw-content/_theme/_light/raw-content_theme_light.css
@@ -1,5 +1,5 @@
 .raw-content_theme_light {
-  blockquote {
+  & blockquote {
     border-left-color: var(--color45);
   }
 
diff --git a/frontend/app/components/root/root.css b/frontend/app/components/root/root.css
index 3494054f..d8fd2e45 100644
--- a/frontend/app/components/root/root.css
+++ b/frontend/app/components/root/root.css
@@ -5,8 +5,8 @@
   &::selection {
     background: var(--color42);
   }
+}
 
-  &_user-info {
-    position: static;
-  }
+.root_user-info {
+  position: static;
 }
diff --git a/frontend/app/components/root/root.tsx b/frontend/app/components/root/root.tsx
index 49c8e176..2990f2db 100644
--- a/frontend/app/components/root/root.tsx
+++ b/frontend/app/components/root/root.tsx
@@ -29,13 +29,13 @@ import { fetchComments, updateSorting, addComment, updateComment } from 'store/c
 import { setCommentsReadOnlyState } from 'store/post-info/actions';
 import { setTheme } from 'store/theme/actions';
 
-import AuthPanel from 'components/auth-panel';
-import Settings from 'components/settings';
-import { ConnectedComment as Comment } from 'components/comment/connected-comment';
-import { CommentForm } from 'components/comment-form';
-import Preloader from 'components/preloader';
-import { Thread } from 'components/thread';
 import { Button } from 'components/button';
+import Preloader from 'components/preloader';
+import Settings from 'components/settings';
+import AuthPanel from 'components/auth-panel';
+import { CommentForm } from 'components/comment-form';
+import { Thread } from 'components/thread';
+import { ConnectedComment as Comment } from 'components/comment/connected-comment';
 import { uploadImage, getPreview } from 'common/api';
 import { isUserAnonymous } from 'utils/isUserAnonymous';
 import { bindActions } from 'utils/actionBinder';
diff --git a/frontend/app/remark.tsx b/frontend/app/remark.tsx
index 8fbd5c2b..68765f03 100644
--- a/frontend/app/remark.tsx
+++ b/frontend/app/remark.tsx
@@ -3,9 +3,6 @@ import { bindActionCreators } from 'redux';
 import { Provider } from 'react-redux';
 import { IntlProvider } from 'react-intl';
 
-// importing css
-import 'components/list-comments';
-
 import { loadLocale } from 'utils/loadLocale';
 import { getLocale } from 'utils/getLocale';
 import { ConnectedRoot } from 'components/root';