From d4b01b3dad098db3693b85143267371a85f527be Mon Sep 17 00:00:00 2001 From: suziwen Date: Fri, 16 Aug 2024 22:17:09 +0800 Subject: [PATCH] compatible with small screen --- .../overlay/manifest-firefox.json | 2 +- .../src/coffee/background_preload.coffee | 2 +- .../src/module/options.coffee | 2 +- omega-web/lib/themes/base.css | 6 ++-- omega-web/src/less/options.less | 35 +++++++++++++++++++ omega-web/src/options.jade | 2 +- omega-web/src/popup.jade | 2 +- omega-web/src/popup/index.html | 2 +- 8 files changed, 44 insertions(+), 9 deletions(-) diff --git a/omega-target-chromium-extension/overlay/manifest-firefox.json b/omega-target-chromium-extension/overlay/manifest-firefox.json index 6b38ec77..0fa56010 100644 --- a/omega-target-chromium-extension/overlay/manifest-firefox.json +++ b/omega-target-chromium-extension/overlay/manifest-firefox.json @@ -48,7 +48,7 @@ "browser_specific_settings": { "gecko": { "id": "suziwen1@gmail.com", - "strict_min_version": "92.0" + "strict_min_version": "112.0" } } } diff --git a/omega-target-chromium-extension/src/coffee/background_preload.coffee b/omega-target-chromium-extension/src/coffee/background_preload.coffee index 7febf6ae..81598894 100644 --- a/omega-target-chromium-extension/src/coffee/background_preload.coffee +++ b/omega-target-chromium-extension/src/coffee/background_preload.coffee @@ -4,7 +4,7 @@ if not globalThis.window window.UglifyJS_NoUnsafeEval = true createContextMenu = -> - chrome.contextMenus.create({ + chrome.contextMenus?.create({ id: 'enableQuickSwitch' title: chrome.i18n.getMessage('contextMenu_enableQuickSwitch') type: 'checkbox' diff --git a/omega-target-chromium-extension/src/module/options.coffee b/omega-target-chromium-extension/src/module/options.coffee index 82c9d74f..b43c592d 100644 --- a/omega-target-chromium-extension/src/module/options.coffee +++ b/omega-target-chromium-extension/src/module/options.coffee @@ -25,7 +25,7 @@ class ChromeOptions extends OmegaTarget.Options @ready.then( => @updateProfile() ) - chrome.contextMenus.onClicked.addListener((info, tab) => + chrome.contextMenus?.onClicked.addListener((info, tab) => @ready.then( => switch info.menuItemId when 'enableQuickSwitch' diff --git a/omega-web/lib/themes/base.css b/omega-web/lib/themes/base.css index c7665d0f..f78d7aa4 100644 --- a/omega-web/lib/themes/base.css +++ b/omega-web/lib/themes/base.css @@ -167,13 +167,13 @@ fieldset[disabled] .form-control { .alert-info { color: var(--infoColor); - background-color: transparent; + background: var(--defaultBackground); border-color: var(--lighterBackground); position: relative; } .alert-success { color: var(--positiveColor); - background-color: transparent; + background: var(--defaultBackground); border-color: var(--lighterBackground); position: relative; } @@ -191,7 +191,7 @@ fieldset[disabled] .form-control { .alert-danger { color: var(--negativeColor); - background-color: transparent; + background: var(--defaultBackground); border-color: var(--lighterBackground); position: relative; } diff --git a/omega-web/src/less/options.less b/omega-web/src/less/options.less index 2c2a660b..e1521d26 100644 --- a/omega-web/src/less/options.less +++ b/omega-web/src/less/options.less @@ -393,6 +393,41 @@ main { .table-responsive .dropdown-menu { position: static !important; } + .btn { + padding: 1px 5px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; + } + select.form-control { + line-height: 1; + padding: 0; + height: 25px; + } + main { + border-top: 3px dotted; + margin-top: 20px; + } + main .page-header{ + padding: 20px 0; + } + select.form-control.inline-form-control { + display: block; + height: 25px; + margin: 20px 0; + width: 100% !important; + min-width: 100%; + } + textarea.width-limit{ + max-width: 100%; + } + .settings-group > * { + margin-left: 0; + } + .profile-actions{ + float: initial; + margin: 10px 0; + } } .fixed-servers, diff --git a/omega-web/src/options.jade b/omega-web/src/options.jade index b26e8289..02c843c9 100644 --- a/omega-web/src/options.jade +++ b/omega-web/src/options.jade @@ -2,7 +2,7 @@ doctype html html(lang='en' ng-controller='MasterCtrl' ng-csp) head meta(charset='utf-8') - title(ng-bind="'options_title' | tr") SwitchyOmega Options + title {{'options_title' | tr}} (Z​er​oOmega) meta(name='viewport' content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no') link(rel='stylesheet' href='lib/bootstrap/css/bootstrap.min.css') link(rel='stylesheet' href='lib/spectrum/spectrum.css') diff --git a/omega-web/src/popup.jade b/omega-web/src/popup.jade index df67e75c..9557995c 100644 --- a/omega-web/src/popup.jade +++ b/omega-web/src/popup.jade @@ -20,7 +20,7 @@ doctype html html(lang='en' ng-app='omegaPopup' ng-controller='PopupCtrl' ng-csp) head meta(charset='utf-8') - title {{'popup_title' | tr}} + title {{'popup_title' | tr}} (Zer​oOmega) meta(name='viewport' content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no') link(rel='stylesheet' href='lib/bootstrap/css/bootstrap.min.css') link(rel='stylesheet' href='css/popup.css') diff --git a/omega-web/src/popup/index.html b/omega-web/src/popup/index.html index 167032fa..8f3d118f 100644 --- a/omega-web/src/popup/index.html +++ b/omega-web/src/popup/index.html @@ -2,7 +2,7 @@ - SwitchyOmega Popup + Z​eroOmega Popup