Skip to content

Commit 1b7d87b

Browse files
rob006rob006
committed
Merge remote-tracking branch 'remotes/upstream/master' into master
# Conflicts: # classic/userChrome.css
2 parents e80aa40 + 4dbeefc commit 1b7d87b

36 files changed

+930
-218
lines changed

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
--> https://github.com/Aris-t2/CustomCSSforFx/issues/4
88
4. Verify there are no '@namespace' references anywhere in your custom code.
99
5. Use available support threads:
10-
- GENERAL DISCUSSIONS, FEEDBACK, QUESTIONS --> https://github.com/Aris-t2/CustomCSSforFx/issues/273
10+
- GENERAL DISCUSSIONS, FEEDBACK, QUESTIONS --> https://github.com/Aris-t2/CustomCSSforFx/issues/308
1111
- TABS BELOW CONTENT SUPPORT THREAD --> https://github.com/Aris-t2/CustomCSSforFx/issues/33
1212
- MULTIROW TABS SUPPORT THREAD --> https://github.com/Aris-t2/CustomCSSforFx/issues/39
1313
- ADD-ON BAR SUPPORT THREAD --> https://github.com/Aris-t2/CustomCSSforFx/issues/73

‎ISSUE_TEMPLATE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Thanks for your understanding.
1515
SUPPORT AREA only for features THIS project provides
1616
1. This is not a 'request' area for new stuff or legacy add-on features. Do not open a new issue about something this project does not offer. Instead join the 'General discussions, feedback, questions belong here' thread to chat and ask questions about what is or could be possible there.
1717
2. Use available support threads:
18-
- GENERAL TALK, FEEDBACK & QUESTIONS: --> https://github.com/Aris-t2/CustomCSSforFx/issues/273
18+
- GENERAL TALK, FEEDBACK & QUESTIONS: --> https://github.com/Aris-t2/CustomCSSforFx/issues/308
1919
- TABS BELOW CONTENT SUPPORT THREAD --> https://github.com/Aris-t2/CustomCSSforFx/issues/33
2020
- MULTIROW TABS SUPPORT THREAD --> https://github.com/Aris-t2/CustomCSSforFx/issues/39
2121
- ADD-ON BAR SUPPORT THREAD --> https://github.com/Aris-t2/CustomCSSforFx/issues/73

‎README.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55

66
## Downloads for Firefox Quantum (60+)
77

8-
**[CustomCSSforFx releases & changelog](https://github.com/Aris-t2/CustomCSSforFx/releases)** --- **[Custom JavaScript for Firefox](https://github.com/Aris-t2/CustomJSforFx)** --- **[NoiaButtons CSS tweaks](https://github.com/Aris-t2/NoiaButtons)**
9-
**[List of CTR, CTB, GMF & Noia4 CSS tweaks & link to FOXSCAPEuC theme by Michael Walden](https://github.com/Aris-t2/CustomCSSforFx/issues/2)**
8+
**[CustomCSSforFx releases & changelog](https://github.com/Aris-t2/CustomCSSforFx/releases)** - **[Custom JavaScript for Firefox](https://github.com/Aris-t2/CustomJSforFx)** - **[NoiaButtons CSS tweaks](https://github.com/Aris-t2/NoiaButtons)** - **[List of CTR, CTB, GMF & Noia4 CSS tweaks & link to FOXSCAPEuC theme](https://github.com/Aris-t2/CustomCSSforFx/issues/2)** - **[Firefox Color (compatible with default color preset of CustomCSSforFx)](https://color.firefox.com/)**
109

1110

1211
## Want to support this project?

‎classic/css/aboutaddons/addonlists_show_buttons_instead_of_menu_popup_compact_view_fx72.css‎

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,12 @@
2121
margin-bottom: 0 !important;
2222
padding-top: 0 !important;
2323
padding-bottom: 0 !important;
24-
/* -moz-padding-start: 2px !important;*/
2524
min-height: 40px !important;
25+
padding-inline-start: 2px !important;
2626
}
2727

2828
addon-card panel-list {
29-
position: absolute !important;
30-
margin-top: -44px !important;
31-
right: 46px !important;
29+
margin-top: 4px !important;
3230
}
3331

3432
addon-card .card-heading-icon {
@@ -41,15 +39,32 @@
4139
}
4240

4341
body div#main div[current-view="list"] addon-list[type="theme"] addon-card button[data-l10n-id="enable-addon-button"]{
44-
margin-top: 4px !important;;
42+
margin-top: 5px !important;;
43+
}
44+
45+
46+
/* small image */
47+
addon-list[type="theme"] .card-heading-image {
48+
width: 200px !important;
49+
height: 40px !important;
50+
object-fit: unset !important;
4551
}
4652

47-
body div#main div[current-view="list"] addon-list[type="theme"] addon-card .spacer {
48-
display: none !important;
53+
addon-list[type="theme"] .card-heading-image {
54+
position: unset !important;
4955
}
50-
51-
body div#main div[current-view="list"] addon-list[type="theme"] addon-card .card-contents{
52-
height: 50px !important;
56+
57+
addon-list[type="theme"] addon-card > .addon.card {
58+
height: unset !important;
59+
}
60+
61+
addon-list[type="theme"] .card-contents {
62+
margin-top: unset !important;
63+
}
64+
65+
addon-list[type="theme"] addon-card panel-list {
66+
margin-top: 4px !important;
67+
margin-inline-end: 6px !important;
5368
}
5469

5570
}

‎classic/css/aboutaddons/addonlists_show_buttons_instead_of_menu_popup_fx72.css‎

Lines changed: 86 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,10 @@
184184
background: green url("chrome://global/skin/icons/check.svg") 2px no-repeat !important;
185185
}
186186

187-
addon-card .card-contents {
187+
/*addon-card .card-contents {
188188
display: block !important;
189189
height: 40px !important;
190-
}
190+
}*/
191191

192192
addon-card .card-contents .addon-description {
193193
display: block !important;
@@ -207,5 +207,89 @@
207207
addon-card > .addon.card * {
208208
overflow: hidden !important;
209209
}
210+
211+
/**/
212+
213+
#main > div:-moz-any([current-view="list"], [current-view="updates"]) .addon.card {
214+
position: relative;
215+
display: flex;
216+
flex-wrap: wrap;
217+
}
218+
219+
.addon-card-collapsed {
220+
flex: 1;
221+
min-width: 1px;
222+
}
223+
224+
addon-card .card-contents {
225+
height: unset !important;
226+
}
227+
228+
#main > div:-moz-any([current-view="list"], [current-view="updates"]) .toggle-button {
229+
position: absolute;
230+
right: 8px !important;
231+
}
232+
233+
.addon-card-message {
234+
order: 3;
235+
}
236+
237+
addon-card > .addon.card :-moz-any(addon-options, plugin-options) {
238+
display: block;
239+
position: relative;
240+
overflow: unset !important;
241+
}
242+
243+
#main > div:-moz-any([current-view="list"], [current-view="updates"]) > :-moz-any([type="extension"],[type="all"]) addon-options {
244+
margin-inline-end: 35px;
245+
}
246+
247+
#main > div:not([current-view="detail"]) :-moz-any(addon-options, plugin-options) {
248+
margin-top: -9px;
249+
margin-inline-end: -5px;
250+
}
251+
252+
addon-card panel-list {
253+
margin-top: unset !important;
254+
right: unset !important;
255+
float: unset !important;
256+
}
257+
258+
#main > div[current-view="detail"] addon-details > .tab-group {
259+
display: block !important;
260+
}
261+
262+
#main > div[current-view="detail"] :-moz-any(plugin-options, addon-options) > panel-list {
263+
position: absolute !important;
264+
top: 8px;
265+
right: 0 !important;
266+
}
267+
268+
/* small image */ /*
269+
addon-list[type="theme"] .card-heading-image {
270+
width: 200px !important;
271+
height: 40px !important;
272+
object-fit: unset !important;
273+
padding-bottom: 50px !important;
274+
}
275+
/**/
276+
277+
addon-list[type="theme"] .card-heading-image {
278+
position: absolute !important;
279+
}
280+
281+
addon-list[type="theme"] addon-card > .addon.card {
282+
height: 144px;
283+
}
284+
285+
addon-list[type="theme"] .card-contents {
286+
margin-top: 100px !important;
287+
}
288+
289+
addon-list[type="theme"] addon-card panel-list {
290+
margin-top: 100px !important;
291+
margin-inline-end: 6px !important;
292+
}
293+
210294

211295
}

‎classic/css/aboutaddons/addonlists_show_buttons_instead_of_menu_popup_more_compact_view_fx72.css‎

Lines changed: 23 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -12,56 +12,49 @@
1212
}
1313

1414
recommended-themes-section,
15-
recommended-extensions-section {
15+
recommended-extensions-section,
16+
addon-list[type="theme"] addon-card > .addon.card .card-heading-image {
1617
display: none !important;
1718
}
18-
19-
addon-card .addon.card {
19+
20+
addon-card:not([expanded="true"]) .addon.card {
21+
min-height: 18px !important;
22+
height: 18px !important;
23+
max-height: 18px !important;
2024
margin-top: 0 !important;
2125
margin-bottom: 0 !important;
22-
padding-top: 5px !important;
23-
padding-bottom: 5px !important;
24-
/*-moz-padding-start: 2px !important;*/
25-
min-height: unset !important;
26+
padding-top: 3px !important;
27+
padding-bottom: 3px !important;
28+
padding-inline-start: 2px !important;
2629
}
2730

2831
addon-card panel-list {
29-
position: absolute !important;
30-
margin-top: -25px !important;
31-
right: 46px !important;
32+
margin-top: 1px !important;
3233
}
33-
34+
3435
.addon.card .addon-description {
3536
visibility: hidden !important;
36-
margin-top: -28px !important;
3737
}
3838

3939
addon-card .card-heading-icon {
4040
margin-inline-end: 2px !important;
4141
}
42-
43-
addon-card .card-heading-image {
44-
display: none !important;
45-
}
4642

47-
body div#main div[current-view="list"] addon-list[type="theme"] addon-card panel-list {
48-
margin-top: -26px !important;
49-
}
50-
51-
body div#main div[current-view="list"] addon-list[type="theme"] addon-card button[data-l10n-id="enable-addon-button"]{
52-
margin-top: 1px !important;;
43+
addon-list[type="theme"] .card-heading-image {
44+
position: unset !important;
5345
}
5446

55-
body div#main div[current-view="list"] addon-list[type="theme"] addon-card .spacer {
56-
display: none !important;
47+
addon-list[type="theme"] addon-card > .addon.card {
48+
height: unset !important;
5749
}
5850

59-
body div#main div[current-view="list"] addon-list[type="theme"] addon-card .addon-description {
60-
margin-top: -22px !important;
51+
addon-list[type="theme"] .card-contents {
52+
margin-top: unset !important;
6153
}
62-
63-
body div#main div[current-view="list"] addon-list:-moz-any([type="theme"]) addon-card .card-contents{
64-
height: 18px !important;
54+
55+
addon-list[type="theme"] addon-card panel-list {
56+
margin-top: 1px !important;
57+
margin-inline-end: 6px !important;
6558
}
66-
59+
6760
}

‎classic/css/aboutaddons/addons_manager_alternative_appearance_fx68.css‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@
216216
}
217217

218218
#header-search {
219-
padding: 0 0px !important;
219+
padding: 0px 0px !important;
220220
min-width: 200px !important;
221221
width: unset !important;
222222
}
@@ -318,13 +318,16 @@
318318
}
319319

320320
}}
321-
321+
322322
.addon.card {
323-
margin-bottom: 1px !important;
324323
box-shadow: unset !important;
325-
border: 0 !important;
324+
margin-bottom: 1px !important;
326325
border-radius: 0 !important;
327326
}
327+
328+
addon-card:not([expanded]) > .addon.card {
329+
border: 0 !important;
330+
}
328331

329332
addon-card:not([expanded="true"]) .addon.card:hover {
330333
background: Highlight !important;
@@ -391,6 +394,10 @@
391394
z-index: 1000 !important;
392395
}
393396

397+
.main-search {
398+
margin-top: 1px !important;
399+
}
400+
394401
.main-heading {
395402
margin-top: -26px !important;
396403
}
@@ -407,10 +414,13 @@
407414
font-size: 12px !important;
408415
}
409416

417+
.main-heading .back-button,
410418
.page-options-menu > .more-options-button {
411-
margin: 2px !important;
412-
width: 48px !important;
413-
height: 24px !important;
419+
margin: 3px 0.5px 2px 0.5px !important;
420+
min-width: unset !important;
421+
width: 58px !important;
422+
min-height: unset !important;
423+
height: 22px !important;
414424
}
415425

416426
addon-page-options panel-list {
@@ -430,5 +440,4 @@
430440
margin: unset !important;
431441
}
432442

433-
434443
}

‎classic/css/aboutaddons/addons_manager_alternative_appearance_fx75.css‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,4 @@
3333
background-color: var(--in-content-category-background-hover) !important;
3434
}
3535

36-
37-
3836
}

‎classic/css/aboutaddons/availableupdates_category_always_visible.css‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
@-moz-document url-prefix(chrome://mozapps/content/extensions/extensions.xul), url-prefix(about:addons),url-prefix(chrome://mozapps/content/extensions/aboutaddons.html) {
66

7+
#categories .category[name="available-updates"][disabled],
78
#category-availableUpdates[disabled] {
89
overflow: visible !important;
910
height: 48px !important;
@@ -14,6 +15,7 @@
1415
-moz-user-input: unset !important;
1516
}
1617

18+
#categories .category[name="available-updates"][hidden],
1719
#category-availableUpdates[hidden] {
1820
opacity: 1 !important;
1921
min-height: 48px !important;

‎classic/css/aboutaddons/availableupdates_category_last_category.css‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22
/* Github: https://github.com/aris-t2/customcssforfx ************************************/
33
/****************************************************************************************/
44

5+
56
@-moz-document url-prefix(chrome://mozapps/content/extensions/extensions.xul), url-prefix(about:addons),url-prefix(chrome://mozapps/content/extensions/aboutaddons.html) {
67

8+
#categories .category[name="available-updates"],
79
#category-availableUpdates {
810
-moz-box-ordinal-group: 100 !important;
11+
order: 2 !important;
912
}
1013

1114
}

0 commit comments

Comments
 (0)