Skip to content

Commit 6935ead

Browse files
committed
Merge branch 'refactoring' into dev
2 parents 1bb978d + f95a6b3 commit 6935ead

12 files changed

+468
-557
lines changed

css/leptonChrome.css

Lines changed: 7 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2299,7 +2299,6 @@
22992299
--organizer-toolbar-field-focus-box-shadow: unset;
23002300
--organizer-pane-field-border-color: ThreeDShadow;
23012301
}
2302-
23032302
@media not all and (prefers-contrast) {
23042303
:root {
23052304
--organizer-color: var(--in-content-page-color);
@@ -2328,7 +2327,6 @@
23282327
--organizer-toolbar-field-focus-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.23);
23292328
--organizer-pane-field-border-color: color-mix(in srgb, currentColor 41%, transparent);
23302329
}
2331-
23322330
@media (-moz-toolbar-prefers-color-scheme: dark), (prefers-color-scheme: dark) {
23332331
:root {
23342332
--organizer-color: rgb(251, 251, 254);
@@ -2344,6 +2342,7 @@
23442342
}
23452343
}
23462344
}
2345+
23472346
/*- Toolbar & Menus ------------------------------------------------------*/
23482347
#placesToolbar {
23492348
appearance: none !important;
@@ -2353,22 +2352,18 @@
23532352
padding: 4px !important;
23542353
padding-inline-end: 6px !important;
23552354
}
2356-
23572355
#placesToolbar > toolbarbutton {
23582356
appearance: none !important;
23592357
padding: 5px !important;
23602358
border-radius: 4px !important;
23612359
}
2362-
23632360
#placesToolbar > toolbarbutton[disabled] {
23642361
opacity: 0.6 !important;
23652362
}
2366-
23672363
#placesToolbar > toolbarbutton:not([disabled]):hover {
23682364
background-color: var(--organizer-hover-background) !important;
23692365
color: var(--organizer-hover-color) !important;
23702366
}
2371-
23722367
#placesToolbar > toolbarbutton:not([disabled]):hover:active {
23732368
background-color: var(--organizer-selected-background) !important;
23742369
}
@@ -2383,7 +2378,6 @@
23832378
#placesMenu {
23842379
margin-inline-start: 6px !important;
23852380
}
2386-
23872381
#placesMenu > menu {
23882382
appearance: none !important;
23892383
color: var(--organizer-color) !important;
@@ -2392,19 +2386,16 @@
23922386
padding-inline-start: 5px !important;
23932387
margin-inline-end: 2px !important;
23942388
}
2395-
23962389
#placesMenu > menu[_moz-menuactive="true"],
23972390
#placesMenu > menu:hover {
23982391
background-color: var(--organizer-hover-background) !important;
23992392
color: var(--organizer-hover-color) !important;
24002393
}
2401-
24022394
#placesMenu > menu:hover:active,
24032395
#placesMenu > menu[open] {
24042396
background-color: var(--organizer-selected-background) !important;
24052397
color: var(--organizer-selected-color) !important;
24062398
}
2407-
24082399
#placesMenu > menu > .menubar-text {
24092400
margin-block: 0 !important;
24102401
/* override menu.css */
@@ -2495,7 +2486,6 @@
24952486
background-color: var(--organizer-hover-background) !important;
24962487
color: var(--organizer-color) !important;
24972488
}
2498-
24992489
treecol:not([hideheader="true"], [sortable="false"]):hover:active,
25002490
treecolpicker:hover:active {
25012491
background-color: var(--organizer-selected-background) !important;
@@ -2526,38 +2516,31 @@
25262516
treechildren::-moz-tree-row {
25272517
background-color: transparent !important;
25282518
}
2529-
25302519
treechildren::-moz-tree-row(hover) {
25312520
background-color: var(--organizer-hover-background) !important;
25322521
}
2533-
25342522
treechildren::-moz-tree-row(selected) {
25352523
background-color: var(--organizer-selected-background) !important;
25362524
color: var(--organizer-selected-color) !important;
25372525
border: 1px solid transparent !important;
25382526
}
2539-
25402527
treechildren::-moz-tree-image(hover),
25412528
treechildren::-moz-tree-twisty(hover),
25422529
treechildren::-moz-tree-cell-text(hover) {
25432530
color: var(--organizer-hover-color) !important;
25442531
}
2545-
25462532
treechildren::-moz-tree-image(selected),
25472533
treechildren::-moz-tree-twisty(selected),
25482534
treechildren::-moz-tree-cell-text(selected) {
25492535
color: var(--organizer-selected-color) !important;
25502536
}
2551-
25522537
treechildren::-moz-tree-separator {
25532538
height: 1px !important;
25542539
border-color: var(--organizer-separator-color) !important;
25552540
}
2556-
25572541
treechildren::-moz-tree-separator(hover) {
25582542
border-color: var(--organizer-hover-color) !important;
25592543
}
2560-
25612544
treechildren::-moz-tree-separator(selected) {
25622545
border-color: var(--organizer-selected-color) !important;
25632546
}
@@ -2581,36 +2564,34 @@
25812564
border-radius: 4px !important;
25822565
color: var(--organizer-color) !important;
25832566
background-color: var(--organizer-content-background) !important;
2584-
list-style-image: url("chrome://global/skin/icons/arrow-down-12.svg");
25852567
-moz-context-properties: fill !important;
25862568
fill: currentColor !important;
25872569
}
2588-
25892570
#editBookmarkPanelRows .expander-up:hover,
25902571
#editBookmarkPanelRows .expander-down:hover {
25912572
background-color: var(--organizer-hover-background) !important;
25922573
color: var(--organizer-hover-color) !important;
25932574
}
2594-
25952575
#editBookmarkPanelRows .expander-up:hover:active,
25962576
#editBookmarkPanelRows .expander-down:hover:active {
25972577
background-color: var(--organizer-selected-background) !important;
25982578
color: var(--organizer-selected-color) !important;
25992579
}
2600-
26012580
#editBookmarkPanelRows .expander-up:focus-visible,
26022581
#editBookmarkPanelRows .expander-down:focus-visible {
26032582
outline: 2px solid var(--organizer-outline-color) !important;
26042583
outline-offset: -1px !important;
26052584
}
2585+
#editBookmarkPanelRows .expander-up > .button-box,
2586+
#editBookmarkPanelRows .expander-down > .button-box {
2587+
padding: 0 !important;
2588+
}
26062589

26072590
#editBookmarkPanelRows .expander-up {
26082591
list-style-image: url("chrome://global/skin/icons/arrow-up-12.svg");
26092592
}
2610-
2611-
#editBookmarkPanelRows .expander-up > .button-box,
2612-
#editBookmarkPanelRows .expander-down > .button-box {
2613-
padding: 0 !important;
2593+
#editBookmarkPanelRows .expander-down {
2594+
list-style-image: url("chrome://global/skin/icons/arrow-down-12.svg");
26142595
}
26152596

26162597
#places input {
@@ -2621,12 +2602,10 @@
26212602
min-height: 20px !important;
26222603
padding-inline: 4px !important;
26232604
}
2624-
26252605
#places input:focus {
26262606
outline: 2px solid var(--organizer-outline-color) !important;
26272607
outline-offset: -1px !important;
26282608
}
2629-
26302609
#places input:not(:read-write):focus {
26312610
outline: none !important;
26322611
}
@@ -2643,16 +2622,13 @@
26432622
border: 1px solid var(--organizer-border-color) !important;
26442623
border-radius: 4px !important;
26452624
}
2646-
26472625
#editBMPanel_tagsSelectorRow > richlistbox > richlistitem {
26482626
border: 1px solid transparent !important;
26492627
}
2650-
26512628
#editBMPanel_tagsSelectorRow > richlistbox > richlistitem:hover {
26522629
background-color: var(--organizer-hover-background) !important;
26532630
color: var(--organizer-hover-color) !important;
26542631
}
2655-
26562632
#editBMPanel_tagsSelectorRow > richlistbox > richlistitem[selected] {
26572633
background-color: var(--organizer-selected-background) !important;
26582634
color: var(--organizer-selected-color) !important;

0 commit comments

Comments
 (0)