Skip to content

Commit 8415536

Browse files
committed
Merge branch 'dev'
2 parents 44f6633 + 64fe992 commit 8415536

File tree

8 files changed

+15
-6
lines changed

8 files changed

+15
-6
lines changed

addon/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"author": "mbnuqw",
1010
"name": "__MSG_ExtName__",
11-
"version": "3.0.0",
11+
"version": "3.0.1",
1212
"default_locale": "en",
1313
"description": "__MSG_ExtDesc__",
1414
"homepage_url": "https://github.com/mbnuqw/sidebery",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sidebery",
3-
"version": "3.0.0",
3+
"version": "3.0.1",
44
"description": "Manage your tabs and bookmarks in sidebar",
55
"main": "index.js",
66
"scripts": {

src/sidebar/actions/tabs.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1411,6 +1411,13 @@ function resetUpdateGroupTabTimeout() {
14111411
if (updateGroupTabTimeouit) clearTimeout(updateGroupTabTimeouit)
14121412
}
14131413

1414+
function updateActiveGroupPage() {
1415+
let activeTab = this.state.tabs.find(t => t.active)
1416+
if (Utils.isGroupUrl(activeTab.url)) {
1417+
this.actions.updateGroupTab(updateGroupTab)
1418+
}
1419+
}
1420+
14141421
export default {
14151422
loadTabs,
14161423
getOrderNormMoves,
@@ -1459,6 +1466,7 @@ export default {
14591466
getGroupTab,
14601467
updateGroupTab,
14611468
resetUpdateGroupTabTimeout,
1469+
updateActiveGroupPage,
14621470

14631471
createTabAfter,
14641472
updateTabsTree,

src/sidebar/sidebar.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ export default new Vue({
7575
Actions.saveTabsTree()
7676

7777
Actions.connectToBG()
78+
Actions.updateActiveGroupPage()
7879
},
7980

8081
mounted() {

src/styles/themes/default/pinned-tab.styl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@
217217
.PinnedTab .audio-badge
218218
pos(17px, same)
219219

220-
.PinnedTab[data-audible] .audio-badge > svg.-loud
220+
.PinnedTab[data-audible]:not([data-muted]) .audio-badge > svg.-loud
221221
.PinnedTab[data-muted] .audio-badge > svg.-mute
222222
opacity: 1
223223

src/styles/themes/default/tabs.tab.styl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
&:active
126126
opacity: .5
127127

128-
.Tab[data-audible] svg.-loud
128+
.Tab[data-audible]:not([data-muted]) svg.-loud
129129
.Tab[data-muted] svg.-mute
130130
opacity: 1
131131

src/styles/themes/tactile/pinned-tab.styl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@
247247
.PinnedTab .audio-badge
248248
pos(17px, 16px)
249249

250-
.PinnedTab[data-audible] .audio-badge > svg.-loud
250+
.PinnedTab[data-audible]:not([data-muted]) .audio-badge > svg.-loud
251251
.PinnedTab[data-muted] .audio-badge > svg.-mute
252252
opacity: 1
253253

src/styles/themes/tactile/tabs.tab.styl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
&:active
159159
opacity: .5
160160

161-
.Tab[data-audible] svg.-loud
161+
.Tab[data-audible]:not([data-muted]) svg.-loud
162162
.Tab[data-muted] svg.-mute
163163
opacity: 1
164164

0 commit comments

Comments
 (0)