Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

Commit d8d5950

Browse files
trickyprtrickypr
authored
🔀 Assorted bug fixes (#91)
Assorted bug fixes
2 parents 633e564 + 706daa8 commit d8d5950

File tree

12 files changed

+107
-62
lines changed

12 files changed

+107
-62
lines changed

‎src/browser/app/profile/pulse-browser.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ pref('media.videocontrols.picture-in-picture.audio-toggle.enabled', true);
2222

2323
// This preference tells the browser that our addons are preinstalled and should
2424
// be provided with permissions without asking
25-
// TODO: Documentation in melon for preference
26-
pref('extensions.installedDistroAddon.[email protected]', true);
25+
// TODO: Documentation in gluon for preference
26+
pref('extensions.installedDistroAddon.[email protected]', true);
2727

2828
pref('browser.discovery.enabled', false);
2929
pref('svg.context-properties.content.enabled', true);

‎src/browser/components/welcome/jar.mn‎

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

55
browser.jar:
66
% content browser %content/browser/ contentaccessible=yes
7-
content/browser/welcome/welcome.html (welcome.html)
8-
content/browser/welcome/welcome.css (welcome.css)
9-
content/browser/welcome/welcome.js (welcome.js)
7+
content/browser/welcome/welcome.html (welcome.html)
8+
content/browser/welcome/welcome.css (welcome.css)
9+
content/browser/welcome/welcome.js (welcome.js)
10+
content/browser/welcome/migrate.light.svg (migrate.light.svg)
11+
content/browser/welcome/migrate.dark.svg (migrate.dark.svg)

‎src/browser/components/welcome/migrate.dark.svg‎

Lines changed: 6 additions & 0 deletions
Loading

‎src/browser/components/welcome/migrate.light.svg‎

Lines changed: 6 additions & 0 deletions
Loading

‎src/browser/components/welcome/welcome.css‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,20 @@ p {
6767
height: 82px;
6868
width: 82px;
6969
}
70+
71+
.asset {
72+
width: 500px;
73+
padding-bottom: 32px;
74+
}
75+
76+
@media (prefers-color-scheme: light) {
77+
.dark-only {
78+
display: none;
79+
}
80+
}
81+
82+
@media (prefers-color-scheme: dark) {
83+
.light-only {
84+
display: none;
85+
}
86+
}

‎src/browser/components/welcome/welcome.html‎

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</head>
2828
<body>
2929
<div class="page" id="welcome">
30-
<img class="icon" src="chrome://branding/content/about-logo.png"/>
30+
<img class="icon" src="chrome://branding/content/about-logo.png" />
3131
<h2 data-l10n-id="welcome-dialog-welcome"></h2>
3232

3333
<p data-l10n-id="welcome-dialog-welcome-subtext"></p>
@@ -40,22 +40,32 @@ <h2 data-l10n-id="welcome-dialog-welcome"></h2>
4040
</div>
4141

4242
<div class="page" id="import">
43-
<img class="icon" src="chrome://global/skin/icons/undo.svg"/>
43+
<img
44+
class="asset light-only"
45+
src="chrome://browser/content/welcome/migrate.light.svg"
46+
/>
47+
<img
48+
class="asset dark-only"
49+
src="chrome://browser/content/welcome/migrate.dark.svg"
50+
/>
51+
4452
<h2 data-l10n-id="welcome-dialog-import"></h2>
4553
<p data-l10n-id="welcome-dialog-import-subtext"></p>
4654

4755
<br />
4856

49-
<button
50-
class="primary"
51-
id="importBrowser"
52-
data-l10n-id="welcome-dialog-import-action"
53-
></button>
54-
<button
55-
class="text-link"
56-
id="importNext"
57-
data-l10n-id="welcome-dialog-skip"
58-
></button>
57+
<hbox>
58+
<button
59+
class="primary"
60+
id="importBrowser"
61+
data-l10n-id="welcome-dialog-import-action"
62+
></button>
63+
<button
64+
class="text-link"
65+
id="importNext"
66+
data-l10n-id="welcome-dialog-skip"
67+
></button>
68+
</hbox>
5969
</div>
6070

6171
<div class="page" id="theme">

‎src/browser/extensions/tabliss/manifest-json.patch‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎src/browser/locales/en-US/browser/welcome.ftl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ welcome-dialog-skip = Not now
1010
1111
welcome-dialog-import = Import your stuff
1212
welcome-dialog-import-subtext = Pick up where you left off in your last browser.
13-
welcome-dialog-import-action = Import from previous browser
13+
welcome-dialog-import-action = Import
1414
1515
welcome-dialog-theme = Choose a theme
1616
welcome-dialog-theme-action = Continue

‎src/browser/themes/pulse/addons/shared.css‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
2121
--tab-block-margin: 0 !important; /* The padding around each tab. In proton, this is what makes them float */
2222
--tab-border-radius: 0 !important; /* The border radius of the tab */
2323
--tab-padding-inline: 0 !important; /* Padding to the left and right of the tab. **Focus Browser custom** */
24-
24+
2525
--toolbarbutton-border-radius: 4px;
2626

2727
/* Toolbar area */
@@ -63,7 +63,8 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
6363
padding: 4px !important;
6464
}
6565

66-
.toolbarbutton-icon, .tab-close-button {
66+
.toolbarbutton-icon,
67+
.tab-close-button {
6768
border-radius: 4px !important;
6869
}
6970

@@ -83,7 +84,7 @@ tab.tabbrowser-tab:nth-child(1) {
8384
.tabbrowser-tab {
8485
/* BUG GH#54: The container color does not show up in the pulse theme */
8586
border-top: 2px solid var(--identity-tab-color);
86-
87+
8788
/* Expand the overflow margin to contain the tab curves
8889
https://searchfox.org/mozilla-central/diff/b269ed31009c9a01be532c9afc0a836e0ad86ed6/browser/themes/shared/tabs.css#103 */
8990
overflow-clip-margin: 8px !important;
@@ -94,27 +95,27 @@ tab.tabbrowser-tab:nth-child(1) {
9495
fill: var(--lwt-selected-tab-background-color);
9596
} */
9697

97-
.tab-background[selected="true"]::before,
98-
.tab-background[selected="true"]::after {
99-
content: "";
98+
.tab-background[selected='true']::before,
99+
.tab-background[selected='true']::after {
100+
content: '';
100101
position: absolute;
101102
bottom: 0;
102-
103+
103104
-moz-context-properties: fill;
104105
fill: var(--lwt-selected-tab-background-color);
105106
background-size: cover;
106-
107+
107108
width: var(--tab-rounding-size);
108109
height: var(--tab-rounding-size);
109110
}
110111

111-
.tab-background[selected="true"]::before {
112-
background-image: url("chrome://global/skin/icons/tab-rising-edge.svg");
112+
.tab-background[selected='true']::before {
113+
background-image: url('chrome://global/skin/icons/tab-rising-edge.svg');
113114
left: var(--tab-rounding-size-neg);
114115
}
115116

116-
.tab-background[selected="true"]::after {
117-
background-image: url("chrome://global/skin/icons/tab-falling-edge.svg");
117+
.tab-background[selected='true']::after {
118+
background-image: url('chrome://global/skin/icons/tab-falling-edge.svg');
118119
right: var(--tab-rounding-size-neg);
119120
}
120121

@@ -140,9 +141,9 @@ tab.tabbrowser-tab:nth-child(1) {
140141

141142
/* ========================================================================== */
142143
/* Sidebar tabs */
143-
.sidebar-item-background[checked="true"]::before,
144-
.sidebar-item-background[checked="true"]::after {
145-
content: "";
144+
.sidebar-item-background[checked='true']::before,
145+
.sidebar-item-background[checked='true']::after {
146+
content: '';
146147
position: absolute;
147148
right: 0;
148149

@@ -158,13 +159,13 @@ tab.tabbrowser-tab:nth-child(1) {
158159
z-index: 10;
159160
}
160161

161-
.sidebar-item-background[checked="true"]::before {
162-
background-image: url("chrome://global/skin/icons/tab-rising-edge.svg");
162+
.sidebar-item-background[checked='true']::before {
163+
background-image: url('chrome://global/skin/icons/tab-rising-edge.svg');
163164
top: var(--tab-rounding-size-neg);
164165
}
165166

166-
.sidebar-item-background[checked="true"]::after {
167-
background-image: url("chrome://global/skin/icons/tab-falling-edge.svg");
167+
.sidebar-item-background[checked='true']::after {
168+
background-image: url('chrome://global/skin/icons/tab-falling-edge.svg');
168169
bottom: var(--tab-rounding-size-neg);
169170
transform: rotate(180deg);
170171
}

‎src/browser/themes/pulse/sidebar_tabs.css‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
display: flex;
1212
flex-direction: column;
1313
justify-content: space-between;
14-
background-color: var(--lwt-accent-color-inactive, var(--lwt-accent-color));
14+
background-color: -moz-Dialog;
1515
overflow: hidden;
1616

17-
max-width: var(--tab-min-height);
18-
min-width: var(--tab-min-height);
19-
2017
/* Makes the sidebar slide out from below */
2118
position: relative;
22-
z-index: 10;
19+
}
20+
21+
.sidebar-container:-moz-lwtheme {
22+
background-color: var(--lwt-accent-color-inactive, var(--lwt-accent-color));
2323
}
2424

2525
.sidebar-icon-item {
@@ -57,8 +57,8 @@
5757

5858
.sidebar-item-background[checked] {
5959
background-attachment: scroll, scroll, fixed;
60-
background-color: transparent;
61-
background-image: linear-gradient(var(--lwt-selected-tab-background-color, transparent), var(--lwt-selected-tab-background-color, transparent)), linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor)), var(--lwt-header-image, none);
60+
background-color: var(--tab-selected-bgcolor, var(--toolbar-bgcolor));
61+
background-image: var(--tab-selected-bgimage, var(--toolbar-bgimage));
6262
background-position: 0 0, 0 0, right top;
6363
background-repeat: repeat-x, repeat-x, no-repeat;
6464
background-size: auto 100%, auto 100%, auto auto;
@@ -80,9 +80,14 @@
8080
background-image: url('chrome://global/skin/icons/settings.svg');
8181
}
8282

83+
#sidebar-header {
84+
border-bottom: none;
85+
}
86+
8387
#sidebar-box,
8488
#sidebar-splitter {
85-
background-color: var(--lwt-selected-tab-background-color, --lwt-sidebar-background-color) !important;
89+
background-color: var(--tab-selected-bgcolor, var(--toolbar-bgcolor));
90+
background-image: var(--tab-selected-bgimage, var(--toolbar-bgimage));
8691
-moz-default-appearance: auto !important;
8792
-moz-font-smoothing-background-color: auto !important;
8893
}

0 commit comments

Comments
 (0)