Skip to content

Commit

Permalink
Merge branch 'master' into quote-replies-patio
Browse files Browse the repository at this point in the history
  • Loading branch information
AprilSylph authored Feb 20, 2024
2 parents 0f3ac1c + 5b36e99 commit c36355d
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 168 deletions.
178 changes: 46 additions & 132 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
"eslint-config-semistandard": "^17.0.0",
"eslint-config-standard": "^17.1.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsdoc": "^46.10.1",
"eslint-plugin-jsdoc": "^48.0.4",
"eslint-plugin-n": "^15.7.0",
"eslint-plugin-promise": "^6.1.1",
"web-ext": "^7.9.0"
"web-ext": "^7.11.0"
},
"dependencies": {
"jquery": "^3.7.1",
Expand Down
2 changes: 1 addition & 1 deletion src/scripts/accesskit.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
},
"normal_width_scrollbar": {
"type": "checkbox",
"label": "Use regular-width scrollbars in Firefox",
"label": "Use regular-width scrollbars",
"default": false
},
"visible_alt_text": {
Expand Down
2 changes: 1 addition & 1 deletion src/scripts/accesskit/disable_gifs.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const pauseGif = function (gifElement) {
canvas.getContext('2d').drawImage(image, 0, 0);

const gifLabel = document.createElement('p');
gifLabel.className = gifElement.clientWidth < 150
gifLabel.className = gifElement.clientWidth && gifElement.clientWidth < 150
? 'xkit-paused-gif-label mini'
: 'xkit-paused-gif-label';

Expand Down
2 changes: 1 addition & 1 deletion src/scripts/timeformat.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[data-formatted-time] {
font-size: 0px;
font-size: 0px !important;
}

[data-formatted-time]::before {
Expand Down
5 changes: 0 additions & 5 deletions src/scripts/tweaks.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,6 @@
"type": "checkbox",
"label": "Hide the \"Now, where were we?\" button",
"default": false
},
"no_live": {
"type": "checkbox",
"label": "Hide the Tumblr Live carousel",
"default": false
}
}
}
Loading

0 comments on commit c36355d

Please sign in to comment.