Merge pull request #272 from AyumuNekozuki/dev-202208-fix

Dev 202208 fix
AyumuNekozuki · Sep 7, 2022 · f5a64a5 · f5a64a5
2 parents 9b9a912 + 2cb4f31
commit f5a64a5
Show file tree

Hide file tree

Showing 16 changed files with 419 additions and 281 deletions.
diff --git a/src/manifest.json b/src/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "niconico Darkmode",
-  "version": "2.4.6",
+  "version": "2.4.7",
   "description": "ニコニコをダークモード化する拡張機能",
   "icons": {
     "16": "images/icon16.png",

diff --git a/src/style_for/commons/library/_material.scss b/src/style_for/commons/library/_material.scss
@@ -5,9 +5,11 @@
     background: none;
 
     .materialContentsArea{
+			// メイン
       .materialLeft{
         .materialPreviewArea {
-          background-color: $main-background-color;
+					background-color: $nico-black;
+					border-color: $border-background-color;
           .materialHeadTitleArea{
             .materialHeadTitle{
               color: $main-text-color;
@@ -59,8 +61,9 @@
             .materialHeadTag{
               a{
                 color: $main-text-color;
-                background-color: $nico-black;
-                border-color: $nico-black;
+                background-color: $sub2-background-color;
+                border-color: $border-background-color;
+								margin-left: .25rem;
               }
             }
             .materialHeadTagEditAnchor{
@@ -90,10 +93,9 @@
           }
         }
         .materialDerivationSection{
-          border: none;
           .materialDerivationArea{
             background-color: $nico-black;
-            border-color: $nico-black;
+            border-color: $border-background-color;
             .commonsParents{
               .materialDerivationBodyParents{
                 .materialDerivationTitle{
@@ -157,7 +159,7 @@
           }
         }
         .materialHistoryLicense{
-          border-color: $nico-black;
+					border-color: $border-background-color;
           background-color: $nico-black;
           .materialHistoryLicenseTitle{
             color: $main-text-color;
@@ -182,7 +184,7 @@
         .materialCommentSection{
           .materialCommentBody{
             background-color: $nico-black;
-            border-color: $nico-black;
+						border-color: $border-background-color;
             .materialCommentTitle{
               color: $main-text-color;
             }
@@ -195,34 +197,43 @@
               background-color: $main-url-color;
               color: $main-text-color;
             }
-            #box_comment{
-              .materialCommentTable{
-                tr+tr{
-                  border-color: $border-background-color;
-                }
-                td{
-                  .materialCommentUserName{
-                    color: $main-text-color;
-                  }
-                  .comment_text{
-                    color: $main-text-color;
-                  }
-                }
-              }
-            }
-            #comment_command_base{
+						.materialCommentTable{
+							tr{
+								border-color: $border-background-color;
+							}
+							td{
+								.materialCommentUserName{
+									color: $main-text-color;
+								}
+								.comment_text{
+									color: $main-text-color;
+								}
+							}
+						}
+            .materialCommentCommandArea{
               .materialCommentInfoArea{
                 border-color: $border-background-color;
                 .materialCommentInfo{
                   color: $sub-1-text-color;
                 }
+              }
+							.materialCommentBlockArea{
+								a{
+									color: $main-text-color;
+									&:hover{
+										text-decoration: none;
+									}
+								}
               }
             }
           }
         }
         .materialReport{
           background-color: $nico-black;
-          border-color: $nico-black;
+					border-color: $border-background-color;
+					.materialTitleReport{
+						color: $main-text-color;
+					}
           p{
             color: $main-text-color;
             a{
@@ -243,10 +254,12 @@
           }
         }
       }
+			// サイドバー
       .materialRight{
         background: none;
         .materialProfileArea{
           background-color: $nico-black;
+					border-color: $border-background-color;
           .materialUserTitle{
             color: $main-text-color;
             border-color: $border-background-color;
@@ -285,6 +298,7 @@
         }
         .materialInfoArea{
           background-color: $nico-black;
+					border-color: $border-background-color;
           .materialInfoTitle{
             color: $main-text-color;
             border-color: $border-background-color

diff --git a/src/style_for/live/watch.scss b/src/style_for/live/watch.scss
@@ -1,4 +1,4 @@
-@import '../parts/default';
+@use '../parts/default' as *;
 @import '../parts/_serchbox';
 @import '../parts/_textarea';
 @import '../parts/_dropdown';
@@ -380,49 +380,71 @@
         background-color: $nico-black;
         border-color: $nico-black;
         box-shadow: none;
-        [class*="___primary-information-area___"]{ //枠タイトル・開始時間
-          [class*="___title___"],[class*="___program-title___"]{ //枠タイトル, fix210511
-            color: $main-text-color;
-            a{
-              color: inherit;
-            }
-            a::after{
-              filter: $invert;
-            }
-            a:hover{
-              color: $main-url-color;
-            }
-            a:hover::after{
-              filter: none;
-            }
-          }
-          [class*="___program-detail-area___"]{ //枠開始時間
-            [class*="___onair-time___"],[class*="___airtime___"]{
-              color: $sub-2-text-color;
-            }
-          }
-          [class*="___program-label-view___"][data-provider-type="channel"]{ //CHラベル
-            [class*="___limited-program-label___"]{
-              border-color: $nico-ch;
-              color: $nico-ch;
-            }
-          }
-          [class*="___program-label-view___"][data-provider-type="community"]{ //コミュラベル
-            [class*="___limited-program-label___"]{ //コミュ限
-              border-color: $nico-com;
-              color: $nico-com;
-            }
-            [class*="___video-premiere-label___"]{ //ライブ公開
-              border-color: $sub-1-text-color;
-              color: $sub-1-text-color;
-            }
-          }
-          [class*="___program-label-view___"]{ //有料生放送
-            [class*="___pay-program-label___"]{
-              border-color: $nico-point;
-              color: $nico-point;
-            }
-          }
+        [class*="___primary-information-area___"]{ 
+					[class*="___program-information-area___"]{ //番組情報
+						background-color: $nico-black;
+						[class*="___title___"],[class*="___program-title___"]{ //枠タイトル, fix210511
+							color: $main-text-color;
+							a{
+								color: inherit;
+							}
+							a::after{
+								filter: $invert;
+							}
+							a:hover{
+								color: $main-url-color;
+							}
+							a:hover::after{
+								filter: none;
+							}
+						}
+						[class*="___program-detail-area___"]{ //枠開始時間
+							[class*="___onair-time___"],[class*="___airtime___"]{
+								color: $sub-2-text-color;
+							}
+						}
+						[class*="___program-label-view___"][data-provider-type="channel"]{ //CHラベル
+							[class*="___limited-program-label___"]{
+								border-color: $nico-ch;
+								color: $nico-ch;
+							}
+						}
+						[class*="___program-label-view___"][data-provider-type="community"]{ //コミュラベル
+							[class*="___limited-program-label___"]{ //コミュ限
+								border-color: $nico-com;
+								color: $nico-com;
+							}
+							[class*="___video-premiere-label___"]{ //ライブ公開
+								border-color: $sub-1-text-color;
+								color: $sub-1-text-color;
+							}
+						}
+						[class*="___program-label-view___"]{ //有料生放送
+							[class*="___pay-program-label___"]{
+								border-color: $nico-point;
+								color: $nico-point;
+							}
+						}
+					}
+					[class*="___program-edit-anchor-area___"]{ //番組編集ボタン
+						[class*="___program-edit-anchor___"]{
+							// TODO 対処考える
+							--anchor-border: 2px solid #555;
+							--anchor-background-color: #252525;
+							--anchor-color: #f5f5f5;
+
+							[class*="___content___"]{
+								color: var(--anchor-color);
+							}
+							svg > path{
+								fill: var(--anchor-color);
+							}
+
+							&:hover{
+								--anchor-color: #0080ff;
+							}
+						}
+					}
         }
         [class*="___menu-dock___"]{ //Share
           [class*="___extra-popup-control___"],

diff --git a/src/style_for/parts/_serchbox.scss b/src/style_for/parts/_serchbox.scss
@@ -3,37 +3,37 @@
 .niconico-darkmode-setting-true{
   .TopPage,.UserPageHeader{
     .SearchContainer{
-      .CrossSearch_Re{
-        .CrossSearch_Re-rowSelector{
+      .CrossSearch{
+        .CrossSearch-rowSelector{
           border-color: $sub2-background-color;
           background: $sub2-background-color;
-          .CrossSearch_Re-rowService{
+          .CrossSearch-rowService{
             color: $main-text-color;
           }
-          .CrossSearch_Re-rowService.active,
-          .CrossSearch_Re-rowService:hover{
+          .CrossSearch-rowService.active,
+          .CrossSearch-rowService:hover{
             background: $hover-background-color;
           }
         }
-        .CrossSearch_Re-pullDownSelector{
-          .CrossSearch_Re-pullDownButton{
+        .CrossSearch-pullDownSelector{
+          .CrossSearch-pullDownButton{
             border: none;
             background-color: $sub2-background-color;
 
           }
-          .CrossSearch_Re-pullDownButton.active,
-          .CrossSearch_Re-pullDownButton:hover{
+          .CrossSearch-pullDownButton.active,
+          .CrossSearch-pullDownButton:hover{
             background-color: $hover-background-color;
           }
-          .CrossSearch_Re-pullDownList{
+          .CrossSearch-pullDownList{
             background-color: $sub2-background-color;
             border-color: $border-background-color;
-            .CrossSearch_Re-pullDownService{
+            .CrossSearch-pullDownService{
               color: $main-text-color;
             }
           }
         }
-        .CrossSearch_Re-form{
+        .CrossSearch-form{
           background: $sub2-background-color;
           box-shadow: inset 0 0 0 1px $sub2-background-color;
           border: none;