Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
coopwire-hypothesis
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
孙灵跃 Leon Sun
coopwire-hypothesis
Commits
e4140515
Commit
e4140515
authored
Feb 27, 2020
by
Robert Knight
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace last remaining use of `h-branding` with `applyTheme`
parent
416b6f32
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
hypothesis-app.js
src/sidebar/components/hypothesis-app.js
+3
-0
hypothesis-app.html
src/sidebar/templates/hypothesis-app.html
+1
-1
No files found.
src/sidebar/components/hypothesis-app.js
View file @
e4140515
...
@@ -5,6 +5,7 @@ import uiConstants from '../ui-constants';
...
@@ -5,6 +5,7 @@ import uiConstants from '../ui-constants';
import
{
parseAccountID
}
from
'../util/account-id'
;
import
{
parseAccountID
}
from
'../util/account-id'
;
import
isSidebar
from
'../util/is-sidebar'
;
import
isSidebar
from
'../util/is-sidebar'
;
import
{
shouldAutoDisplayTutorial
}
from
'../util/session'
;
import
{
shouldAutoDisplayTutorial
}
from
'../util/session'
;
import
{
applyTheme
}
from
'../util/theme'
;
/**
/**
* Return the user's authentication status from their profile.
* Return the user's authentication status from their profile.
...
@@ -57,6 +58,8 @@ function HypothesisAppController(
...
@@ -57,6 +58,8 @@ function HypothesisAppController(
// used by templates to show an intermediate or loading state.
// used by templates to show an intermediate or loading state.
this
.
auth
=
{
status
:
'unknown'
};
this
.
auth
=
{
status
:
'unknown'
};
this
.
backgroundStyle
=
applyTheme
([
'appBackgroundColor'
],
settings
);
// Check to see if we're in the sidebar, or on a standalone page such as
// Check to see if we're in the sidebar, or on a standalone page such as
// the stream page or an individual annotation page.
// the stream page or an individual annotation page.
this
.
isSidebar
=
isSidebar
();
this
.
isSidebar
=
isSidebar
();
...
...
src/sidebar/templates/hypothesis-app.html
View file @
e4140515
<div
class=
"app-content-wrapper js-thread-list-scroll-root"
h-branding=
"appBackgroundColor
"
>
<div
class=
"app-content-wrapper js-thread-list-scroll-root"
ng-style=
"vm.backgroundStyle
"
>
<top-bar
<top-bar
auth=
"vm.auth"
auth=
"vm.auth"
on-login=
"vm.login()"
on-login=
"vm.login()"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment