Bootstrap v4 by antpaw · Pull Request #299 · bootstrap-ruby/bootstrap_form

antpaw · 2016-10-20T07:43:43Z

This branch can be used for all the changes that will come with the update to v4

…ack`

…ext text-muted`

mattbrictson · 2016-10-20T18:56:50Z

Thanks for contributing this! Is this PR a work in progress, or is it ready for review?

If it is not ready yet, could you add "WIP" to the PR name?

antpaw · 2016-10-21T08:29:08Z

Hi, I'm building a rails CRUD app with bootstrap_form from my repo and 'bootstrap', '~> 4.0.0.alpha4' and I can't detect any problems that would prevent from merging. However I wouldn't release a full major version of this, only a beta, because v4 is in alpha now.

… checkbox labels * Switched wrapper classes for checkboxes from "checkbox" to "form-check" for Boostrap v4 * Added form-check-input class to input types of 'checkbox' type for Boostrap v4 * Added form-check-label to form-labels, but not to inline-form-label's because they're not supported yet. Bootstrap v4 fixes. * Updated CHANGELOG.md to include info about checkboxes for Bootstrap v4

desheikh · 2017-01-18T07:42:22Z

@antpaw ditto, looks like this work's already in the bootstrap-v4 branch

bradlis7 · 2017-02-12T20:45:50Z

Personally, I feel that since the bootstrap gem is keeping a v4 alpha up to date, it would be useful if we could get this as a gem as well (maybe require specifying the version if possible). Can we merge the changes from master into this branch as well?

…p-v4 # Conflicts: # test/bootstrap_checkbox_test.rb # test/bootstrap_fields_test.rb # test/bootstrap_form_group_test.rb # test/bootstrap_form_test.rb # test/bootstrap_selects_test.rb

antpaw · 2017-02-13T09:38:01Z

ok, just did it

bradlis7 · 2017-02-15T03:27:44Z

Here's how you can use this branch in a project:

// Gemfile
gem 'bootstrap_form', git: 'https://github.com/bootstrap-ruby/rails-bootstrap-forms.git', branch: 'bootstrap-v4'

antpaw · 2017-02-15T09:22:17Z

@bradlis7 this branch is not my branch, they have started their own for some reason.

bradlis7 · 2017-02-15T16:49:01Z

Well, that branch is somehow associated to this PR, as it says "View #299" when I open that branch. I assumed they pulled some of your changes in. It seems like there are about 5 or 6 people with changes for the conversion, so it's a little confusing.

mattbrictson · 2017-02-15T18:30:45Z

Hi, this repo has an official bootstrap-v4 branch that we are using to consolidate all v4-related PRs. This is so we can review and merge improvements to v4 support incrementally without disrupting the master branch.

However we don't yet have an official PR to go with the bootstrap-v4 branch, hence why people are getting directed here. I will create an official PR for v4 to clear up the confusion.

mattbrictson · 2017-02-15T18:38:58Z

Here is the official bootstrap-v4 PR: #315

@antpaw Have all your commits already been included in #315? If so can we close this PR?

antpaw · 2017-02-15T20:48:59Z

@mattbrictson ye they both look similar, it would be easier to review if your v4 branch also had the newest master in it..

mattbrictson · 2017-02-15T23:32:20Z

@antpaw good point; I have now rebased it on the latest master.

antpaw · 2017-02-16T08:43:48Z

hmm not sure why the diff is still so big, https://github.com/bootstrap-ruby/rails-bootstrap-forms/pull/299/files I like my version better e.g. the

tag for form errors and the def error_class

mattbrictson · 2017-02-16T16:32:07Z

@desheikh and @donv, since you've helped review v4 PRs before, would either of you mind taking a look at this one?

@antpaw Thanks for the PR and for changing the merge target to bootstrap-ruby:bootstrap-v4. Could you resolve the conflicts so it is easier to review?

desheikh · 2017-02-16T20:15:54Z

@mattbrictson @antpaw I think the reason the diff is so large is because this branch needs to be rebased against the bootstrap-v4 branch. Most of these changes already exist on bootstrap-v4.

antpaw · 2017-02-17T10:27:47Z

hmm it looks like github is bugged, the target branch is bootstrap-ruby:bootstrap-v4 but i still see diffs like this one https://abload.de/img/screenshot2017-02-17a4rrb2.png but this should not have any diff if you look at the current state of the two branches

https://github.com/bootstrap-ruby/rails-bootstrap-forms/blob/bootstrap-v4/lib/bootstrap_form/form_builder.rb#L268
https://github.com/antpaw/rails-bootstrap-forms/blob/master/lib/bootstrap_form/form_builder.rb#L268

i will open an new pull request

edit: nope, new pull request wont help, i still see this nonesens diff, i will try to merge your v4 branch into this one

…p-v4 # Conflicts: # README.md # lib/bootstrap_form/form_builder.rb # test/bootstrap_checkbox_test.rb # test/bootstrap_fields_test.rb # test/bootstrap_form_group_test.rb # test/bootstrap_form_test.rb # test/bootstrap_radio_button_test.rb # test/bootstrap_selects_test.rb

antpaw · 2017-02-17T10:46:01Z

okay i have merged v4 into my v4

antpaw · 2017-02-17T12:29:15Z

one of the main changes is now that i have switched to a <p> tag for inline error and to a <div> for help text. this is done because this is how the documentation requires it. https://v4-alpha.getbootstrap.com/components/forms/?#help-text <span> tag is not a block element. The help text is not <p> because if you stack two <p>s (help and error) on top of each other it looks bad because of the padding.

desheikh · 2017-02-18T17:55:35Z

        label = generate_label(options[:id], name, options[:label], options[:label_col], options[:layout]) if options[:label]
        control = capture(&block).to_s
        control.concat(generate_help(name, options[:help]).to_s)
+        # TODO create `generate_error`


remove todo tag

desheikh · 2017-02-18T17:59:14Z

@mattbrictson @antpaw need to remove the #TODO comment, looks good otherwise!

antpaw · 2017-02-26T12:52:57Z

done

antpaw · 2017-02-26T12:53:57Z

please note my other pr that covers this todo #300

desheikh · 2018-01-12T06:15:48Z

@antpaw @mattbrictson closing this since the changes in beta3 make this obsolete.
#370 covers the new syntax.

Anton Pawlik added 3 commits October 18, 2016 11:28

Update to Bootstrap v4

1fe7500

Change validation text class from help-block to `form-control-feedb…

f46f865

…ack`

Change validation text class from form-control-feedback to `form-t…

f1c7dc5

…ext text-muted`

antpaw force-pushed the bootstrap-v4 branch from 4995afb to f1c7dc5 Compare October 20, 2016 07:50

trammel mentioned this pull request Oct 28, 2016

Bootstrap V4 Alpha checkbox fixes #302

Closed

Merge commit '5418ccf3e5a7d24e087424a639a07aeb29b8f269' into bootstra…

7b1fe50

…p-v4 # Conflicts: # test/bootstrap_checkbox_test.rb # test/bootstrap_fields_test.rb # test/bootstrap_form_group_test.rb # test/bootstrap_form_test.rb # test/bootstrap_selects_test.rb

antpaw changed the base branch from master to bootstrap-v4 February 15, 2017 09:25

antpaw changed the base branch from bootstrap-v4 to master February 15, 2017 09:25

desheikh added 9 commits February 15, 2017 14:44

has-error is now has-danger

4255abb

inputs with errors should have form-control-feedback

d8c3c1d

control-label is now form-control-label

04388cf

btn-default is now btn-secondary

47e90fa

form-horizontal is no longer a required class

2fe6f28

input field should have form-control-danger on error

fd2dc57

checkbox is now form-check

77ed9ff

checkbox input should have form-check-input

edac96a

non inline checkbox labels should have form-check-label

7d4043e

antpaw changed the base branch from master to bootstrap-v4 February 16, 2017 08:38

Anton Pawlik added 3 commits February 17, 2017 11:38

put back another pending release item to changelog to make DANGER happy

360be15

fix merge

711df61

fix tests

630ff28

desheikh reviewed Feb 18, 2017

View reviewed changes

removed a TODO comment

2e60da8

mattbrictson force-pushed the bootstrap-v4 branch from 16d82d6 to a68a242 Compare January 7, 2018 18:50

desheikh added this to the 4.0.0 milestone Jan 11, 2018

desheikh closed this Jan 12, 2018

Conversation

antpaw commented Oct 20, 2016

Uh oh!

mattbrictson commented Oct 20, 2016

Uh oh!

antpaw commented Oct 21, 2016

Uh oh!

desheikh commented Jan 18, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bradlis7 commented Feb 12, 2017

Uh oh!

antpaw commented Feb 13, 2017

Uh oh!

bradlis7 commented Feb 15, 2017

Uh oh!

antpaw commented Feb 15, 2017

Uh oh!

bradlis7 commented Feb 15, 2017

Uh oh!

mattbrictson commented Feb 15, 2017

Uh oh!

mattbrictson commented Feb 15, 2017

Uh oh!

antpaw commented Feb 15, 2017

Uh oh!

mattbrictson commented Feb 15, 2017

Uh oh!

antpaw commented Feb 16, 2017

Uh oh!

mattbrictson commented Feb 16, 2017

Uh oh!

desheikh commented Feb 16, 2017

Uh oh!

antpaw commented Feb 17, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

antpaw commented Feb 17, 2017

Uh oh!

antpaw commented Feb 17, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

desheikh Feb 18, 2017

Choose a reason for hiding this comment

Uh oh!

desheikh commented Feb 18, 2017

Uh oh!

antpaw commented Feb 26, 2017

Uh oh!

antpaw commented Feb 26, 2017

Uh oh!

desheikh commented Jan 12, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

desheikh commented Jan 18, 2017 •

edited

Loading

antpaw commented Feb 17, 2017 •

edited

Loading

antpaw commented Feb 17, 2017 •

edited

Loading