From 0704049026d8fccb2ddb56e16ab26036ac3afc20 Mon Sep 17 00:00:00 2001 From: skomerko <168652295+skomerko@users.noreply.github.com> Date: Sat, 12 Oct 2024 08:22:07 +0200 Subject: [PATCH] WebUI: Apply box-sizing reset Box-sizing: border-box is now applied globally. A lot of tiny changes were made but they were necessary to correct resulting inconsistencies. Everything should be pretty much as it was with just some minor exceptions. Looks like this PR also indirectly fixed #21414. PR #21464. --- src/webui/www/private/addtrackers.html | 4 +- src/webui/www/private/css/Layout.css | 28 ++--- src/webui/www/private/css/Tabs.css | 13 +- src/webui/www/private/css/Window.css | 1 - src/webui/www/private/css/dynamicTable.css | 10 +- src/webui/www/private/css/style.css | 117 +++++++++--------- src/webui/www/private/downloadlimit.html | 2 +- src/webui/www/private/index.html | 6 +- src/webui/www/private/rename_files.html | 6 +- src/webui/www/private/scripts/dynamicTable.js | 6 +- src/webui/www/private/scripts/mocha-init.js | 14 +-- src/webui/www/private/scripts/progressbar.js | 3 + src/webui/www/private/scripts/prop-files.js | 2 +- src/webui/www/private/scripts/prop-general.js | 2 +- src/webui/www/private/scripts/prop-peers.js | 4 +- .../www/private/scripts/prop-trackers.js | 4 +- .../www/private/scripts/prop-webseeds.js | 4 +- src/webui/www/private/scripts/search.js | 14 +-- src/webui/www/private/uploadlimit.html | 2 +- src/webui/www/private/views/cookies.html | 2 +- src/webui/www/private/views/filters.html | 6 +- src/webui/www/private/views/log.html | 19 +-- src/webui/www/private/views/preferences.html | 70 +++++------ src/webui/www/private/views/properties.html | 2 +- src/webui/www/private/views/rss.html | 10 +- .../www/private/views/rssDownloader.html | 9 +- src/webui/www/private/views/search.html | 13 +- .../www/private/views/searchplugins.html | 8 +- src/webui/www/private/views/transferlist.html | 2 +- 29 files changed, 195 insertions(+), 188 deletions(-) diff --git a/src/webui/www/private/addtrackers.html b/src/webui/www/private/addtrackers.html index 42f63dd97..f083cbb83 100644 --- a/src/webui/www/private/addtrackers.html +++ b/src/webui/www/private/addtrackers.html @@ -48,11 +48,9 @@ -
-
+
-
diff --git a/src/webui/www/private/css/Layout.css b/src/webui/www/private/css/Layout.css index 26bbe0ba8..bdb540c0c 100644 --- a/src/webui/www/private/css/Layout.css +++ b/src/webui/www/private/css/Layout.css @@ -18,10 +18,6 @@ Required by: /* Layout ---------------------------------------------------------------- */ -body { - margin: 0; /* Required */ -} - #desktop { cursor: default; /* Fix for issue in IE7. IE7 wants to use the I-bar text cursor */ height: 100%; @@ -88,13 +84,11 @@ body { #desktopNavbar { background-color: var(--color-background-default); - margin: 0 0px; overflow: hidden; /* Remove this line if you want the menu to be backward compatible with Firefox 2 */ } #desktopNavbar ul { font-size: 12px; - list-style: none; margin: 0; padding: 0; user-select: none; @@ -164,8 +158,8 @@ body { #desktopNavbar li ul li a { color: var(--color-text-default); font-weight: normal; - min-width: 120px; - padding: 4px 10px 4px 25px; + min-width: 155px; + padding: 4px 10px 4px 23px; position: relative; } @@ -200,14 +194,17 @@ li.divider { border-top: 1px solid var(--color-border-default); overflow: hidden; /* This can be set to hidden or auto */ position: relative; - /*height: 100%;*/ +} + +#propertiesPanel_header { + height: 28px; } /* Footer */ #desktopFooterWrapper { bottom: 0; - height: 30px; + height: 28px; left: 0; overflow: hidden; position: absolute; @@ -217,8 +214,8 @@ li.divider { #desktopFooter { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; - height: 24px; - padding: 6px 8px 0; + height: 28px; + padding: 2px; } /* Panel Layout @@ -266,7 +263,6 @@ li.divider { display: inline-block; font-size: 12px; height: 22px; - margin: 0; overflow: hidden; padding: 3px 8px 0; } @@ -302,7 +298,7 @@ li.divider { background: url("../images/handle-icon-horizontal.gif") center center no-repeat; font-size: 1px; - height: 4px; + height: 6px; line-height: 1px; margin: 0 auto; overflow: hidden; @@ -316,7 +312,7 @@ li.divider { float: left; min-height: 10px; overflow: hidden; - width: 4px; + width: 8px; } /* Toolboxes */ @@ -324,7 +320,7 @@ li.divider { .toolbox { float: right; height: 24px; - margin-top: 3px; + margin-top: 1px; overflow: hidden; padding: 0 5px; text-align: right; diff --git a/src/webui/www/private/css/Tabs.css b/src/webui/www/private/css/Tabs.css index 82d9b40bf..06a5cebb8 100644 --- a/src/webui/www/private/css/Tabs.css +++ b/src/webui/www/private/css/Tabs.css @@ -24,9 +24,7 @@ Required by: .tab-menu { font-size: 11px; - line-height: 16px; - list-style: none; - margin: 0; + list-style-type: none; padding: 0; } @@ -43,16 +41,19 @@ Required by: .tab-menu li a { align-items: center; background-color: var(--color-background-default); - border-radius: 5px 5px 0 0; + border-radius: 3px 3px 0 0; color: var(--color-text-default); display: flex; - font-weight: normal; gap: 5px; margin-left: 6px; - padding: 5px 8px; + padding: 5px 7px 3px; text-align: center; } +.tab-menu li:first-child a { + margin-left: 4px; +} + .tab-menu li:hover a { background-color: var(--color-background-hover); color: var(--color-text-white); diff --git a/src/webui/www/private/css/Window.css b/src/webui/www/private/css/Window.css index 008e760a1..2546a9dcb 100644 --- a/src/webui/www/private/css/Window.css +++ b/src/webui/www/private/css/Window.css @@ -56,7 +56,6 @@ Required by: font-size: 12px; font-weight: bold; line-height: 15px; - margin: 0; overflow: hidden; padding: 5px 10px 4px 12px; text-overflow: ellipsis; diff --git a/src/webui/www/private/css/dynamicTable.css b/src/webui/www/private/css/dynamicTable.css index 40dc29f30..8cebbcbcc 100644 --- a/src/webui/www/private/css/dynamicTable.css +++ b/src/webui/www/private/css/dynamicTable.css @@ -45,7 +45,6 @@ tr.dynamicTableHeader { .dynamicTable th { border-right: 1px solid var(--color-border-default); - box-sizing: border-box; padding: 4px 2px; white-space: nowrap; } @@ -68,9 +67,9 @@ tr.dynamicTableHeader { .dynamicTable th.sorted { background-image: url("../images/go-up.svg"); - background-position: right; + background-position: right 3px center; background-repeat: no-repeat; - background-size: 15px; + background-size: 12px; } .dynamicTable th.sorted.reverse { @@ -87,6 +86,11 @@ tr.dynamicTableHeader { overflow: hidden; } +#propertiesPanel .dynamicTableFixedHeaderDiv, +#torrentsTableFixedHeaderDiv { + border-bottom: 1px solid var(--color-border-default); +} + .dynamicTableDiv { overflow: auto; } diff --git a/src/webui/www/private/css/style.css b/src/webui/www/private/css/style.css index 2c65c4aa2..b99be2d02 100644 --- a/src/webui/www/private/css/style.css +++ b/src/webui/www/private/css/style.css @@ -55,12 +55,34 @@ /* Reset */ +*, +*::before, +*::after { + box-sizing: border-box; +} + +* { + margin: 0; +} + +input, +button, +textarea, +select { + font: inherit; +} + a img, :link img, :visited img { border: none; } +ul, +ol { + list-style: none; +} + /* Forms */ input[type="text"], @@ -72,27 +94,31 @@ select { border: 1px solid var(--color-border-default); border-radius: 3px; color: var(--color-text-default); + padding: 3px; +} + +select { padding: 4px; } input[type="checkbox"], input[type="radio"] { accent-color: var(--color-accent-blue); + margin: 3px 3px 3px 4px; } input[type="button"], input[type="submit"], button { cursor: pointer; - padding: 4px 16px; + padding-left: 10px; + padding-right: 10px; } button:disabled { cursor: initial; } -/*table { border-collapse: collapse; border-spacing: 0; }*/ - :focus { outline: none; } @@ -103,8 +129,7 @@ body { color: var(--color-text-default); font-family: Arial, Helvetica, sans-serif; font-size: 12px; - line-height: 18px; - margin: 0; + line-height: 1.5; text-align: left; } @@ -123,7 +148,6 @@ h3, h4 { font-size: 12px; font-weight: bold; - margin: 0; padding: 0 0 5px; } @@ -164,17 +188,11 @@ a:hover { } p { - margin: 0; padding: 0 0 9px; } /* List Elements */ -ul { - list-style: outside; - margin: 0 0 9px 16px; -} - dt { font-weight: bold; } @@ -187,7 +205,8 @@ dd { fieldset { border: 1px solid var(--color-border-default); - border-radius: 5px; + border-radius: 1px; + margin: 0 2px; } /* Code */ @@ -212,6 +231,7 @@ hr { border: 0px; color: var(--color-text-default); height: 1px; + margin-bottom: 6px; } .vcenter { @@ -224,7 +244,9 @@ hr { } #trackersUrls { + display: block; height: 100%; + margin: 0 auto 10px; width: 90%; } @@ -232,10 +254,6 @@ hr { overflow-x: hidden !important; /* override for default mocha inline style */ } -#Filters ul { - list-style-type: none; -} - #Filters ul img { height: 16px; width: 16px; @@ -249,7 +267,6 @@ a.propButton { border: 1px solid rgb(85 81 91); margin-left: 3px; margin-right: 3px; - /*border-radius: 3px;*/ padding: 2px; } @@ -267,7 +284,6 @@ a.propButton img { background-color: var(--color-background-default); border: 1px solid var(--color-border-default); display: none; - list-style-type: none; padding: 0; } @@ -280,7 +296,6 @@ a.propButton img { } .contextMenu li { - margin: 0; padding: 0; user-select: none; } @@ -299,9 +314,7 @@ a.propButton img { align-items: center; color: var(--color-text-default); display: flex; - font-family: Tahoma, Arial, sans-serif; - font-size: 12px; - gap: 7px; + gap: 2px; padding: 5px 20px 5px 5px; text-decoration: none; white-space: nowrap; @@ -320,11 +333,10 @@ a.propButton img { background: var(--color-background-default); border: 1px solid var(--color-border-default); left: -999em; - list-style-type: none; margin: -29px 0 0 100%; padding: 0; position: absolute; - width: 164px; + width: max-content; z-index: 8000; } @@ -345,16 +357,18 @@ a.propButton img { .contextMenu li img { height: 16px; + margin-right: 0.5em; width: 16px; } .contextMenu li input[type="checkbox"] { - position: relative; - top: 3px; + margin: 0 0.5em 0 0; + width: 16px; } #contextCategoryList img { border: 1px solid transparent; + box-sizing: content-box; padding: 1px; } @@ -390,7 +404,6 @@ a.propButton img { height: 7px; left: 0; line-height: 1px; - margin: 0; overflow: hidden; padding: 0; position: absolute; @@ -438,9 +451,7 @@ a.propButton img { } .MyMenuIcon { - margin-bottom: -3px; - margin-left: -18px; - padding-right: 5px; + margin: 0 6px -3px -18px; } #mainWindowTabs { @@ -462,7 +473,7 @@ a.propButton img { border: 1px solid var(--color-border-default); border-radius: 3px; min-width: 160px; - padding: 4px 4px 4px 25px; + padding: 2px 12px 2px 25px; } #torrentsFilterRegexBox { @@ -510,8 +521,11 @@ a.propButton img { background-position: left; background-repeat: no-repeat; background-size: 1.5em; + margin-top: -1px; + padding-bottom: 1px; padding-left: 2em; - width: 250px; + padding-top: 1px; + width: 190px; } /* Tri-state checkbox */ @@ -537,8 +551,7 @@ label.partial { fieldset.settings { border: 1px solid var(--color-border-default); - border-radius: 8px; - padding: 4px 4px 4px 10px; + padding: 4px 4px 6px 6px; } fieldset.settings legend { @@ -561,7 +574,6 @@ div.formRow { } .filterTitle { - box-sizing: border-box; cursor: pointer; display: flex; font-weight: bold; @@ -575,7 +587,6 @@ div.formRow { } .filterTitle img { - box-sizing: border-box; height: 16px; padding: 2px; width: 16px; @@ -590,10 +601,6 @@ div.formRow { transform: rotate(-90deg); } -ul.filterList * { - box-sizing: border-box; -} - ul.filterList { margin: 0; padding-left: 0; @@ -605,6 +612,7 @@ ul.filterList .selectedFilter > .link :is(img, button) { } ul.filterList span.link { + align-items: center; cursor: pointer; display: flex; gap: 5px; @@ -664,6 +672,11 @@ td.generalLabel { width: 1px; } +#tristate_cb { + margin-bottom: 0; + margin-top: 0; +} + .filesTableCollapseIcon { cursor: pointer; height: 15px; @@ -710,8 +723,8 @@ td.generalLabel { } .select-watched-folder-editable { - border: solid grey 1px; - height: 20px; + border: 1px solid var(--color-border-default); + height: 22px; position: relative; width: 160px; } @@ -720,16 +733,16 @@ td.generalLabel { border: none; bottom: 0px; left: 0px; - margin: 0; + padding: 0; position: absolute; top: 0px; - width: 160px; + width: 158px; } .select-watched-folder-editable input { border: none; left: 0px; - padding: 1px; + padding: 0; position: absolute; top: 0px; width: 140px; @@ -750,6 +763,7 @@ td.generalLabel { .combo_priority { font-size: 1em; + padding: 2px 6px; } td.statusBarSeparator { @@ -757,14 +771,10 @@ td.statusBarSeparator { background-position: center 1px; background-repeat: no-repeat; background-size: 2px 18px; - width: 22px; + width: 24px; } /* Statistics window */ -#statisticspage * { - box-sizing: border-box; -} - #statisticsContent { & table { background-color: var(--color-background-default); @@ -832,11 +842,6 @@ td.statusBarSeparator { } /* Modals */ - -.modalDialog * { - box-sizing: border-box; -} - .modalDialog .mochaContent.pad { display: flex !important; /* override for default mocha inline style */ flex-direction: column; diff --git a/src/webui/www/private/downloadlimit.html b/src/webui/www/private/downloadlimit.html index d97ab78a4..28753d259 100644 --- a/src/webui/www/private/downloadlimit.html +++ b/src/webui/www/private/downloadlimit.html @@ -12,7 +12,7 @@ -
+
diff --git a/src/webui/www/private/index.html b/src/webui/www/private/index.html index 46e55dda8..a92fbe29a 100644 --- a/src/webui/www/private/index.html +++ b/src/webui/www/private/index.html @@ -110,7 +110,7 @@    QBT_TR(Add Torrent Link...)QBT_TR[CONTEXT=MainWindow] QBT_TR(Add Torrent File...)QBT_TR[CONTEXT=MainWindow] - QBT_TR(Remove)QBT_TR[CONTEXT=TransferListWidget] + QBT_TR(Remove)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Start)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Stop)QBT_TR[CONTEXT=TransferListWidget] @@ -284,9 +284,9 @@ QBT_TR(Alternative speed limits: Off)QBT_TR[CONTEXT=MainWindow] - QBT_TR(Download speed icon)QBT_TR[CONTEXT=MainWindow] + QBT_TR(Download speed icon)QBT_TR[CONTEXT=MainWindow] - QBT_TR(Upload speed icon)QBT_TR[CONTEXT=MainWindow] + QBT_TR(Upload speed icon)QBT_TR[CONTEXT=MainWindow] diff --git a/src/webui/www/private/rename_files.html b/src/webui/www/private/rename_files.html index 290490b2f..2f2af87e1 100644 --- a/src/webui/www/private/rename_files.html +++ b/src/webui/www/private/rename_files.html @@ -36,7 +36,7 @@ } }, offsets: { - x: -15, + x: 0, y: 2 } }); @@ -442,11 +442,11 @@
- +
-
+
diff --git a/src/webui/www/private/scripts/dynamicTable.js b/src/webui/www/private/scripts/dynamicTable.js index c58501a2b..03db2b2c6 100644 --- a/src/webui/www/private/scripts/dynamicTable.js +++ b/src/webui/www/private/scripts/dynamicTable.js @@ -367,7 +367,7 @@ window.qBittorrent.DynamicTable ??= (() => { actions: actions, menu: menuId, offsets: { - x: -15, + x: 0, y: 2 } }); @@ -2109,7 +2109,7 @@ window.qBittorrent.DynamicTable ??= (() => { const dirImg = new Element("img", { src: "images/directory.svg", styles: { - "width": 15, + "width": 20, "padding-right": 5, "margin-bottom": -3, "margin-left": (node.depth * 20) @@ -2442,7 +2442,7 @@ window.qBittorrent.DynamicTable ??= (() => { const dirImg = new Element("img", { src: "images/directory.svg", styles: { - "width": 15, + "width": 20, "padding-right": 5, "margin-bottom": -3 }, diff --git a/src/webui/www/private/scripts/mocha-init.js b/src/webui/www/private/scripts/mocha-init.js index 1b1dffca1..7a22e0d05 100644 --- a/src/webui/www/private/scripts/mocha-init.js +++ b/src/webui/www/private/scripts/mocha-init.js @@ -225,7 +225,7 @@ const initializeWindows = function() { closable: true, paddingVertical: 0, paddingHorizontal: 0, - width: loadWindowWidth(id, 700), + width: loadWindowWidth(id, 730), height: loadWindowHeight(id, 600), onResize: window.qBittorrent.Misc.createDebounceHandler(500, (e) => { saveWindowSize(id); @@ -292,7 +292,7 @@ const initializeWindows = function() { paddingVertical: 0, paddingHorizontal: 0, width: 424, - height: 80 + height: 100 }); }; @@ -311,7 +311,7 @@ const initializeWindows = function() { paddingVertical: 0, paddingHorizontal: 0, width: 424, - height: 80 + height: 100 }); } }; @@ -352,7 +352,7 @@ const initializeWindows = function() { paddingVertical: 0, paddingHorizontal: 0, width: 424, - height: 200 + height: 220 }); } }; @@ -428,7 +428,7 @@ const initializeWindows = function() { paddingVertical: 0, paddingHorizontal: 0, width: 424, - height: 80 + height: 100 }); }; @@ -465,7 +465,7 @@ const initializeWindows = function() { paddingVertical: 0, paddingHorizontal: 0, width: 424, - height: 80 + height: 100 }); } }; @@ -1223,7 +1223,7 @@ const initializeWindows = function() { toolbar: true, toolbarURL: "views/aboutToolbar.html", padding: 10, - width: loadWindowWidth(id, 550), + width: loadWindowWidth(id, 570), height: loadWindowHeight(id, 360), onResize: window.qBittorrent.Misc.createDebounceHandler(500, (e) => { saveWindowSize(id); diff --git a/src/webui/www/private/scripts/progressbar.js b/src/webui/www/private/scripts/progressbar.js index db089086b..63f826273 100644 --- a/src/webui/www/private/scripts/progressbar.js +++ b/src/webui/www/private/scripts/progressbar.js @@ -58,6 +58,7 @@ window.qBittorrent.ProgressBar ??= (() => { "class": "progressbar_wrapper", "styles": { "border": "1px solid var(--color-border-default)", + "box-sizing": "content-box", "width": vals.width, "height": vals.height, "position": "relative", @@ -73,6 +74,7 @@ window.qBittorrent.ProgressBar ??= (() => { "width": vals.width, "height": vals.height, "background": vals.darkbg, + "box-sizing": "content-box", "color": vals.darkfg, "position": "absolute", "text-align": "center", @@ -88,6 +90,7 @@ window.qBittorrent.ProgressBar ??= (() => { "width": vals.width, "height": vals.height, "background": vals.lightbg, + "box-sizing": "content-box", "color": vals.lightfg, "position": "absolute", "text-align": "center", diff --git a/src/webui/www/private/scripts/prop-files.js b/src/webui/www/private/scripts/prop-files.js index 4871965ce..48a6bf598 100644 --- a/src/webui/www/private/scripts/prop-files.js +++ b/src/webui/www/private/scripts/prop-files.js @@ -608,7 +608,7 @@ window.qBittorrent.PropFiles ??= (() => { } }, offsets: { - x: -15, + x: 0, y: 2 }, onShow: function() { diff --git a/src/webui/www/private/scripts/prop-general.js b/src/webui/www/private/scripts/prop-general.js index 1c1dde576..804696958 100644 --- a/src/webui/www/private/scripts/prop-general.js +++ b/src/webui/www/private/scripts/prop-general.js @@ -37,7 +37,7 @@ window.qBittorrent.PropGeneral ??= (() => { }; const piecesBar = new window.qBittorrent.PiecesBar.PiecesBar([], { - height: 16 + height: 18 }); $("progress").appendChild(piecesBar); diff --git a/src/webui/www/private/scripts/prop-peers.js b/src/webui/www/private/scripts/prop-peers.js index 71426b912..4d18449e9 100644 --- a/src/webui/www/private/scripts/prop-peers.js +++ b/src/webui/www/private/scripts/prop-peers.js @@ -133,7 +133,7 @@ window.qBittorrent.PropPeers ??= (() => { paddingVertical: 0, paddingHorizontal: 0, width: 350, - height: 240 + height: 260 }); }, banPeer: function(element, ref) { @@ -154,7 +154,7 @@ window.qBittorrent.PropPeers ??= (() => { } }, offsets: { - x: -15, + x: 0, y: 2 }, onShow: function() { diff --git a/src/webui/www/private/scripts/prop-trackers.js b/src/webui/www/private/scripts/prop-trackers.js index 1b4edd1ee..51861b219 100644 --- a/src/webui/www/private/scripts/prop-trackers.js +++ b/src/webui/www/private/scripts/prop-trackers.js @@ -139,7 +139,7 @@ window.qBittorrent.PropTrackers ??= (() => { } }, offsets: { - x: -15, + x: 0, y: 2 }, onShow: function() { @@ -177,7 +177,7 @@ window.qBittorrent.PropTrackers ??= (() => { paddingVertical: 0, paddingHorizontal: 0, width: 500, - height: 250, + height: 260, onCloseComplete: function() { updateData(); } diff --git a/src/webui/www/private/scripts/prop-webseeds.js b/src/webui/www/private/scripts/prop-webseeds.js index c167d2424..f52cfd3be 100644 --- a/src/webui/www/private/scripts/prop-webseeds.js +++ b/src/webui/www/private/scripts/prop-webseeds.js @@ -111,7 +111,7 @@ window.qBittorrent.PropWebseeds ??= (() => { } }, offsets: { - x: -15, + x: 0, y: 2 }, onShow: function() { @@ -150,7 +150,7 @@ window.qBittorrent.PropWebseeds ??= (() => { paddingVertical: 0, paddingHorizontal: 0, width: 500, - height: 250, + height: 260, onCloseComplete: function() { updateData(); } diff --git a/src/webui/www/private/scripts/search.js b/src/webui/www/private/scripts/search.js index 1be498801..f710cb68f 100644 --- a/src/webui/www/private/scripts/search.js +++ b/src/webui/www/private/scripts/search.js @@ -116,8 +116,8 @@ window.qBittorrent.Search ??= (() => { OpenDescriptionUrl: openSearchTorrentDescriptionUrl }, offsets: { - x: -15, - y: -53 + x: 0, + y: -60 } }); searchResultsTable = new window.qBittorrent.DynamicTable.SearchResultsTable(); @@ -184,9 +184,8 @@ window.qBittorrent.Search ??= (() => { alt: "QBT_TR(Close tab)QBT_TR[CONTEXT=SearchWidget]", title: "QBT_TR(Close tab)QBT_TR[CONTEXT=SearchWidget]", src: "images/application-exit.svg", - width: "8", - height: "8", - style: "padding-right: 7px; margin-bottom: -1px; margin-left: -5px", + width: "10", + height: "10", onclick: "qBittorrent.Search.closeSearchTab(this);", }); closeTabElem.inject(tabElem, "top"); @@ -384,9 +383,8 @@ window.qBittorrent.Search ??= (() => { title: text, src: image, class: "statusIcon", - width: "10", - height: "10", - style: "margin-bottom: -2px; margin-left: 7px", + width: "12", + height: "12", }); }; diff --git a/src/webui/www/private/uploadlimit.html b/src/webui/www/private/uploadlimit.html index 44dc6a876..0a3a998e6 100644 --- a/src/webui/www/private/uploadlimit.html +++ b/src/webui/www/private/uploadlimit.html @@ -12,7 +12,7 @@ -
+
diff --git a/src/webui/www/private/views/cookies.html b/src/webui/www/private/views/cookies.html index 535bfae2d..279907c67 100644 --- a/src/webui/www/private/views/cookies.html +++ b/src/webui/www/private/views/cookies.html @@ -35,7 +35,7 @@ .addCookie { height: 16px; width: 16px; - padding-left: 10px; + margin-left: 5px; vertical-align: middle; cursor: pointer; } diff --git a/src/webui/www/private/views/filters.html b/src/webui/www/private/views/filters.html index 8908abfb6..8724d3273 100644 --- a/src/webui/www/private/views/filters.html +++ b/src/webui/www/private/views/filters.html @@ -140,7 +140,7 @@ } }, offsets: { - x: -15, + x: 0, y: 2 }, onShow: function() { @@ -176,7 +176,7 @@ } }, offsets: { - x: -15, + x: 0, y: 2 }, onShow: function() { @@ -206,7 +206,7 @@ } }, offsets: { - x: -15, + x: 0, y: 2 }, onShow: function() { diff --git a/src/webui/www/private/views/log.html b/src/webui/www/private/views/log.html index 02fef3ada..71282c1a7 100644 --- a/src/webui/www/private/views/log.html +++ b/src/webui/www/private/views/log.html @@ -4,7 +4,11 @@ } #logFilterBar { - margin: .5em 0; + align-items: center; + display: flex; + flex-wrap: wrap; + gap: 2px; + height: 24px; } #logFilterBar>label { @@ -14,8 +18,7 @@ #logFilterBar>button { display: inline-block; - padding: 4px 15px; - margin-left: .3em; + padding: 2px 12px; } #logView { @@ -38,9 +41,9 @@ background-repeat: no-repeat; background-position: left; background-size: 1.5em; - padding: 4px 5px 4px 2em; + padding: 2px 12px 2px 2em; margin-left: .3em; - width: 200px; + width: 237px; border: 1px solid var(--color-border-default); border-radius: 3px; } @@ -73,7 +76,7 @@ } .vsb-main>button { - padding: 4px 12px !important; + padding: 2px 12px !important; } @@ -215,8 +218,8 @@ } }, offsets: { - x: -16, - y: -57 + x: 3, + y: -90 } }); diff --git a/src/webui/www/private/views/preferences.html b/src/webui/www/private/views/preferences.html index f111e070f..102c2978e 100644 --- a/src/webui/www/private/views/preferences.html +++ b/src/webui/www/private/views/preferences.html @@ -345,12 +345,12 @@
- +
- +
QBT_TR(Supported parameters (case sensitive):)QBT_TR[CONTEXT=OptionsDialog]
    @@ -385,8 +385,8 @@ QBT_TR(Listening Port)QBT_TR[CONTEXT=OptionsDialog]
    - - + +
    @@ -403,28 +403,28 @@ - + - + - + - + @@ -448,7 +448,7 @@ - + @@ -485,7 +485,7 @@ - + @@ -575,14 +575,14 @@ - QBT_TR(Alternative speed limits)QBT_TR[CONTEXT=MainWindow] + QBT_TR(Alternative speed limits)QBT_TR[CONTEXT=MainWindow] -   QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog] +   QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog] -   QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog] +   QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog] @@ -595,14 +595,14 @@ - QBT_TR(Alternative speed limits)QBT_TR[CONTEXT=MainWindow] + QBT_TR(Alternative speed limits)QBT_TR[CONTEXT=MainWindow] -   QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog] +   QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog] -   QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog] +   QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog] @@ -615,9 +615,9 @@
    - : + : - : + :
    @@ -685,7 +685,7 @@
    - +
    @@ -700,7 +700,7 @@ - + @@ -708,7 +708,7 @@ - + @@ -716,7 +716,7 @@ - + @@ -733,7 +733,7 @@ -   QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog] +   QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog] @@ -741,7 +741,7 @@ -   QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog] +   QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog] @@ -749,7 +749,7 @@ -   QBT_TR(seconds)QBT_TR[CONTEXT=OptionsDialog] +   QBT_TR(seconds)QBT_TR[CONTEXT=OptionsDialog] @@ -767,7 +767,7 @@ - + @@ -776,7 +776,7 @@ - QBT_TR(minutes)QBT_TR[CONTEXT=OptionsDialog] + QBT_TR(minutes)QBT_TR[CONTEXT=OptionsDialog] @@ -785,7 +785,7 @@ - QBT_TR(minutes)QBT_TR[CONTEXT=OptionsDialog] + QBT_TR(minutes)QBT_TR[CONTEXT=OptionsDialog] @@ -826,7 +826,7 @@ -   QBT_TR( min)QBT_TR[CONTEXT=OptionsDialog] +   QBT_TR( min)QBT_TR[CONTEXT=OptionsDialog] @@ -834,7 +834,7 @@ -   QBT_TR( sec)QBT_TR[CONTEXT=OptionsDialog] +   QBT_TR( sec)QBT_TR[CONTEXT=OptionsDialog] @@ -842,7 +842,7 @@ - + @@ -882,7 +882,7 @@ - + @@ -956,11 +956,11 @@ - + - QBT_TR(seconds)QBT_TR[CONTEXT=OptionsDialog] + QBT_TR(seconds)QBT_TR[CONTEXT=OptionsDialog] @@ -968,7 +968,7 @@ -   QBT_TR(seconds)QBT_TR[CONTEXT=OptionsDialog] +   QBT_TR(seconds)QBT_TR[CONTEXT=OptionsDialog] diff --git a/src/webui/www/private/views/properties.html b/src/webui/www/private/views/properties.html index 855335120..f3f9a232d 100644 --- a/src/webui/www/private/views/properties.html +++ b/src/webui/www/private/views/properties.html @@ -1,5 +1,5 @@