From: symant233 <symant233@gmail.com>
Date: Fri, 13 Dec 2019 03:56:36 +0000 (+0800)
Subject: trying to fix conflict
X-Git-Tag: 0.3.7~10^2~1^2~1
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;ds=sidebyside;h=0115285e10d25eacfbeedd65edcf666fb89dc4ca;p=nhentai.git

trying to fix conflict
---

diff --git a/nhentai/viewer/main.css b/nhentai/viewer/main.css
index 5ddd17e..d674eef 100644
--- a/nhentai/viewer/main.css
+++ b/nhentai/viewer/main.css
@@ -64,8 +64,7 @@ sup {
 }
 
 img {
-    border-style: none;
-    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+    border-style: none
 }
 
 label {
@@ -255,6 +254,14 @@ html.theme-black code {
     background-color: #292929
 }
 
+/*
+    trying to fix conflict
+*/
+
+div {
+    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+}
+
 :focus {
     outline: 0;
     border:none;