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

Jump to bottom

Formular slim bootstrap3 #1

Open
wants to merge 30 commits into
base: master
Choose a base branch
from
Open

Formular slim bootstrap3 #1

wants to merge 30 commits into from

Commits on Dec 22, 2015

  1. use correct & operator.

    @apotonick
    apotonick committed Dec 22, 2015
    Configuration menu
    Copy the full SHA
    850ccd5 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2016

  1. use bootstrap instead of foundation 

    Using official CDNs as described here:
http://getbootstrap.com/getting-started/
Also had to change a couple of gems to make it run and tweak migrations.
    @fran-worley
    fran-worley committed Jan 20, 2016
    Configuration menu
    Copy the full SHA
    402014e View commit details
    Browse the repository at this point in the history

  2. Upgrade trailblazer & fix edit view 

    1. Upgrading trailblazer corrected previous errors
2. Updated the show view to use bootstrap
3. Restored field content to form (removed in previous commit due to
errors)
    @fran-worley
    fran-worley committed Jan 20, 2016
    Configuration menu
    Copy the full SHA
    0576478 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2016

  1. Added basic form example for Bootstrap

    @fran-worley
    fran-worley committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    902e212 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2016

  1. bigger form!

    @apotonick
    apotonick committed Jan 22, 2016
    Configuration menu
    Copy the full SHA
    b247649 View commit details
    Browse the repository at this point in the history

  2. checkbox collections!

    @apotonick
    apotonick committed Jan 22, 2016
    Configuration menu
    Copy the full SHA
    d285ba1 View commit details
    Browse the repository at this point in the history

  3. added formula, enhanced forms 

    Added formula gem, updated real form to use formula.
Added a manual bootstrap form for comparison.
    @fran-worley
    fran-worley committed Jan 22, 2016
    Configuration menu
    Copy the full SHA
    9baff07 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/fran-worley/gemgem-sinatra … 

    …into formular-slim-bootstrap3

Conflicts:
	Gemfile
	Gemfile.lock
	concepts/post/view/new.slim
	config/migrations.rb
	gemgem/view/layout.slim
    @apotonick
    apotonick committed Jan 22, 2016
    Configuration menu
    Copy the full SHA
    90c0052 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2016

  1. remove .form-group for several elements.

    @apotonick
    apotonick committed Jan 23, 2016
    Configuration menu
    Copy the full SHA
    2e13130 View commit details
    Browse the repository at this point in the history

  2. add benchmark puts to /posts/new.

    @apotonick
    apotonick committed Jan 23, 2016
    Configuration menu
    Copy the full SHA
    0e587fe View commit details
    Browse the repository at this point in the history

  3. benchmark x50.

    @apotonick
    apotonick committed Jan 23, 2016
    Configuration menu
    Copy the full SHA
    d53e004 View commit details
    Browse the repository at this point in the history

  4. add benchmark-ips.

    @apotonick
    apotonick committed Jan 23, 2016
    Configuration menu
    Copy the full SHA
    d7b86a5 View commit details
    Browse the repository at this point in the history

  5. change ips settings.

    @apotonick
    apotonick committed Jan 23, 2016
    Configuration menu
    Copy the full SHA
    ff68636 View commit details
    Browse the repository at this point in the history

  6. remove benchmarking from controller.

    @apotonick
    apotonick committed Jan 23, 2016
    Configuration menu
    Copy the full SHA
    82bdf05 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2016

  1. Merge branch 'formular-slim' into formular-slim-bootstrap3 

    Conflicts:
	Gemfile.lock
    @apotonick
    apotonick committed Jan 28, 2016
    Configuration menu
    Copy the full SHA
    4c23219 View commit details
    Browse the repository at this point in the history

  2. add grid, thanks @fran-worley!

    @apotonick
    apotonick committed Jan 28, 2016
    Configuration menu
    Copy the full SHA
    100e2fa View commit details
    Browse the repository at this point in the history

  3. more grid magic.

    @apotonick
    apotonick committed Jan 28, 2016
    Configuration menu
    Copy the full SHA
    a1bf4b3 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2016

  1. select menu must have other name.

    @apotonick
    apotonick committed Jan 31, 2016
    Configuration menu
    Copy the full SHA
    ae75f83 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2016

  1. newer formular API. 

    inline form example.
    @apotonick
    apotonick committed Feb 1, 2016
    Configuration menu
    Copy the full SHA
    48f2a1a View commit details
    Browse the repository at this point in the history

  2. new API. style: :inline.

    @apotonick
    apotonick committed Feb 1, 2016
    Configuration menu
    Copy the full SHA
    edb57ff View commit details
    Browse the repository at this point in the history

  3. Fix inline forms 

    You need to add a space at the beginning of the checkbox label
And a css hack to replicate the whitespace used in the example.
    @fran-worley
    fran-worley committed Feb 1, 2016
    Configuration menu
    Copy the full SHA
    88facc6 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2016

  1. Horizontal Forms Yey!!

    @fran-worley
    fran-worley committed Feb 2, 2016
    Configuration menu
    Copy the full SHA
    8cd13b5 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2016

  1. Add input groups

    @fran-worley
    fran-worley committed Feb 9, 2016
    Configuration menu
    Copy the full SHA
    7e1e125 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2016

  1. new formula

    @fran-worley
    fran-worley committed Jun 28, 2016
    Configuration menu
    Copy the full SHA
    ec2318f View commit details
    Browse the repository at this point in the history

  2. update to TRB cells.

    @apotonick
    apotonick committed Jun 28, 2016
    Configuration menu
    Copy the full SHA
    1139c3c View commit details
    Browse the repository at this point in the history

  3. Let's enhance our form

    @fran-worley
    fran-worley committed Jun 28, 2016
    Configuration menu
    Copy the full SHA
    b03b564 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2016

  1. use new formular helper

    @fran-worley
    fran-worley committed Jul 21, 2016
    Configuration menu
    Copy the full SHA
    75de530 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2016

  1. update for latest formular

    @fran-worley
    fran-worley committed Sep 29, 2016
    Configuration menu
    Copy the full SHA
    6519dcc View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2016

  1. use new select prompt option

    @fran-worley
    fran-worley committed Dec 8, 2016
    Configuration menu
    Copy the full SHA
    6ab26cb View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2017

  1. fix buttons

    @fran-worley
    fran-worley committed Jun 11, 2017
    Configuration menu
    Copy the full SHA
    c3b4967 View commit details
    Browse the repository at this point in the history