Compare commits

...

8 Commits

Author SHA1 Message Date
Barun Acharya
782bc50d2a Merge branch 'main' into publish-demo-action 2021-03-18 17:46:16 +05:30
dependabot-preview[bot]
3e7d9d2e2b Bump jasmine-core from 3.6.0 to 3.7.0
Bumps [jasmine-core](https://github.com/jasmine/jasmine) from 3.6.0 to 3.7.0.
- [Release notes](https://github.com/jasmine/jasmine/releases)
- [Changelog](https://github.com/jasmine/jasmine/blob/main/RELEASE.md)
- [Commits](https://github.com/jasmine/jasmine/compare/v3.6.0...v3.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-18 12:14:27 +00:00
John Rafael
6ffc4a9853 Removed scroll to top on mobile devices (#1852)
Co-authored-by: Jeffrey Warren <jeff@unterbahn.com>
2021-03-17 12:16:57 -04:00
dependabot-preview[bot]
1321033c64 Bump jsdom from 16.5.0 to 16.5.1 (#1850)
Bumps [jsdom](https://github.com/jsdom/jsdom) from 16.5.0 to 16.5.1.
- [Release notes](https://github.com/jsdom/jsdom/releases)
- [Changelog](https://github.com/jsdom/jsdom/blob/master/Changelog.md)
- [Commits](https://github.com/jsdom/jsdom/compare/16.5.0...16.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-03-17 11:44:46 -04:00
Harsh Khandeparkar
6052e78a67 fix: use update-gh-pages script 2020-11-03 11:20:44 +05:30
Harsh Khandeparkar
428fa64b32 Merge branch 'main' into publish-demo-action 2020-11-03 11:14:42 +05:30
Jeffrey Warren
e4b5c05a1e Merge branch 'main' into publish-demo-action 2020-08-05 14:44:21 -04:00
Jeffrey Warren
0ea8e3eefd Create republish.yml
Try setting up github action to publish demo, following @harshithpabbati's work in https://github.com/harshithpabbati/image-sequencer/blob/main/.github/workflows/upstream.yml
2020-08-03 23:26:25 -04:00
4 changed files with 51 additions and 16 deletions

16
.github/workflows/republish.yml vendored Normal file
View File

@@ -0,0 +1,16 @@
name: Publish sequencer.publiclab.org demo
on:
push:
branches:
- stable
jobs:
merge:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Merge upstream
run: |
git config --global user.name 'jywarren'
git config --global user.email 'jeff@unterbahn.com'
./scripts/update-gh-pages 'publiclab/image-sequencer' 'stable' 'sequencer.publiclab.org' 'bypass-warning'

View File

@@ -172,8 +172,8 @@ body > .container-fluid {
#move-up {
position: fixed;
bottom: 50px;
right: 40px;
bottom: 30px;
right: 20px;
z-index: 550;
display: none;
background:transparent;
@@ -181,11 +181,17 @@ body > .container-fluid {
}
#move-up i {
font-size:60px;
font-size:50px;
opacity:0.7;
color:#BABABA;
}
@media (max-width: 768px), (max-height 700px) {
#move-up {
display: none !important; /* !important is used to override the jQuery style */
}
}
.btn-circle{
min-width: 80px;
min-height: 80px;

26
package-lock.json generated
View File

@@ -10634,12 +10634,20 @@
"requires": {
"glob": "^7.1.6",
"jasmine-core": "~3.6.0"
},
"dependencies": {
"jasmine-core": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.6.0.tgz",
"integrity": "sha512-8uQYa7zJN8hq9z+g8z1bqCfdC8eoDAeVnM5sfqs7KHv9/ifoJ500m018fpFc7RDaO6SWCLCXwo/wPSNcdYTgcw=="
}
}
},
"jasmine-core": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.6.0.tgz",
"integrity": "sha512-8uQYa7zJN8hq9z+g8z1bqCfdC8eoDAeVnM5sfqs7KHv9/ifoJ500m018fpFc7RDaO6SWCLCXwo/wPSNcdYTgcw=="
"version": "3.7.0",
"resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.7.0.tgz",
"integrity": "sha512-jmeRIgxS/abz8afk9NKJ1yP7n93aZdRaHDWtTHJBlYu6fhbzvErjiO3mMlSSrJefVk1a+26JlABrHS2iBH8Azw==",
"dev": true
},
"jasmine-jquery": {
"version": "2.1.1",
@@ -12618,9 +12626,9 @@
"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
},
"jsdom": {
"version": "16.5.0",
"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.5.0.tgz",
"integrity": "sha512-QxZH0nmDTnTTVI0YDm4RUlaUPl5dcyn62G5TMDNfMmTW+J1u1v9gCR8WR+WZ6UghAa7nKJjDOFaI00eMMWvJFQ==",
"version": "16.5.1",
"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.5.1.tgz",
"integrity": "sha512-pF73EOsJgwZekbDHEY5VO/yKXUkab/DuvrQB/ANVizbr6UAHJsDdHXuotZYwkJSGQl1JM+ivXaqY+XBDDL4TiA==",
"requires": {
"abab": "^2.0.5",
"acorn": "^8.0.5",
@@ -12651,9 +12659,9 @@
},
"dependencies": {
"acorn": {
"version": "8.0.5",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.0.5.tgz",
"integrity": "sha512-v+DieK/HJkJOpFBETDJioequtc3PfxsWMaxIdIwujtF7FEV/MAyDQLlm6/zPvr7Mix07mLh6ccVwIsloceodlg=="
"version": "8.1.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.1.0.tgz",
"integrity": "sha512-LWCF/Wn0nfHOmJ9rzQApGnxnvgfROzGilS8936rqN/lfcYkY9MYZzdMqN+2NJ4SlTc+m5HiSa+kNfDtI64dwUA=="
},
"ajv": {
"version": "6.12.6",

View File

@@ -6286,7 +6286,12 @@ isurl@^1.0.0-alpha5:
has-to-string-tag-x "^1.2.0"
is-object "^1.0.1"
jasmine-core@^3.3.0, jasmine-core@~3.6.0:
jasmine-core@^3.3.0:
version "3.7.0"
resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.7.0.tgz#33da871fef5595e9aa43d0f50e009b5fe35f7ef2"
integrity sha512-jmeRIgxS/abz8afk9NKJ1yP7n93aZdRaHDWtTHJBlYu6fhbzvErjiO3mMlSSrJefVk1a+26JlABrHS2iBH8Azw==
jasmine-core@~3.6.0:
version "3.6.0"
resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.6.0.tgz#491f3bb23941799c353ceb7a45b38a950ebc5a20"
integrity sha512-8uQYa7zJN8hq9z+g8z1bqCfdC8eoDAeVnM5sfqs7KHv9/ifoJ500m018fpFc7RDaO6SWCLCXwo/wPSNcdYTgcw==
@@ -6768,9 +6773,9 @@ jsbn@~0.1.0:
integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
jsdom@^16.3.0, jsdom@^16.4.0:
version "16.5.0"
resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.0.tgz#9e453505600cc5a70b385750d35256f380730cc4"
integrity sha512-QxZH0nmDTnTTVI0YDm4RUlaUPl5dcyn62G5TMDNfMmTW+J1u1v9gCR8WR+WZ6UghAa7nKJjDOFaI00eMMWvJFQ==
version "16.5.1"
resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.1.tgz#4ced6bbd7b77d67fb980e64d9e3e6fb900f97dd6"
integrity sha512-pF73EOsJgwZekbDHEY5VO/yKXUkab/DuvrQB/ANVizbr6UAHJsDdHXuotZYwkJSGQl1JM+ivXaqY+XBDDL4TiA==
dependencies:
abab "^2.0.5"
acorn "^8.0.5"