Merge branch 'master' into testing

1 files changed, 154 insertions, 0 deletions

diff --git a/ext/bg/css/settings.css b/ext/bg/css/settings.css
new file mode 100644
index 00000000..12bbe8a8
--- /dev/null
+++ b/ext/bg/css/settings.css
@@ -0,0 +1,154 @@
+/*
+ * Copyright (C) 2019  Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+
+#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 {
+    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";
+}
+.condition:nth-child(n+2)>.condition-prefix:after {
+    content: "AND";
+}
+
+.input-group .condition-prefix {
+    flex: 0 0 auto;
+}
+.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;
+    }
+}
+
+@media screen and (max-width: 600px) {
+    .condition {
+        flex-wrap: wrap;
+    }
+    .condition-input {
+        order: 2;
+    }
+    .condition-line-break {
+        display: block;
+        order: 1;
+    }
+}