From 779e8af262ef2307fcdb0724bf5821693dcf5645 Mon Sep 17 00:00:00 2001 From: Juri Strumpflohner Date: Thu, 12 Sep 2013 10:52:05 +0200 Subject: [PATCH 1/8] adding missing display:block Otherwise bootstrap's "display:block" is overwritten --- select2-bootstrap.css | 1 + 1 file changed, 1 insertion(+) diff --git a/select2-bootstrap.css b/select2-bootstrap.css index 5497890..aad1185 100644 --- a/select2-bootstrap.css +++ b/select2-bootstrap.css @@ -9,6 +9,7 @@ * are copied to the .select2-container. */ .select2-container.form-control { + display: block; background: transparent; border: none; margin: 0; From 5d7aa5af3bd5a85bc3ad09fd6756a760b1d9eec1 Mon Sep 17 00:00:00 2001 From: Florian Kissling Date: Sun, 24 Nov 2013 00:59:51 +0100 Subject: [PATCH 2/8] Add demos for Select2 3.4.3, 3.4.4, 3.4.5. --- _jekyll/3.4.3.html | 4 + _jekyll/3.4.4.html | 4 + _jekyll/3.4.5.html | 4 + _jekyll/_config.yml | 3 + docs/3.3.2.html | 6 + docs/3.4.1.html | 6 + docs/3.4.2.html | 6 + docs/3.4.3.html | 1603 +++++++++++++++++++++++++++++++++++++++++++ docs/3.4.4.html | 1603 +++++++++++++++++++++++++++++++++++++++++++ docs/3.4.5.html | 1603 +++++++++++++++++++++++++++++++++++++++++++ docs/index.html | 6 + docs/master.html | 6 + 12 files changed, 4854 insertions(+) create mode 100644 _jekyll/3.4.3.html create mode 100644 _jekyll/3.4.4.html create mode 100644 _jekyll/3.4.5.html create mode 100644 docs/3.4.3.html create mode 100644 docs/3.4.4.html create mode 100644 docs/3.4.5.html diff --git a/_jekyll/3.4.3.html b/_jekyll/3.4.3.html new file mode 100644 index 0000000..0fe00c8 --- /dev/null +++ b/_jekyll/3.4.3.html @@ -0,0 +1,4 @@ +--- +layout: default +version: 3.4.3 +--- diff --git a/_jekyll/3.4.4.html b/_jekyll/3.4.4.html new file mode 100644 index 0000000..e941f8b --- /dev/null +++ b/_jekyll/3.4.4.html @@ -0,0 +1,4 @@ +--- +layout: default +version: 3.4.4 +--- diff --git a/_jekyll/3.4.5.html b/_jekyll/3.4.5.html new file mode 100644 index 0000000..77a7f79 --- /dev/null +++ b/_jekyll/3.4.5.html @@ -0,0 +1,4 @@ +--- +layout: default +version: 3.4.5 +--- diff --git a/_jekyll/_config.yml b/_jekyll/_config.yml index e21a526..c237c82 100644 --- a/_jekyll/_config.yml +++ b/_jekyll/_config.yml @@ -2,6 +2,9 @@ versions: - 3.3.2 - 3.4.1 - 3.4.2 + - 3.4.3 + - 3.4.4 + - 3.4.5 - master title: diff --git a/docs/3.3.2.html b/docs/3.3.2.html index 238be0f..13c553a 100644 --- a/docs/3.3.2.html +++ b/docs/3.3.2.html @@ -37,6 +37,12 @@
  • 3.4.2
    • +
  • 3.4.3
    • + +
  • 3.4.4
    • + +
  • 3.4.5
    • +
  • master
    • diff --git a/docs/3.4.1.html b/docs/3.4.1.html index b77d81b..cff6b3e 100644 --- a/docs/3.4.1.html +++ b/docs/3.4.1.html @@ -37,6 +37,12 @@
  • 3.4.2
    • +
  • 3.4.3
    • + +
  • 3.4.4
    • + +
  • 3.4.5
    • +
  • master
    • diff --git a/docs/3.4.2.html b/docs/3.4.2.html index 67a9fdb..88018df 100644 --- a/docs/3.4.2.html +++ b/docs/3.4.2.html @@ -37,6 +37,12 @@
  • 3.4.2
    • +
  • 3.4.3
    • + +
  • 3.4.4
    • + +
  • 3.4.5
    • +
  • master
    • diff --git a/docs/3.4.3.html b/docs/3.4.3.html new file mode 100644 index 0000000..765b054 --- /dev/null +++ b/docs/3.4.3.html @@ -0,0 +1,1603 @@ + + + + + + select2-bootstrap-css + + + + + + + + + + +
    + + +
    + +
    + + +
    + +
    + + +
    + +
    +

    Input Groups #

    +
    + +

    To let the Select2-widget know if any elements are directly being appended, prepended or both in the context of a Bootstrap input group, add .select2-bootstrap-prepend and/or .select2-bootstrap-append to the .input-group wrapper element to address the corresponding border-radii.

    + +
    + +
    + + + + +
    +
    + +
    + +
    + + + + +
    +
    + +
    + +
    + + + + +
    +
    + +
    + +
    + + + + +
    +
    + +
    + +
    + + + + +
    +
    + +
    + +
    + + + + +
    +
    + +
    + +
    +

    Control sizing #

    +
    + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    +
    + +
    + + + + +
    +
    +
    +
    + +
    + +
    +
    + + +

    Example block-level help text here.

    +
    +
    + + +
    +
    + + +
    +
    +
    + +
    + + + + +
    +
    +
    +
    + +
    + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    +
    + +
    + + + + +
    +
    +
    +
    + +
    +

    Button Addons #

    +
    + +
    +
    + +
    +
    + +
    + +
    +
    +
    + +
    + + + + +
    +
    +
    + +
    + +
    +
    + +
    +
    + + +
    + +
    +
    +
    + +
    + + + + +
    +
    +
    + +
    + +
    +
    + +
    + + + + +
    +
    +
    + +
    + + + + +
    +
    +
    + +
    +

    Disabled inputs #

    +
    + +
    +
    +
    + +
    + + + + +
    +
    +
    +
    +
    + +
    + + + + +
    +
    +
    +
    + +
    + +
    +
    +

    + Bootstrap is a front-end framework for fast, sleek, and mobile-first web development.
    + Select2 is a jQuery based replacement for select boxes. +

    +

    <3 @tterrace

    +
    +
    + + + + + + + diff --git a/docs/3.4.4.html b/docs/3.4.4.html new file mode 100644 index 0000000..139f2dd --- /dev/null +++ b/docs/3.4.4.html @@ -0,0 +1,1603 @@ + + + + + + select2-bootstrap-css + + + + + + + + + + +
    + + +
    + +
    + + +
    + +
    + + +
    + +
    +

    Input Groups #

    +
    + +

    To let the Select2-widget know if any elements are directly being appended, prepended or both in the context of a Bootstrap input group, add .select2-bootstrap-prepend and/or .select2-bootstrap-append to the .input-group wrapper element to address the corresponding border-radii.

    + +
    + +
    + + + + +
    +
    + +
    + +
    + + + + +
    +
    + +
    + +
    + + + + +
    +
    + +
    + +
    + + + + +
    +
    + +
    + +
    + + + + +
    +
    + +
    + +
    + + + + +
    +
    + +
    + +
    +

    Control sizing #

    +
    + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    +
    + +
    + + + + +
    +
    +
    +
    + +
    + +
    +
    + + +

    Example block-level help text here.

    +
    +
    + + +
    +
    + + +
    +
    +
    + +
    + + + + +
    +
    +
    +
    + +
    + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    +
    + +
    + + + + +
    +
    +
    +
    + +
    +

    Button Addons #

    +
    + +
    +
    + +
    +
    + +
    + +
    +
    +
    + +
    + + + + +
    +
    +
    + +
    + +
    +
    + +
    +
    + + +
    + +
    +
    +
    + +
    + + + + +
    +
    +
    + +
    + +
    +
    + +
    + + + + +
    +
    +
    + +
    + + + + +
    +
    +
    + +
    +

    Disabled inputs #

    +
    + +
    +
    +
    + +
    + + + + +
    +
    +
    +
    +
    + +
    + + + + +
    +
    +
    +
    + +
    + +
    +
    +

    + Bootstrap is a front-end framework for fast, sleek, and mobile-first web development.
    + Select2 is a jQuery based replacement for select boxes. +

    +

    <3 @tterrace

    +
    +
    + + + + + + + diff --git a/docs/3.4.5.html b/docs/3.4.5.html new file mode 100644 index 0000000..a5f97c1 --- /dev/null +++ b/docs/3.4.5.html @@ -0,0 +1,1603 @@ + + + + + + select2-bootstrap-css + + + + + + + + + + +
    + + +
    + +
    + + +
    + +
    + + +
    + +
    +

    Input Groups #

    +
    + +

    To let the Select2-widget know if any elements are directly being appended, prepended or both in the context of a Bootstrap input group, add .select2-bootstrap-prepend and/or .select2-bootstrap-append to the .input-group wrapper element to address the corresponding border-radii.

    + +
    + +
    + + + + +
    +
    + +
    + +
    + + + + +
    +
    + +
    + +
    + + + + +
    +
    + +
    + +
    + + + + +
    +
    + +
    + +
    + + + + +
    +
    + +
    + +
    + + + + +
    +
    + +
    + +
    +

    Control sizing #

    +
    + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    +
    + +
    + + + + +
    +
    +
    +
    + +
    + +
    +
    + + +

    Example block-level help text here.

    +
    +
    + + +
    +
    + + +
    +
    +
    + +
    + + + + +
    +
    +
    +
    + +
    + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    +
    + +
    + + + + +
    +
    +
    +
    + +
    +

    Button Addons #

    +
    + +
    +
    + +
    +
    + +
    + +
    +
    +
    + +
    + + + + +
    +
    +
    + +
    + +
    +
    + +
    +
    + + +
    + +
    +
    +
    + +
    + + + + +
    +
    +
    + +
    + +
    +
    + +
    + + + + +
    +
    +
    + +
    + + + + +
    +
    +
    + +
    +

    Disabled inputs #

    +
    + +
    +
    +
    + +
    + + + + +
    +
    +
    +
    +
    + +
    + + + + +
    +
    +
    +
    + +
    + +
    +
    +

    + Bootstrap is a front-end framework for fast, sleek, and mobile-first web development.
    + Select2 is a jQuery based replacement for select boxes. +

    +

    <3 @tterrace

    +
    +
    + + + + + + + diff --git a/docs/index.html b/docs/index.html index e894ee1..2380a47 100644 --- a/docs/index.html +++ b/docs/index.html @@ -225,6 +225,12 @@

    Demonstrations

  • Select2 3.4.2
    • +
  • Select2 3.4.3
    • + +
  • Select2 3.4.4
    • + +
  • Select2 3.4.5
    • +
  • Select2 master
    • diff --git a/docs/master.html b/docs/master.html index ed01d17..24ace8c 100644 --- a/docs/master.html +++ b/docs/master.html @@ -37,6 +37,12 @@
  • 3.4.2
    • +
  • 3.4.3
    • + +
  • 3.4.4
    • + +
  • 3.4.5
    • +
  • master
    • From 78e28c4abf08267469c6665c2cf505ba24449b16 Mon Sep 17 00:00:00 2001 From: Florian Kissling Date: Sun, 24 Nov 2013 03:30:47 +0100 Subject: [PATCH 3/8] Minor improvements to readme and gh-pages index. --- README.md | 10 ++++++---- _jekyll/_includes/footer.html | 2 +- _jekyll/css/gh-pages.css | 23 ++++++++++++++++++++--- _jekyll/index.html | 11 ++++++----- docs/3.3.2.html | 2 +- docs/3.4.1.html | 2 +- docs/3.4.2.html | 2 +- docs/3.4.3.html | 2 +- docs/3.4.4.html | 2 +- docs/3.4.5.html | 2 +- docs/css/gh-pages.css | 23 ++++++++++++++++++++--- docs/index.html | 25 +++++++++++++------------ docs/master.html | 2 +- 13 files changed, 73 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index c4d8fbd..5b26649 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,13 @@ -CSS for making Select2 fit in with Bootstrap a bit better, -**updated for Bootstrap v3.0.0**. +[select2-bootstrap-css](https://github.com/t0m/select2-bootstrap-css), +forked for Bootstrap 3. +Demonstrations available at http://fk.github.io/select2-bootstrap-css/ -Tested with Bootstrap 3.0.0 and Select2 3.3.2, 3.4.1 and 3.4.2 and in latest Chrome, Safari, Firefox, Opera (Mac) and IE8-IE10. +Tested with Bootstrap 3.0.0 and Select2 3.3.2, 3.4.1 and 3.4.2 +in latest Chrome, Safari, Firefox, Opera (Mac) and IE8-IE10. -Known issues: +##### Known issues * "Loading Remote Data" and "Infinite Scroll" not addressed yet, the loading indicator position probably needs some adjustments * IE8/IE9/IE10, Firefox: Select2 in "Bootstrap input group with radio/checkbox addon" and .input-lg misses 1px in height (IE9/IE10, Firefox behave the same for Bootstrap 3's "input group sizing"-demo at http://getbootstrap.com/components/#input-groups-sizing) diff --git a/_jekyll/_includes/footer.html b/_jekyll/_includes/footer.html index 77cffbe..5d789c5 100644 --- a/_jekyll/_includes/footer.html +++ b/_jekyll/_includes/footer.html @@ -4,6 +4,6 @@ Bootstrap is a front-end framework for fast, sleek, and mobile-first web development.
    Select2 is a jQuery based replacement for select boxes.

    -

    <3 @tterrace

    +

    <3 @fk

    \ No newline at end of file diff --git a/_jekyll/css/gh-pages.css b/_jekyll/css/gh-pages.css index 3b0cc50..3150790 100644 --- a/_jekyll/css/gh-pages.css +++ b/_jekyll/css/gh-pages.css @@ -1,5 +1,5 @@ .demo { - padding: 80px 30px 30px; + padding: 80px 30px 30px; } .demo .footer { @@ -8,6 +8,15 @@ border-top: 1px solid #eee; } +.home { + background: #f8f8f8; +} + +.home .footer, +.home body { + background: transparent; +} + .home .container { max-width: 700px; } @@ -34,6 +43,8 @@ a:focus { margin-bottom: 15px; letter-spacing: -1px; color: #999; + font-weight: 300; + margin-top: 60px; } .jumbotron h2 { @@ -60,11 +71,17 @@ a:focus { border-color: #333; } +.jumbotron p a:hover { + border-color: #000; + border-width: 2px; +} + .jumbotron p a, .jumbotron-links a { font-weight: 500; color: #000; transition: all .1s ease-in-out; + border-bottom: 1px solid transparent; } .jumbotron-links { @@ -82,8 +99,8 @@ a:focus { } .jumbotron hr { - border-color: #ddd; - width: 100px; + border-color: #ddd; + width: 100px; } .jumbotron .select2-wrapper { diff --git a/_jekyll/index.html b/_jekyll/index.html index af7d239..48817ec 100644 --- a/_jekyll/index.html +++ b/_jekyll/index.html @@ -26,16 +26,16 @@ -

    Select2 Bootstrap 3 CSS

    +

    Select2 Bootstrap 3 CSS

    -

    CSS to make Select2 fit in with Bootstrap, ready for use in original, LESS, Sass and Compass flavors.

    +

    CSS to make Select2 fit in with Bootstrap 3, ready for use in original, LESS, Sass and Compass flavors.

    - Download from GitHub + Download CSS from GitHub
    @@ -43,8 +43,9 @@

    Select2 Bootstrap 3 CSS

    Demonstrations

    diff --git a/docs/3.3.2.html b/docs/3.3.2.html index 13c553a..0b25b36 100644 --- a/docs/3.3.2.html +++ b/docs/3.3.2.html @@ -1550,7 +1550,7 @@

    Disabled inputs Bootstrap is a front-end framework for fast, sleek, and mobile-first web development.
    Select2 is a jQuery based replacement for select boxes.

    -

    <3 @tterrace

    +

    <3 @fk

    diff --git a/docs/3.4.1.html b/docs/3.4.1.html index cff6b3e..199d6d0 100644 --- a/docs/3.4.1.html +++ b/docs/3.4.1.html @@ -1550,7 +1550,7 @@

    Disabled inputs Bootstrap is a front-end framework for fast, sleek, and mobile-first web development.
    Select2 is a jQuery based replacement for select boxes.

    -

    <3 @tterrace

    +

    <3 @fk

    diff --git a/docs/3.4.2.html b/docs/3.4.2.html index 88018df..7f8b386 100644 --- a/docs/3.4.2.html +++ b/docs/3.4.2.html @@ -1550,7 +1550,7 @@

    Disabled inputs Bootstrap is a front-end framework for fast, sleek, and mobile-first web development.
    Select2 is a jQuery based replacement for select boxes.

    -

    <3 @tterrace

    +

    <3 @fk

    diff --git a/docs/3.4.3.html b/docs/3.4.3.html index 765b054..0b65002 100644 --- a/docs/3.4.3.html +++ b/docs/3.4.3.html @@ -1550,7 +1550,7 @@

    Disabled inputs Bootstrap is a front-end framework for fast, sleek, and mobile-first web development.
    Select2 is a jQuery based replacement for select boxes.

    -

    <3 @tterrace

    +

    <3 @fk

    diff --git a/docs/3.4.4.html b/docs/3.4.4.html index 139f2dd..642fd79 100644 --- a/docs/3.4.4.html +++ b/docs/3.4.4.html @@ -1550,7 +1550,7 @@

    Disabled inputs Bootstrap is a front-end framework for fast, sleek, and mobile-first web development.
    Select2 is a jQuery based replacement for select boxes.

    -

    <3 @tterrace

    +

    <3 @fk

    diff --git a/docs/3.4.5.html b/docs/3.4.5.html index a5f97c1..6d7c7c1 100644 --- a/docs/3.4.5.html +++ b/docs/3.4.5.html @@ -1550,7 +1550,7 @@

    Disabled inputs Bootstrap is a front-end framework for fast, sleek, and mobile-first web development.
    Select2 is a jQuery based replacement for select boxes.

    -

    <3 @tterrace

    +

    <3 @fk

    diff --git a/docs/css/gh-pages.css b/docs/css/gh-pages.css index 3b0cc50..3150790 100644 --- a/docs/css/gh-pages.css +++ b/docs/css/gh-pages.css @@ -1,5 +1,5 @@ .demo { - padding: 80px 30px 30px; + padding: 80px 30px 30px; } .demo .footer { @@ -8,6 +8,15 @@ border-top: 1px solid #eee; } +.home { + background: #f8f8f8; +} + +.home .footer, +.home body { + background: transparent; +} + .home .container { max-width: 700px; } @@ -34,6 +43,8 @@ a:focus { margin-bottom: 15px; letter-spacing: -1px; color: #999; + font-weight: 300; + margin-top: 60px; } .jumbotron h2 { @@ -60,11 +71,17 @@ a:focus { border-color: #333; } +.jumbotron p a:hover { + border-color: #000; + border-width: 2px; +} + .jumbotron p a, .jumbotron-links a { font-weight: 500; color: #000; transition: all .1s ease-in-out; + border-bottom: 1px solid transparent; } .jumbotron-links { @@ -82,8 +99,8 @@ a:focus { } .jumbotron hr { - border-color: #ddd; - width: 100px; + border-color: #ddd; + width: 100px; } .jumbotron .select2-wrapper { diff --git a/docs/index.html b/docs/index.html index 2380a47..dbe3ff1 100644 --- a/docs/index.html +++ b/docs/index.html @@ -201,16 +201,16 @@ -

    Select2 Bootstrap 3 CSS

    +

    Select2 Bootstrap 3 CSS

    -

    CSS to make Select2 fit in with Bootstrap, ready for use in original, LESS, Sass and Compass flavors.

    +

    CSS to make Select2 fit in with Bootstrap 3, ready for use in original, LESS, Sass and Compass flavors.

    - Download from GitHub + Download CSS from GitHub
    @@ -218,20 +218,21 @@

    Select2 Bootstrap 3 CSS

    Demonstrations

    @@ -244,7 +245,7 @@

    Demonstrations

    Bootstrap is a front-end framework for fast, sleek, and mobile-first web development.
    Select2 is a jQuery based replacement for select boxes.

    -

    <3 @tterrace

    +

    <3 @fk

    diff --git a/docs/master.html b/docs/master.html index 24ace8c..1e1556b 100644 --- a/docs/master.html +++ b/docs/master.html @@ -1550,7 +1550,7 @@

    Disabled inputs Bootstrap is a front-end framework for fast, sleek, and mobile-first web development.
    Select2 is a jQuery based replacement for select boxes.

    -

    <3 @tterrace

    +

    <3 @fk

    From 40a0c599c7b1a248ede89a9215541b2112592ea6 Mon Sep 17 00:00:00 2001 From: Florian Kissling Date: Wed, 18 Sep 2013 01:10:54 +0200 Subject: [PATCH 4/8] Add a copy of Select2's "Loading Remote Data" demo to "our" demo. --- _jekyll/_layouts/default.html | 69 +++++++++++++++---- _jekyll/index.html | 2 +- docs/3.3.2.html | 123 ++++++++++++++++------------------ docs/3.4.1.html | 123 ++++++++++++++++------------------ docs/3.4.2.html | 123 ++++++++++++++++------------------ docs/3.4.3.html | 123 ++++++++++++++++------------------ docs/3.4.4.html | 123 ++++++++++++++++------------------ docs/3.4.5.html | 123 ++++++++++++++++------------------ docs/index.html | 2 +- docs/master.html | 123 ++++++++++++++++------------------ 10 files changed, 458 insertions(+), 476 deletions(-) diff --git a/_jekyll/_layouts/default.html b/_jekyll/_layouts/default.html index e3dd04c..d51ab17 100644 --- a/_jekyll/_layouts/default.html +++ b/_jekyll/_layouts/default.html @@ -279,9 +279,7 @@

    Button Addons Separated link - +
    @@ -305,7 +303,7 @@

    Button Addons
    - +
    - +

    @@ -1322,7 +1266,7 @@

    Button Addons
    - +
    - +

    @@ -1322,7 +1266,7 @@

    Button Addons
    - +
    - +

    @@ -1322,7 +1266,7 @@

    Button Addons
    - +
    - +

    @@ -1322,7 +1266,7 @@

    Button Addons
    - +
    - +

    @@ -1322,7 +1266,7 @@

    Button Addons
    - +
    - +

    @@ -1322,7 +1266,7 @@

    Button Addons
    - +
    - +

    @@ -1322,7 +1266,7 @@

    Button Addons
    - +