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
f1bcb9a1
Unverified
Commit
f1bcb9a1
authored
Dec 19, 2017
by
Sheetal Umesh Kumar
Committed by
GitHub
Dec 19, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #635 from hypothesis/rename-annotator-css-bundle
Rename entry point for annotator CSS bundle
parents
7572d227
f0b61e6a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
gulpfile.js
gulpfile.js
+1
-1
boot.js
src/boot/boot.js
+1
-1
boot-test.js
src/boot/test/boot-test.js
+2
-2
annotator.scss
src/styles/annotator/annotator.scss
+0
-0
No files found.
gulpfile.js
View file @
f1bcb9a1
...
...
@@ -134,7 +134,7 @@ gulp.task('watch-js', ['build-vendor-js'], function () {
var
styleFiles
=
[
// H
'./src/styles/annotator/
inject
.scss'
,
'./src/styles/annotator/
annotator
.scss'
,
'./src/styles/annotator/pdfjs-overrides.scss'
,
'./src/styles/sidebar/sidebar.scss'
,
...
...
src/boot/boot.js
View file @
f1bcb9a1
...
...
@@ -68,7 +68,7 @@ function bootHypothesisClient(doc, config) {
'scripts/injector.bundle.js'
,
'styles/icomoon.css'
,
'styles/
inject
.css'
,
'styles/
annotator
.css'
,
'styles/pdfjs-overrides.css'
,
]);
}
...
...
src/boot/test/boot-test.js
View file @
f1bcb9a1
...
...
@@ -20,8 +20,8 @@ describe('bootstrap', function () {
'scripts/polyfills.bundle.js'
,
'scripts/jquery.bundle.js'
,
'scripts/injector.bundle.js'
,
'styles/annotator.css'
,
'styles/icomoon.css'
,
'styles/inject.css'
,
'styles/pdfjs-overrides.css'
,
// Sidebar app
...
...
@@ -73,8 +73,8 @@ describe('bootstrap', function () {
'scripts/injector.bundle.1234.js'
,
'scripts/jquery.bundle.1234.js'
,
'scripts/polyfills.bundle.1234.js'
,
'styles/annotator.1234.css'
,
'styles/icomoon.1234.css'
,
'styles/inject.1234.css'
,
'styles/pdfjs-overrides.1234.css'
,
].
map
(
function
(
url
)
{
return
'https://marginal.ly/client/build/'
+
url
;
...
...
src/styles/annotator/
inject
.scss
→
src/styles/annotator/
annotator
.scss
View file @
f1bcb9a1
File moved
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