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.

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

Allow multiple upload fields and add logo option to labels #6736

Merged
merged 11 commits into from
Mar 1, 2019

Conversation

smb
Copy link
Contributor

@smb smb commented Feb 17, 2019

Changed handling by id to look for a "uploadFile" css class.

Needs npm run dev/prod call for final deployment to master (but i think it's also needed for other changes in dev)

@smb smb requested a review from snipe as a code owner February 17, 2019 15:35
@snipe
Copy link
Owner

snipe commented Feb 17, 2019

Hi - thanks for this! What problem does this solve?

@smb
Copy link
Contributor Author

smb commented Feb 17, 2019

Allow preview + size check for multiple "logo" files in branding settings (currently only site logo does this):

image

also the next step (already working on this) is to move this code to a template/partial and add another one ("label logo") to be printed on asset labels.

smb added 3 commits February 17, 2019 22:13
- Add label logo
- Add css classes to label elements
- Change label prefix text (M: S: ...) to css::before content for easy removal in config
@smb
Copy link
Contributor Author

smb commented Feb 22, 2019

should i create another PR with the "logo on label" coding or just commit here and rename the PR? (since the new one would be build on commits of this one it would make sense to merge them into one PR)

@snipe
Copy link
Owner

snipe commented Feb 22, 2019

You can just add to this one, and let me know when it’s ready - thanks!!

@smb
Copy link
Contributor Author

smb commented Feb 23, 2019

Feel free to test!

image

Custom CSS added: (to demo new css options in label printing)

  .label-model::before {
    content: none;
  }
  .label-company::before {
    content: none;
  }
  .label-asset_tag::before {
    content: none;
  }
  .label-serial::before {
    content: "Serial: ";
  }
  .label-name::before {
    content: none;
  }  
  label-qr_text {
    font-size: 0.2in;
 }

Result:

image

@smb smb changed the title Allow multiple upload fields Allow multiple upload fields and add logo option to labels Feb 23, 2019
@snipe snipe merged commit e1907e3 into snipe:develop Mar 1, 2019
snipe added a commit that referenced this pull request Aug 3, 2020
This change appears to have been stomped on in one of the merges. :(
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants