From e5f24b8f12760d17bf663e45a415ca4205e153fd Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Sat, 28 Sep 2019 12:36:34 -0400 Subject: [PATCH 01/14] Fix paragraph tags --- ext/bg/context.html | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ext/bg/context.html b/ext/bg/context.html index 198ccd42..a42faa7a 100644 --- a/ext/bg/context.html +++ b/ext/bg/context.html @@ -14,20 +14,20 @@ .btn-group { display: flex; + margin-top: 10px; + white-space: nowrap; } -

+

-

-

-

- - - -
-

+
+
+ + + +
From 597f658b26de3676f1fae0e39f1804bffe7b2b1a Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Sat, 28 Sep 2019 15:38:09 -0400 Subject: [PATCH 02/14] Move glyphicons into span element --- ext/bg/context.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/bg/context.html b/ext/bg/context.html index a42faa7a..51346838 100644 --- a/ext/bg/context.html +++ b/ext/bg/context.html @@ -24,9 +24,9 @@
- - - + + +
From 9217b5c79b56d77136653c613815b2447cebed9d Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Sat, 28 Sep 2019 12:41:24 -0400 Subject: [PATCH 03/14] Move settings style to separate CSS file --- ext/bg/css/settings.css | 124 ++++++++++++++++++++++++++++++++++++++++ ext/bg/settings.html | 108 +--------------------------------- 2 files changed, 125 insertions(+), 107 deletions(-) create mode 100644 ext/bg/css/settings.css diff --git a/ext/bg/css/settings.css b/ext/bg/css/settings.css new file mode 100644 index 00000000..150209e3 --- /dev/null +++ b/ext/bg/css/settings.css @@ -0,0 +1,124 @@ +/* + * Copyright (C) 2019 Alex Yatskov + * Author: Alex Yatskov + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + + +#anki-spinner, #anki-general, #anki-error, +#dict-spinner, #dict-error, #dict-warning, #dict-purge, #dict-import-progress, +#debug, .options-advanced, .storage-hidden, #storage-spinner { + display: none; +} + +.tab-content { + border-bottom: 1px #ddd solid; + border-left: 1px #ddd solid; + border-right: 1px #ddd solid; + padding: 10px; +} + +#field-templates { + font-family: monospace; + overflow-x: hidden; + white-space: pre; +} + +.bottom-links { + padding-bottom: 1em; +} + +.label-light { + font-weight: normal; +} + +.form-control.is-invalid { + border-color: #f00000; +} + +.condition>.condition-prefix:after { + content: "IF"; +} +.condition:nth-child(n+2)>.condition-prefix:after { + content: "AND"; +} + +.input-group .condition-prefix, +.input-group .condition-group-separator-label { + width: 60px; + text-align: center; +} +.input-group .condition-group-separator-label { + padding: 6px 12px; + font-weight: bold; + display: inline-block; +} +.input-group .condition-type, +.input-group .condition-operator { + width: auto; + text-align: center; + text-align-last: center; +} + +.condition-group>.condition>div:first-child { + border-bottom-left-radius: 0; +} +.condition-group>.condition:nth-child(n+2)>div:first-child { + border-top-left-radius: 0; +} +.condition-group>.condition:nth-child(n+2)>div:last-child>button { + border-top-right-radius: 0; +} +.condition-group>.condition:nth-last-child(n+2)>div:last-child>button { + border-bottom-right-radius: 0; +} +.condition-group-options>.condition-add { + border-top-left-radius: 0; + border-top-right-radius: 0; +} + +.condition-groups>*:last-of-type { + display: none; +} + +#custom-popup-css { + width: 100%; + min-height: 34px; + height: 96px; + resize: vertical; + font-family: 'Courier New', Courier, monospace; + white-space: pre; +} + +[data-show-for-browser] { + display: none; +} + +[data-browser=edge] [data-show-for-browser~=edge], +[data-browser=chrome] [data-show-for-browser~=chrome], +[data-browser=firefox] [data-show-for-browser~=firefox], +[data-browser=firefox-mobile] [data-show-for-browser~=firefox-mobile] { + display: initial; +} + +@media screen and (max-width: 740px) { + .col-xs-6 { + float: none; + width: 100%; + } + .col-xs-6+.col-xs-6 { + margin-top: 15px; + } +} diff --git a/ext/bg/settings.html b/ext/bg/settings.html index 6fdd54c4..02780f38 100644 --- a/ext/bg/settings.html +++ b/ext/bg/settings.html @@ -6,113 +6,7 @@ Yomichan Options - +
From 4e0fe1d5fb53bdd2e6c1c061127bca4053dec922 Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Sat, 28 Sep 2019 12:48:46 -0400 Subject: [PATCH 04/14] Limit width of the HTML pages --- ext/bg/legal.html | 2 +- ext/bg/search.html | 2 +- ext/bg/settings.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/bg/legal.html b/ext/bg/legal.html index 28c7fb21..9750d1d6 100644 --- a/ext/bg/legal.html +++ b/ext/bg/legal.html @@ -8,7 +8,7 @@ -
+

Yomichan License

 Copyright (C) 2016-2017  Alex Yatskov
diff --git a/ext/bg/search.html b/ext/bg/search.html
index 121b477c..668b2436 100644
--- a/ext/bg/search.html
+++ b/ext/bg/search.html
@@ -9,7 +9,7 @@
         
     
     
-        

+        

             

                 

                     
Yomichan Search

diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index 02780f38..4db0a9b0 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -9,7 +9,7 @@
         
     
     
-        

+        

             

                 
Profiles

 

From 9b929ffcd4bf34b784b94137f636a8a483b1f18e Mon Sep 17 00:00:00 2001
From: toasted-nutbread 
Date: Sat, 28 Sep 2019 13:30:41 -0400
Subject: [PATCH 05/14] Add wrapping for usage conditions on small screens

---
 ext/bg/css/settings.css | 30 ++++++++++++++++++++++++++++++
 ext/bg/settings.html    |  3 ++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/ext/bg/css/settings.css b/ext/bg/css/settings.css
index 150209e3..12bbe8a8 100644
--- a/ext/bg/css/settings.css
+++ b/ext/bg/css/settings.css
@@ -48,6 +48,20 @@
     border-color: #f00000;
 }
 
+.condition {
+    display: flex;
+    -flex-wrap: wrap;
+}
+.condition-input {
+    flex: 1 1 auto;
+}
+.condition-line-break {
+    flex: 1 0 100%;
+    display: none;
+}
+.condition>.input-group-btn {
+    width: auto;
+}
 .condition>.condition-prefix:after {
     content: "IF";
 }
@@ -55,6 +69,9 @@
     content: "AND";
 }
 
+.input-group .condition-prefix {
+    flex: 0 0 auto;
+}
 .input-group .condition-prefix,
 .input-group .condition-group-separator-label {
     width: 60px;
@@ -122,3 +139,16 @@
         margin-top: 15px;
     }
 }
+
+@media screen and (max-width: 600px) {
+    .condition {
+        flex-wrap: wrap;
+    }
+    .condition-input {
+        order: 2;
+    }
+    .condition-line-break {
+        display: block;
+        order: 1;
+    }
+}
diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index 4db0a9b0..1406826b 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -105,7 +105,8 @@
                     

                     

                     

-                    
+                    

+