Merge branch 'main' into issue-295-文章列表没有数据时不触底更新

IdeaLeap · Feb 20, 2023 · 6f9e129 · 6f9e129
2 parents f293401 + 48807a0
commit 6f9e129
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/frontend/components/ArticlesContent/SideBar/Right/Column.vue b/frontend/components/ArticlesContent/SideBar/Right/Column.vue
@@ -152,7 +152,6 @@ onUnmounted(() => {
 }
 
 .active {
-  /* color: rgb(0, 127, 255); */
   @apply text-jj-link-normal;
 }
 </style>
diff --git a/frontend/pages/article/[id].vue b/frontend/pages/article/[id].vue
@@ -49,28 +49,29 @@ onMounted(() => {
 .view-container {
   @apply bg-jj-main;
 }
-@media screen and (max-width: 1320px) and (min-width: 1140px) {
+@media (max-width: 1320px) and (min-width: 1140px) {
   .view-container {
     width: 1320px;
   }
 }
 .main-area {
-  border-radius: 4px;
   padding-left: 2.67rem;
   padding-right: 2.67rem;
+  border-radius: 4px;
   box-sizing: border-box;
   position: relative;
   width: 820px;
   max-width: 100%;
   @apply bg-jj-article mb-1.5rem;
 }
-@media screen and (max-width: 1140px) {
+
+@media (max-width: 1140px) {
   .main-area {
     width: calc(100% - 26.67rem);
   }
 }
 
-@media screen and (max-width: 1000px) {
+@media (max-width: 1000px) {
   .article-area {
     margin-bottom: 0;
   }