Skip to content

Import from url #588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arturi merged 11 commits into from
Feb 9, 2018
Merged

Import from url #588

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1596cf8
implement basic Import from URL
arturi Dec 18, 2017
56fdc72
fetch meta
arturi Dec 18, 2017
4b68223
Merge master into feature/import-from-url
arturi Feb 1, 2018
24afc57
Implement getMeta and addFile
arturi Feb 2, 2018
ac43a6a
Add styles
arturi Feb 2, 2018
ed2406e
don’t use opacity for file source icons, it cuts a tiny piece off of …
arturi Feb 2, 2018
4c18bf1
rename to Url
arturi Feb 6, 2018
18583c3
Add docs for Url
arturi Feb 9, 2018
53ccf3e
Focus on input first, add locale strings, text instead of icon on the…
arturi Feb 9, 2018
4a833de
remove tape, update package-lock.json
arturi Feb 9, 2018
ce1e13d
Merge branch 'master' into feature/import-from-url
arturi Feb 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add styles
  • Loading branch information
@arturi
arturi committed Feb 2, 2018
commit ac43a6a78427596fecc872996edaba3b3996f3ac
30 changes: 30 additions & 0 deletions src/scss/_url.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
.uppy-Url {
width: 100%;
height: 100%;
display: flex;
justify-content: center;
align-items: center;
}

.uppy-Url-input {
width: 80%;
height: 50px;
padding-left: 10px;
font-size: 15px;
border: 1px solid rgba($color-gray, 0.5);
border-right: 0;
}

.uppy-Url-importButton {
@include reset-button();
width: 50px;
height: 50px;
background-color: $color-cornflower-blue;
cursor: pointer;
padding: 12px;
}

.uppy-Url-importButton-icon {
width: 100%;
height: 100%;
}
1 change: 1 addition & 0 deletions src/scss/uppy.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
@import '_dashboard.scss';
@import '_dragdrop.scss';
@import '_provider.scss';
@import '_url.scss';
@import '_progressbar.scss';
@import '_statusbar.scss';
@import '_webcam.scss';