From 1ce93391f7a01ec0fbf2e4f26a9217bb8d87284d Mon Sep 17 00:00:00 2001 From: BuildTools Date: Fri, 26 Mar 2021 19:26:41 +0000 Subject: [PATCH 1/4] Styling of language select Fixed active theme button Fixed some fonts not showing in settings --- src/js/settings.js | 4 +- src/sass/style.scss | 104 ++++++++++++++++++++++++++++++-------------- 2 files changed, 74 insertions(+), 34 deletions(-) diff --git a/src/js/settings.js b/src/js/settings.js index 4ee7911cc..7f444183a 100644 --- a/src/js/settings.js +++ b/src/js/settings.js @@ -433,7 +433,7 @@ async function fillSettingsPage() { let fontsEl = $(".pageSettings .section.fontFamily .buttons").empty(); Misc.getFontsList().then((fonts) => { fonts.forEach((font) => { - if (Config.fontFamily === font.name) isCustomFont(false); + if (Config.fontFamily === font.name) isCustomFont = false; fontsEl.append( `
{ let theme = $(e.currentTarget).attr("theme"); if (!$(e.target).hasClass("favButton")) { UpdateConfig.setTheme(theme); - UpdateConfig.setActiveThemeButton(); + setActiveThemeButton(); refreshThemeButtons(); } }); diff --git a/src/sass/style.scss b/src/sass/style.scss index 1109b2499..572f1c194 100644 --- a/src/sass/style.scss +++ b/src/sass/style.scss @@ -117,6 +117,76 @@ html { overflow-y: scroll; } +.select2-dropdown { + background-color: var(--bg-color); + color: var(--text-color); + outline: none; +} + +.select2-selection { + background: rgba(0, 0, 0, 0.1); + height: fit-content; + padding: 5px; + border-radius: 5px; + color: var(--text-color); + font: var(--font); + border: none; + outline: none; +} + +.select2-container--default .select2-selection--single .select2-selection__rendered { + color: var(--text-color); + outline: none; +} + +.select2-container--default .select2-results__option--highlighted.select2-results__option--selectable { + background-color: var(--sub-color); + color: var(--bg-color); +} + +.select2-container--default .select2-results__option--selected { + background-color: var(--main-color); + color: var(--bg-color); +} + +.select2-container--open .select2-dropdown--below { + border-color: rgba(0, 0, 0, 0.1); + background: var(--bg-color); + color: var(--sub-color); +} + +.select2-container--default .select2-selection--single +{ + color: var(--text-color); + background: rgba(0, 0, 0, 0.1); + outline: none; + border: none; + height:auto; +} + +.select2-selection:focus{ + height: fit-content; + padding: 5px; + border-radius: 5px; + color: var(--text-color); + font: var(--font); + border: none; + outline: none; +} +.select2-selection:active{ + height: fit-content; + padding: 5px; + border-radius: 5px; + color: var(--text-color); + font: var(--font); + border: none; + outline: none; +} + +.select2-container--default .select2-selection--single .select2-selection__arrow { + height: 35px; +} + /* width */ ::-webkit-scrollbar { width: 7px; @@ -540,6 +610,8 @@ a:hover { gap: 1rem; width: 400px; + + .lengthgrid{ display:grid; grid-template-columns: 1fr 1fr; @@ -551,38 +623,6 @@ a:hover { width: 10rem; } - #languageList{ - background: rgba(0, 0, 0, 0.1); - height: fit-content; - padding: 5px; - border-radius: 5px; - color: var(--text-color); - font: var(--font); - border: none; - - - option{ - background: var(--bg-color); - } - } - #languageList:focus{ - height: fit-content; - padding: 5px; - border-radius: 5px; - color: var(--text-color); - font: var(--font); - border: none; - outline: none; - } - #languageList:active{ - height: fit-content; - padding: 5px; - border-radius: 5px; - color: var(--text-color); - font: var(--font); - border: none; - outline: none; - } .wftip{ color: var(--sub-color); font-size: 0.8rem; From 766938e04eabb23e49494504ca801acadca30096 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sat, 27 Mar 2021 17:56:57 +0000 Subject: [PATCH 2/4] Styling of word filter Trimmed include and exclude fields --- src/js/word-filter.js | 2 ++ src/sass/style.scss | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/src/js/word-filter.js b/src/js/word-filter.js index ced7eac18..bff64a327 100644 --- a/src/js/word-filter.js +++ b/src/js/word-filter.js @@ -54,9 +54,11 @@ $("#wordFilterPopupWrapper .button").mousedown((e) => { async function filter(language){ let filterin = $("#wordFilter").val(); + filterin = filterin.trim(); filterin = filterin.replace(/ /gi, "|"); let regincl = new RegExp(filterin, "i"); let filterout = $("#wordExclude").val(); + filterout = filterout.trim(); filterout = filterout.replace(/ /gi, "|"); let regexcl = new RegExp(filterout, "i"); let filteredWords = []; diff --git a/src/sass/style.scss b/src/sass/style.scss index 572f1c194..a96166813 100644 --- a/src/sass/style.scss +++ b/src/sass/style.scss @@ -187,6 +187,14 @@ html { height: 35px; } +.select2-container--default .select2-selection--single .select2-selection__arrow b { + border-color: var(--main-color) transparent transparent transparent; +} + +.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b { + border-color: var(--main-color) transparent; +} + /* width */ ::-webkit-scrollbar { width: 7px; From feed802365a111a35fe78e2ef27061beb82154c3 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sat, 27 Mar 2021 17:59:05 +0000 Subject: [PATCH 3/4] Removed Comment --- src/js/quote-search-popup.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/js/quote-search-popup.js b/src/js/quote-search-popup.js index 856896630..29ef78b5f 100644 --- a/src/js/quote-search-popup.js +++ b/src/js/quote-search-popup.js @@ -124,13 +124,6 @@ $("#quoteSearchPopup .searchBox").keydown((e) => { updateResults(searchText); }, 0.1); //arbitrarily v. small time as it's only to allow text to input before searching }); -// //sets quote id to searched quote clicked -// $("#quoteSearchResults").click((e) => { -// if ($(e.target).hasClass("quoteSearchButton")) { -// document.getElementById("inputNumber").value = e.target.getAttribute("id"); -// applyMode2Popup(); -// } -// }); $("#quoteSearchPopupWrapper").click((e) => { if ($(e.target).attr("id") === "quoteSearchPopupWrapper") { From d74d9a5fbb2937de7a5db40aba71d03e353a856f Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sat, 27 Mar 2021 18:26:26 +0000 Subject: [PATCH 4/4] Added roundness Changed Colors --- src/sass/style.scss | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/sass/style.scss b/src/sass/style.scss index a96166813..beb3baaea 100644 --- a/src/sass/style.scss +++ b/src/sass/style.scss @@ -127,7 +127,7 @@ html { background: rgba(0, 0, 0, 0.1); height: fit-content; padding: 5px; - border-radius: 5px; + border-radius: var(--roundness); color: var(--text-color); font: var(--font); border: none; @@ -141,7 +141,7 @@ html { .select2-container--default .select2-results__option--highlighted.select2-results__option--selectable { background-color: var(--sub-color); - color: var(--bg-color); + color: var(--text-color); } .select2-container--default .select2-results__option--selected { @@ -153,6 +153,7 @@ html { border-color: rgba(0, 0, 0, 0.1); background: var(--bg-color); color: var(--sub-color); + border-radius: var(--roundness); } .select2-container--default .select2-selection--single @@ -167,7 +168,7 @@ html { .select2-selection:focus{ height: fit-content; padding: 5px; - border-radius: 5px; + border-radius: var(--roundness); color: var(--text-color); font: var(--font); border: none; @@ -176,7 +177,7 @@ html { .select2-selection:active{ height: fit-content; padding: 5px; - border-radius: 5px; + border-radius: var(--roundness); color: var(--text-color); font: var(--font); border: none;