Skip to content
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

fix(file-uploader): change button from sm to default primary #2048

Merged
merged 19 commits into from
Mar 13, 2019
Merged

fix(file-uploader): change button from sm to default primary #2048

Changes from 14 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
f896874
fix(inline-loading): adjust stroke width and svg width
dakahn Mar 6, 2019
f5cee8c
chore(inline-loading): merge master
dakahn Mar 6, 2019
299ebb7
fix(inline-loader): remove accidental changes
dakahn Mar 7, 2019
5977218
fix(footer): rolls back unintentional formatting changes
dakahn Mar 7, 2019
3274d03
fix(footer): rolls back unintentional formatting changes
dakahn Mar 7, 2019
1b942dd
fix(footer): remove whitespace
dakahn Mar 7, 2019
0c68ac5
Merge branch 'master' into 1906-loading-inline-loading-tweaks
dakahn Mar 7, 2019
60515e5
Merge branch 'master' into 1906-loading-inline-loading-tweaks
shixiedesign Mar 7, 2019
b4b45ae
Merge branch 'master' of github.com:IBM/carbon-components
dakahn Mar 7, 2019
f87c085
Merge branch 'master' of github.com:dakahn/carbon-components
dakahn Mar 11, 2019
18a0254
Revert "Merge branch 'master' of github.com:dakahn/carbon-components"
dakahn Mar 11, 2019
1bdf59f
fix(file-uploader): change button from sm to default
dakahn Mar 11, 2019
d956534
Merge branch 'master' into dak/file-uploader-audit-fixes
dakahn Mar 11, 2019
948733a
fix(file-uploader): rope off button type change
dakahn Mar 11, 2019
2c434b6
fix(file-uploader): use unless of if hbs
dakahn Mar 11, 2019
3f601fc
Update src/components/file-uploader/file-uploader.hbs
asudoh Mar 12, 2019
b88f700
Merge branch 'master' into dak/file-uploader-audit-fixes
emyarod Mar 12, 2019
875d906
fix(file-uploader): change upload file height and remove check
dakahn Mar 12, 2019
919aebe
Merge branch 'master' into dak/file-uploader-audit-fixes
asudoh Mar 13, 2019
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
2 changes: 1 addition & 1 deletion src/components/file-uploader/file-uploader.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<p class="{{@root.prefix}}--label-description">only .jpg and .png files. 500kb max file size.</p>
<div class="{{@root.prefix}}--file" data-file>
<label for="your-file-importer-id-here"
class="{{@root.prefix}}--file-btn {{@root.prefix}}--btn {{@root.prefix}}--btn--primary {{@root.prefix}}--btn--sm"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems that this portion of the markup affects v9 as well - Can we rope it off?

class="{{@root.prefix}}--file-btn {{@root.prefix}}--btn {{@root.prefix}}--btn--primary {{#if componentsX}}{{else}}{{@root.prefix}}--btn--sm{{/if}}"
Copy link
Contributor Author

@dakahn dakahn Mar 11, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@asudoh This feels a little sketchy -- let me know if there's a smarter way to do this. 👍

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you may want to use unless here instead

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, exactly! Thanks 💪

role="button" tabindex="0">Add file</label>
<input type="file" class="{{@root.prefix}}--file-input" id="your-file-importer-id-here" data-file-uploader
data-target="[data-file-container]" multiple />
Expand Down