Merge pull request #950 from 42organization/GGFE-192-style-lint-error

[GGFE-192] stylelint all 속성 순서 설정에 추가
42organization · Aug 22, 2023 · 0b4b69a · 0b4b69a
2 parents 59c3643 + 106120c
commit 0b4b69a
Show file tree

Hide file tree

Showing 15 changed files with 47 additions and 46 deletions.
diff --git a/.stylelintrc.json b/.stylelintrc.json
@@ -37,6 +37,7 @@
             "declarations"
         ],
         "order/properties-order": [
+            "all",
             "position",
             "top",
             "right",

diff --git a/styles/Layout/MegaPhone.module.scss b/styles/Layout/MegaPhone.module.scss
@@ -64,20 +64,20 @@
 }
 
 .content {
-  height: 1.1rem;
-  width: 95%;
   display: flex;
-  justify-content: center;
-  align-items: center;
+  width: 95%;
+  height: 1.1rem;
   font-size: 0.7rem;
   white-space: nowrap;
+  justify-content: center;
+  align-items: center;
 }
 
 .intraId {
-  height: 1rem;
-  width: 50%;
   display: flex;
+  width: 50%;
+  height: 1rem;
+  font-size: 0.5rem;
   justify-content: center;
   align-items: center;
-  font-size: 0.5rem;
 }
diff --git a/styles/Layout/MenuBar.module.scss b/styles/Layout/MenuBar.module.scss
@@ -21,13 +21,13 @@
       font-size: 1.8rem;
     }
     button {
+      all: unset;
       width: 1.2rem;
       font-size: 1.5rem;
       color: rgba(101, 97, 102, 1);
       text-align: center;
       text-shadow: none;
       cursor: pointer;
-      all: unset;
     }
   }
   .menuProfileWrapper {

diff --git a/styles/Layout/NotiBar.module.scss b/styles/Layout/NotiBar.module.scss
@@ -18,14 +18,14 @@
   .closeButtonWrapper {
     padding-bottom: 1.4rem;
     button {
+      all: unset;
       width: 1.2rem;
       margin-left: auto;
       font-size: 1.5rem;
       color: rgba(101, 97, 102, 1);
       text-align: center;
       text-shadow: none;
       cursor: pointer;
-      all: unset;
     }
   }
 

diff --git a/styles/ProfileColor.scss b/styles/ProfileColor.scss
@@ -74,8 +74,8 @@ $edge-skyblue: linear-gradient(
 );
 
 @mixin profileEdge($size) {
-  height: $size;
   width: $size;
+  height: $size;
   margin-top: 0.2rem;
   margin-bottom: 0.2rem;
   border-radius: 50%;

diff --git a/styles/admin/announcement/AnnounceEdit.module.scss b/styles/admin/announcement/AnnounceEdit.module.scss
@@ -88,6 +88,7 @@
   gap: 1rem;
 
   button {
+    all: unset;
     width: 5rem;
     height: 2rem;
     font-size: $small-font;
@@ -96,7 +97,6 @@
     cursor: pointer;
     background: gray;
     border-radius: 0.5rem;
-    all: unset;
   }
 
   :nth-child(2) {

diff --git a/styles/admin/modal/AdminNoti.module.scss b/styles/admin/modal/AdminNoti.module.scss
@@ -138,11 +138,11 @@
   flex-wrap: wrap;
 
   input {
+    all: unset;
     width: calc(100% - 4rem);
     padding: 0.5rem 0.8rem;
     margin-left: 0.5rem;
     color: black;
-    all: unset;
   }
   .icons {
     span {

diff --git a/styles/admin/season/SeasonCreate.module.scss b/styles/admin/season/SeasonCreate.module.scss
@@ -40,6 +40,7 @@
   align-items: center;
 
   button {
+    all: unset;
     width: 4rem;
     height: 1.5rem;
     font-size: $small-font;
@@ -48,6 +49,5 @@
     cursor: pointer;
     background: $btn-blue;
     border-radius: 0.5rem;
-    all: unset;
   }
 }
diff --git a/styles/admin/season/SeasonList.module.scss b/styles/admin/season/SeasonList.module.scss
@@ -36,6 +36,7 @@
 }
 
 .editBtn {
+  all: unset;
   width: 3rem;
   height: 1.6rem;
   margin: 0 0.2rem;
@@ -45,5 +46,4 @@
   cursor: pointer;
   background: $dark-gray;
   border-radius: 0.5rem;
-  all: unset;
 }
diff --git a/styles/common.scss b/styles/common.scss
@@ -117,17 +117,18 @@ $text-shadow-blue: 2px 2px 0px $pp-blue;
 }
 
 @mixin match-noti-button {
+  all: unset;
   padding: 0.2rem 0.5rem;
   margin: 0.7rem 0;
   font-weight: 700;
   color: $light-gray;
   text-align: center;
   cursor: pointer;
   background: rgba(255, 255, 255, 0.3);
-  all: unset;
 }
 
 @mixin reload-button {
+  all: unset;
   width: 1.6rem;
   height: 1.6rem;
   font-weight: 700;
@@ -136,7 +137,6 @@ $text-shadow-blue: 2px 2px 0px $pp-blue;
   cursor: pointer;
   background: rgba(255, 255, 255, 0.3);
   border-radius: 50%;
-  all: unset;
 }
 
 @mixin pageWrap {
@@ -176,6 +176,7 @@ $text-shadow-blue: 2px 2px 0px $pp-blue;
 }
 
 @mixin button($btn-color, $txt-color, $width: 8rem, $height: 2.8rem) {
+  all: unset;
   width: $width;
   height: $height;
   font-size: $medium-font;
@@ -188,7 +189,6 @@ $text-shadow-blue: 2px 2px 0px $pp-blue;
     $btn-color
   );
   border-radius: $small-radius;
-  all: unset;
 }
 
 @mixin select-buttons($width: 8rem, $height: 2.8rem) {
@@ -228,6 +228,7 @@ $text-shadow-blue: 2px 2px 0px $pp-blue;
 }
 
 @mixin modal-phrase {
+  margin: 1rem 0;
   margin-bottom: 2rem;
   text-align: center;
   .emoji {
@@ -238,7 +239,6 @@ $text-shadow-blue: 2px 2px 0px $pp-blue;
     margin-top: 0.5rem;
     line-height: 1.5;
   }
-  margin: 1rem 0;
 }
 
 @mixin modalContainer($type) {

diff --git a/styles/main/SearchBar.module.scss b/styles/main/SearchBar.module.scss
@@ -14,11 +14,11 @@
   justify-content: space-between;
   align-items: center;
   input {
+    all: unset;
     box-sizing: border-box;
     width: calc(100% - 4rem);
     padding: 0.7rem 0.5rem;
     color: #ffffff;
-    all: unset;
     &::placeholder {
       color: #1f0b36;
     }

diff --git a/styles/match/MatchBoard.module.scss b/styles/match/MatchBoard.module.scss
@@ -16,13 +16,13 @@
 }
 
 .slotButton {
+  all: unset;
   display: flex;
   height: 2.3rem;
   padding: 0 0.6rem;
   margin: 0.1rem;
   cursor: pointer;
   border-radius: $mini-radius;
-  all: unset;
   justify-content: space-between;
   align-items: center;
 

diff --git a/styles/modal/store/GachaBall.module.scss b/styles/modal/store/GachaBall.module.scss
@@ -1,23 +1,23 @@
 @mixin ball($color, $outline, $angle) {
+  position: absolute;
   width: 3rem;
   height: 3rem;
-  border-radius: 100%;
+  overflow: hidden;
   background-color: $color;
   border: solid 0.25rem $outline;
-  position: absolute;
-  overflow: hidden;
+  border-radius: 100%;
   transform: rotate($angle);
 
   &::after {
-    content: '';
-    display: block;
     position: absolute;
     top: 50%;
-    height: 200%;
+    display: block;
     width: 200%;
+    height: 200%;
+    content: '';
     background-color: #f7fcff;
-    border-radius: 100%;
     border: inherit;
+    border-radius: 100%;
     transform: translate(17%, -55%);
   }
 }
@@ -31,63 +31,63 @@
     background-color: #38f3fd49;
     border: 0.625rem solid #b2c9f7;
     border-radius: 15%;
-    opacity: 0.8;
     box-shadow: 0 0.625rem 1.25rem rgb(255, 255, 255) inset;
+    opacity: 0.8;
     .balls {
       position: relative;
       .ball0 {
         @include ball(#ec6767, #d14040, 90deg);
-        margin-top: 45%;
         right: 18%;
+        margin-top: 45%;
       }
       .ball1 {
         @include ball(#2facff, #3660bb, 60deg);
         margin-top: 65%;
       }
       .ball2 {
         @include ball(#2fffc8, #1f9978, 230deg);
-        margin-top: 48%;
         left: 33%;
+        margin-top: 48%;
       }
       .ball3 {
         @include ball(#e7ff2f, #abbd20, 210deg);
-        margin-top: 67%;
         left: 50%;
+        margin-top: 67%;
       }
       .ball4 {
         @include ball(#eb7bff, #e23eff, 40deg);
-        margin-top: 70%;
         left: 30%;
+        margin-top: 70%;
       }
       .ball5 {
         @include ball(#0aaf46, #02501f, 230deg);
-        margin-top: 41%;
         left: 1%;
+        margin-top: 41%;
       }
       .ball6 {
         @include ball(#fffc68, #e5e11e, 200deg);
-        margin-top: 40%;
         right: 1%;
+        margin-top: 40%;
       }
       .ball7 {
         @include ball(#b943f4, #66127d, 180deg);
-        margin-top: 71%;
         left: 10%;
+        margin-top: 71%;
       }
       .ball8 {
         @include ball(#ff2f47, #911a28, 80deg);
-        margin-top: 50%;
         left: 13%;
+        margin-top: 50%;
       }
       .ball9 {
         @include ball(#090488, #04023f, 100deg);
-        margin-top: 55%;
         right: 5%;
+        margin-top: 55%;
       }
       .ball10 {
         @include ball(#ff7b2f, #d94f00, 270deg);
-        margin-top: 71%;
         right: 2%;
+        margin-top: 71%;
       }
     }
   }

diff --git a/styles/modal/store/InventoryModal.module.scss b/styles/modal/store/InventoryModal.module.scss
@@ -68,8 +68,8 @@
 .idPreviewContainer {
   .title {
     margin: 0 0 0.3rem 0.5rem;
-    color: $dark-gray;
     font-size: $small-font;
+    color: $dark-gray;
   }
 }
 
@@ -81,22 +81,22 @@
   img {
     width: 5.5rem;
     height: 5.5rem;
-    border-radius: 50%;
     overflow: hidden;
+    border-radius: 50%;
     object-fit: cover;
   }
   svg {
     margin: 0 1.5rem;
   }
   .profilePreview {
     display: flex;
-    justify-content: center;
-    align-items: center;
     width: 5.5rem;
     height: 5.5rem;
-    border-radius: 50%;
-    background-color: #c7b1ee;
     cursor: pointer;
+    background-color: #c7b1ee;
+    border-radius: 50%;
+    justify-content: center;
+    align-items: center;
     svg {
       width: 2.5rem;
       height: 2.5rem;

diff --git a/styles/rank/RankList.module.scss b/styles/rank/RankList.module.scss
@@ -93,12 +93,12 @@
     }
   }
   .statusMessage {
-    justify-self: left;
     max-width: 100%;
-    color: $dark-gray;
     overflow: hidden;
+    color: $dark-gray;
     text-overflow: ellipsis;
     white-space: nowrap;
+    justify-self: left;
   }
   .ppp {
     font-weight: 600;