Skip to content

Commit 5874e15

Browse files
Aris-t2Aris-t2
committed
4.7.4
1 parent 5b4b34a commit 5874e15

17 files changed

Lines changed: 196 additions & 40 deletions

‎current/css/appbutton/appbutton_popup_icons.css‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,12 @@
322322
list-style-image: url("chrome://devtools/skin/images/tool-dom.svg");
323323
}
324324

325+
#appmenu-developer-tools-view toolbarbutton[key="key_browserToolbox"] > image.toolbarbutton-icon {
326+
-moz-context-properties: fill;
327+
fill: currentColor;
328+
list-style-image: url("chrome://devtools/skin/images/tool-debugger.svg");
329+
}
330+
325331
#appmenu-developer-tools-view toolbarbutton[key="key_browserConsole"] > image.toolbarbutton-icon {
326332
-moz-context-properties: fill;
327333
fill: currentColor;
@@ -359,6 +365,7 @@
359365
#appmenu-developer-tools-view toolbarbutton[key="key_accessibility"] > label.toolbarbutton-text,
360366
#appmenu-developer-tools-view toolbarbutton[key="key_application"] > label.toolbarbutton-text,
361367
#appmenu-developer-tools-view toolbarbutton[key="key_dom"] > label.toolbarbutton-text,
368+
#appmenu-developer-tools-view toolbarbutton[key="key_browserToolbox"] > label.toolbarbutton-text,
362369
#appmenu-developer-tools-view toolbarbutton[key="key_browserConsole"] > label.toolbarbutton-text,
363370
#appmenu-developer-tools-view toolbarbutton[key="key_responsiveDesignMode"] > label.toolbarbutton-text,
364371
#appmenu-developer-tools-view toolbarbutton[key="key_viewSource"] > label.toolbarbutton-text,
@@ -423,31 +430,31 @@
423430
}
424431

425432
/* Browser Toolbox (by Key) and Browser Content Toolbox */
426-
433+
/*
427434
#appmenu-developer-tools-view toolbarbutton[key="key_toggleToolbox"] + toolbarbutton + toolbarbutton + toolbarbutton > image.toolbarbutton-icon,
428435
#appmenu-developer-tools-view toolbarbutton[key="key_toggleToolbox"] + toolbarbutton + toolbarbutton + toolbarbutton + toolbarbutton > image.toolbarbutton-icon {
429436
list-style-image: url("../../image/command-tilt.png");
430437
filter: grayscale(100%) brightness(10%);
431-
}
438+
}*/
432439

433440
#appmenu-developer-tools-view toolbarbutton[key="key_toggleToolbox"] + toolbarbutton + toolbarbutton + toolbarbutton > label.toolbarbutton-text,
434441
#appmenu-developer-tools-view toolbarbutton[key="key_toggleToolbox"] + toolbarbutton + toolbarbutton + toolbarbutton + toolbarbutton > label.toolbarbutton-text {
435442
padding-inline-start: 8px !important;
436443
}
437-
444+
/*
438445
:root[lwtheme]:-moz-lwtheme-brighttext #appmenu-developer-tools-view toolbarbutton[key="key_toggleToolbox"] + toolbarbutton + toolbarbutton + toolbarbutton > image.toolbarbutton-icon,
439446
:root[lwtheme]:-moz-lwtheme-brighttext #appmenu-developer-tools-view toolbarbutton[key="key_toggleToolbox"] + toolbarbutton + toolbarbutton + toolbarbutton + toolbarbutton > image.toolbarbutton-icon {
440447
list-style-image: url("../../image/command-tilt.png");
441448
filter: grayscale(100%) brightness(220%) !important;
442-
}
443-
449+
}*/
450+
/*
444451
@media (-moz-content-prefers-color-scheme: dark) {
445452
#appmenu-developer-tools-view toolbarbutton[key="key_toggleToolbox"] + toolbarbutton + toolbarbutton + toolbarbutton > image.toolbarbutton-icon,
446453
#appmenu-developer-tools-view toolbarbutton[key="key_toggleToolbox"] + toolbarbutton + toolbarbutton + toolbarbutton + toolbarbutton > image.toolbarbutton-icon {
447454
list-style-image: url("../../image/command-tilt.png");
448455
filter: grayscale(100%) brightness(220%) !important;
449456
}
450-
}
457+
}*/
451458

452459

453460

‎current/css/buttons/buttons_on_navbar_classic_appearance.css‎

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

218218
/* fix hover outline effect on extension buttons */
219+
:root[uidensity="compact"] {
220+
#nav-bar #nav-bar-customization-target > toolbaritem .unified-extensions-item-action-button {
221+
padding: 3px !important;
222+
margin: -2px !important
223+
}
224+
}
225+
219226
#nav-bar #nav-bar-customization-target > toolbaritem .unified-extensions-item-action-button {
220227
padding: 3px !important;
221228
margin: -3px !important
222229
}
230+
231+
/* adjust distance between buttons and urlbar/serachbar */
232+
#urlbar-container,
233+
#search-container {
234+
margin-inline: 3px !important
235+
}

‎current/css/buttons/buttons_on_navbar_classic_appearance_dark.css‎

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

218218
/* fix hover outline effect on extension buttons */
219+
:root[uidensity="compact"] {
220+
#nav-bar #nav-bar-customization-target > toolbaritem .unified-extensions-item-action-button {
221+
padding: 3px !important;
222+
margin: -2px !important
223+
}
224+
}
225+
219226
#nav-bar #nav-bar-customization-target > toolbaritem .unified-extensions-item-action-button {
220227
padding: 3px !important;
221228
margin: -3px !important
222229
}
230+
231+
/* adjust distance between buttons and urlbar/serachbar */
232+
#urlbar-container,
233+
#search-container {
234+
margin-inline: 3px !important
235+
}

‎current/css/buttons/buttons_on_navbar_classic_appearance_v2.css‎

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

218218
/* fix hover outline effect on extension buttons */
219+
:root[uidensity="compact"] {
220+
#nav-bar #nav-bar-customization-target > toolbaritem .unified-extensions-item-action-button {
221+
padding: 3px !important;
222+
margin: -2px !important
223+
}
224+
}
225+
219226
#nav-bar #nav-bar-customization-target > toolbaritem .unified-extensions-item-action-button {
220227
padding: 3px !important;
221228
margin: -3px !important
222229
}
230+
231+
/* adjust distance between buttons and urlbar/serachbar */
232+
#urlbar-container,
233+
#search-container {
234+
margin-inline: 3px !important
235+
}

‎current/css/buttons/buttons_on_navbar_glass_appearance.css‎

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

218218
/* fix hover outline effect on extension buttons */
219+
:root[uidensity="compact"] {
220+
#nav-bar #nav-bar-customization-target > toolbaritem .unified-extensions-item-action-button {
221+
padding: 3px !important;
222+
margin: -2px !important
223+
}
224+
}
225+
219226
#nav-bar #nav-bar-customization-target > toolbaritem .unified-extensions-item-action-button {
220227
padding: 3px !important;
221228
margin: -3px !important
222229
}
230+
231+
/* adjust distance between buttons and urlbar/serachbar */
232+
#urlbar-container,
233+
#search-container {
234+
margin-inline: 3px !important
235+
}

‎current/css/buttons/buttons_on_navbar_osx_appearance.css‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,20 @@
212212
}
213213

214214
/* fix hover outline effect on extension buttons */
215+
:root[uidensity="compact"] {
216+
#nav-bar #nav-bar-customization-target > toolbaritem .unified-extensions-item-action-button {
217+
padding: 3px !important;
218+
margin: -2px !important
219+
}
220+
}
221+
215222
#nav-bar #nav-bar-customization-target > toolbaritem .unified-extensions-item-action-button {
216223
padding: 3px !important;
217224
margin: -3px !important
218225
}
226+
227+
/* adjust distance between buttons and urlbar/serachbar */
228+
#urlbar-container,
229+
#search-container {
230+
margin-inline: 3px !important
231+
}

‎current/css/buttons/custom_backforward_connected_to_location_bar.css‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#main-window #back-button {
1111
z-index: 4 !important;
12-
position: relative !important;
12+
/*position: relative !important;*/
1313
}
1414

1515
#main-window #nav-bar #forward-button {
@@ -60,11 +60,15 @@
6060
}
6161

6262
#main-window #nav-bar #forward-button[disabled] + #urlbar-container {
63-
margin-inline-start: -45px !important;
63+
margin-inline-start: -55px !important;
64+
}
65+
66+
#main-window[uidensity=compact] #nav-bar #forward-button[disabled] + #urlbar-container {
67+
margin-inline-start: -53px !important;
6468
}
6569

6670
#main-window[uidensity=touch] #nav-bar #forward-button[disabled] + #urlbar-container {
67-
margin-inline-start: -60px !important;
71+
margin-inline-start: -59px !important;
6872
}
6973

7074

@@ -123,3 +127,19 @@
123127
}
124128

125129
}
130+
131+
/* fix for Fx 133+ */
132+
#main-window #nav-bar #forward-button[disabled] + #urlbar-container #urlbar:not([breakout-extend]) #urlbar-background {
133+
mask-image: linear-gradient(to right, transparent, transparent 4px, currentColor 0px) !important;
134+
background-color: unset !important;
135+
}
136+
137+
#main-window[uidensity=compact] #nav-bar #forward-button[disabled] + #urlbar-container #urlbar:not([breakout-extend]) #urlbar-background {
138+
mask-image: linear-gradient(to right, transparent, transparent 5px, currentColor 0px) !important;
139+
background-color: unset !important;
140+
}
141+
142+
#main-window[uidensity=touch] #nav-bar #forward-button[disabled] + #urlbar-container #urlbar:not([breakout-extend]) #urlbar-background {
143+
mask-image: linear-gradient(to right, transparent, transparent 5px, currentColor 0px) !important;
144+
background-color: unset !important;
145+
}

‎current/css/generalui/popup_compact_menus.css‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55

66
:root{
77
--item_y_padding: 3px; /* old value: 2px */
8-
--y_padding_before_label: 28px !important; /* for popup_menus_space_before_label.css */
9-
--y_padding_before_label_bm: calc(var(--y_padding_before_label) - 2px ) !important; /* for popup_menus_space_before_label.css */
8+
--y_padding_before_label: 24px !important; /* for popup_menus_space_before_label.css */
9+
--y_padding_before_label_bm: calc(var(--y_padding_before_label) - 12px ) !important; /* for popup_menus_space_before_label.css */
10+
--y_padding_before_label_sep: calc(var(--y_padding_before_label) - 12px ) !important; /* for popup_menus_space_before_label.css */
1011
--panel-padding: 0px !important;
1112
--arrowpanel-menuitem-margin: 0px !important;
1213
--arrowpanel-menuitem-padding: calc( var(--item_y_padding) + 1px) 2px !important;
@@ -95,7 +96,7 @@ menuseparator {
9596

9697
}
9798
:is(menupopup, panel) :is(.menu-accel,.menu-iconic-accel) {
98-
margin-inline-end: 8px !important;
99+
margin-inline-end: 4px !important;
99100
}
100101

101102
:is(menupopup, panel) .menu-right {

‎current/css/generalui/popup_menus_space_before_label.css‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
:root{
77
--y_padding_before_label: 36px;
88
--y_padding_before_label_cn_no_icon: 0px !important; /* for context_bfrsb_labels_without_icons.css */
9-
--y_padding_before_label_bm: calc(var(--y_padding_before_label) - 4px );
10-
--y_padding_before_label_am: calc(var(--y_padding_before_label) - 4px );
9+
--y_padding_before_label_bm: calc(var(--y_padding_before_label) - 12px );
10+
--y_padding_before_label_am: calc(var(--y_padding_before_label) - 12px );
11+
--y_padding_before_label_sep: calc(var(--y_padding_before_label) - 22px );
1112
}
1213

1314
:is(popup,menupopup)[type=arrow] :is(menu,menuitem):not(:is([checked],.menu-iconic,.menuitem-iconic)) {
@@ -20,10 +21,6 @@
2021
margin-inline-start: var(--y_padding_before_label) !important;
2122
}
2223

23-
:is(popup,menupopup)[type=arrow] menuitem[checked="false"] {
24-
padding-inline-start: var(--y_padding_before_label) !important;
25-
}
26-
2724
.PanelUI-subView .subviewbutton:not(#appMenu-fxa-status2):not(.menuitem-iconic):not(.menu-iconic):not(.subviewbutton-iconic) {
2825
padding-inline-start: var(--y_padding_before_label_bm) !important;
2926
}
@@ -35,17 +32,27 @@
3532
}
3633

3734
@media (-moz-platform: windows) {
38-
:is(popup,menupopup) :is(menu,menuitem):not(:is([checked],.menu-iconic,.menuitem-iconic)) {
35+
:is(popup,menupopup) :is(menu,menuitem):not(:is([checked]),.bookmark-item,.menu-iconic,.menuitem-iconic) {
3936
padding-inline-start: var(--y_padding_before_label) !important;
4037
}
4138

39+
:is(popup,menupopup) :is(menu,menuitem):not([data-usercontextid]):not(.bookmark-item,.menu-iconic,.menuitem-iconic) .menu-icon:not([src]) {
40+
display: none !important;
41+
}
42+
43+
:is(popup,menupopup) :is(menu,menuitem):not([data-usercontextid])[checked]:not(.bookmark-item,.menu-iconic,.menuitem-iconic) .menu-icon:not([src]) {
44+
display: block !important;
45+
}
46+
4247
:is(popup,menupopup) :is(menuseparator,.bookmarks-actions-menuseparator) {
4348
appearance: none;
4449
margin: 2px !important;
45-
margin-inline-start: var(--y_padding_before_label) !important;
50+
margin-inline-start: var(--y_padding_before_label_bm) !important;
4651
}
47-
48-
:is(popup,menupopup) menuitem[checked="false"] {
49-
padding-inline-start: var(--y_padding_before_label) !important;
52+
:is(popup,menupopup) menuseparator#context-sep-navigation {
53+
appearance: none;
54+
margin: 2px !important;
55+
margin-inline-start: var(--y_padding_before_label) !important;
56+
margin-inline-end: var(--y_padding_before_label_sep) !important;
5057
}
5158
}

current/css/generalui/popup_menus_space_before_label_fx140.css renamed to current/css/generalui/popup_menus_space_before_label_fx139.css

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
margin-inline-start: var(--y_padding_before_label) !important;
2121
}
2222

23+
:is(popup,menupopup)[type=arrow] menuitem[checked="false"] {
24+
padding-inline-start: var(--y_padding_before_label) !important;
25+
}
26+
2327
.PanelUI-subView .subviewbutton:not(#appMenu-fxa-status2):not(.menuitem-iconic):not(.menu-iconic):not(.subviewbutton-iconic) {
2428
padding-inline-start: var(--y_padding_before_label_bm) !important;
2529
}
@@ -31,21 +35,17 @@
3135
}
3236

3337
@media (-moz-platform: windows) {
34-
:is(popup,menupopup) :is(menu,menuitem):not(:is([checked]),.bookmark-item,.menu-iconic,.menuitem-iconic) {
38+
:is(popup,menupopup) :is(menu,menuitem):not(:is([checked],.menu-iconic,.menuitem-iconic)) {
3539
padding-inline-start: var(--y_padding_before_label) !important;
3640
}
3741

38-
:is(popup,menupopup) :is(menu,menuitem):not([data-usercontextid]):not(.bookmark-item,.menu-iconic,.menuitem-iconic) .menu-icon:not([src]) {
39-
display: none !important;
40-
}
41-
42-
:is(popup,menupopup) :is(menu,menuitem):not([data-usercontextid])[checked]:not(.bookmark-item,.menu-iconic,.menuitem-iconic) .menu-icon:not([src]) {
43-
display: block !important;
44-
}
45-
4642
:is(popup,menupopup) :is(menuseparator,.bookmarks-actions-menuseparator) {
4743
appearance: none;
4844
margin: 2px !important;
49-
margin-inline-start: var(--y_padding_before_label_bm) !important;
45+
margin-inline-start: var(--y_padding_before_label) !important;
46+
}
47+
48+
:is(popup,menupopup) menuitem[checked="false"] {
49+
padding-inline-start: var(--y_padding_before_label) !important;
5050
}
5151
}

0 commit comments

Comments
 (0)