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
cb50baad
Unverified
Commit
cb50baad
authored
Feb 21, 2020
by
Lyza Gardner
Committed by
GitHub
Feb 21, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1814 from hypothesis/move-sidebar-errors
Move rendering of sidebar errors above tabs for consistency.
parents
28af0023
9f6f2e7f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
8 deletions
+12
-8
sidebar-content.html
src/sidebar/templates/sidebar-content.html
+12
-8
No files found.
src/sidebar/templates/sidebar-content.html
View file @
cb50baad
...
...
@@ -4,14 +4,6 @@
<login-prompt-panel
on-login=
"vm.onLogin()"
on-sign-up=
"vm.onSignUp()"
></login-prompt-panel>
<selection-tabs
ng-if=
"vm.showSelectedTabs()"
is-loading=
"vm.isLoading()"
>
</selection-tabs>
<search-status-bar
ng-if=
"!vm.isLoading() && !(vm.selectedAnnotationUnavailable() || vm.selectedGroupUnavailable())"
>
</search-status-bar>
<!-- Display error message if direct-linked annotation fetch failed. -->
<sidebar-content-error
...
...
@@ -30,6 +22,18 @@
</sidebar-content-error>
<selection-tabs
ng-if=
"vm.showSelectedTabs()"
is-loading=
"vm.isLoading()"
>
</selection-tabs>
<search-status-bar
ng-if=
"!vm.isLoading() && !(vm.selectedAnnotationUnavailable() || vm.selectedGroupUnavailable())"
>
</search-status-bar>
<thread-list
on-change-collapsed=
"vm.setCollapsed(id, collapsed)"
on-focus=
"vm.focus(annotation)"
...
...
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