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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the editor-toolbox and image upload #5756

Merged
merged 1 commit into from May 21, 2019

Conversation

@CleverFool77
Copy link
Member

commented May 21, 2019

Fixes #5612

Currently in bootstrap 4

Screenshot from 2019-05-21 18-38-57

Earlier in Bootstrap 3

Screenshot from 2019-05-21 18-38-47

Changes

Screenshot from 2019-05-21 18-36-19

  • PR is descriptively titled 馃搼 and links the original issue above 馃敆
  • tests pass -- look for a green checkbox 鉁旓笍 a few minutes after opening your PR -- or run tests locally with rake test
  • code is in uniquely-named feature branch and has no merge conflicts 馃搧
  • screenshots/GIFs are attached 馃搸 in case of UI updation
  • ask @publiclab/reviewers for help, in a comment below

We're happy to help you get this ready -- don't be afraid to ask for help, and don't be discouraged if your tests fail at first!

If tests do fail, click on the red X to learn why by reading the logs.

Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software

Thanks!

@CleverFool77 CleverFool77 requested a review from publiclab/plots2-reviewers May 21, 2019

@plotsbot

This comment has been minimized.

Copy link
Collaborator

commented May 21, 2019

1 Warning
鈿狅笍 This pull request cannot be merged yet due to merge conflicts. Please resolve them 鈥 probably by rebasing 鈥 and ask for help (in the comments, or in the chatroom if you get into trouble!.
2 Messages
馃摉 @CleverFool77 Thank you for your pull request! I鈥檓 here to help with some tips and recommendations. Please take a look at the list provided and help us review and accept your contribution! And don鈥檛 be discouraged if you see errors 鈥 we鈥檙e here to help.
馃摉 This pull request doesn鈥檛 link to a issue number. Please refer to the issue it fixes (if any) in the body of your PR, in the format: Fixes #123.

Generated by 馃毇 Danger

@CleverFool77 CleverFool77 changed the title Fix the editing-toolbox margins Fix the editing-toolbox and image upload May 21, 2019

@CleverFool77 CleverFool77 changed the title Fix the editing-toolbox and image upload Fix the editor-toolbox and image upload May 21, 2019

@CleverFool77 CleverFool77 force-pushed the CleverFool77:buttons-fix branch from 25c35a3 to a3512d2 May 21, 2019

@CleverFool77

This comment has been minimized.

Copy link
Member Author

commented May 21, 2019

Hi @jywarren I just did some fixes for the checklists points you mentioned in the Issue for which were distorted while bootstrap4 upgrade.
Thanks !!!

@jywarren jywarren merged commit f7b546a into publiclab:master May 21, 2019

3 checks passed

codeclimate All good!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
danger/danger 鈿狅笍 1 Warning. Don't worry, everything is fixable.
Details
@jywarren

This comment has been minimized.

Copy link
Contributor

commented May 21, 2019

This looks super. Thanks so much!!!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can鈥檛 perform that action at this time.