Skip to content

Commit

Permalink
reflect Bootstrap's branding change
Browse files Browse the repository at this point in the history
  • Loading branch information
cvrebert committed May 7, 2014
1 parent fab1243 commit 9a65800
Show file tree
Hide file tree
Showing 32 changed files with 63 additions and 63 deletions.
4 changes: 2 additions & 2 deletions README.md
@@ -1,6 +1,6 @@
#jQuery UI Bootstrap (v 1.0 Alpha)

This project was started to bring the beauty and ease-of-use of Twitter Bootstrap to jQuery UI widgets ♥.
This project was started to bring the beauty and ease-of-use of Bootstrap to jQuery UI widgets ♥.


##Why?
Expand All @@ -10,7 +10,7 @@ Bootstrap is one of our favorite projects, but having used it regularly it left
* The ability to work side-by-side with jQuery UI (something which caused a number of widgets to break visually)
* The ability to theme jQuery UI widgets using Bootstrap styles. Whilst we love jQuery UI, we find some of the current themes to look a little dated. Our hope is that this theme provides a decent alternative for others that feel the same.

To clarify, this project doesn't aim or intend to replace Twitter Bootstrap. It merely provides a jQuery UI-compatible theme inspired by Bootstrap's design. It also provides a version of Bootstrap CSS with a few (minor) sections commented out which enable the theme to work alongside it.
To clarify, this project doesn't aim or intend to replace Bootstrap. It merely provides a jQuery UI-compatible theme inspired by Bootstrap's design. It also provides a version of Bootstrap CSS with a few (minor) sections commented out which enable the theme to work alongside it.

We welcome any and all feedback as we would very much like this theme to be as solid as possible.

Expand Down
2 changes: 1 addition & 1 deletion components.html
Expand Up @@ -1179,7 +1179,7 @@ <h3><span class="icon-group"></span> Team</h3>
<h3><span class="icon-lightbulb"></span> Credits</h3>
<ul class="list-unstyled">
<li>jQuery UI Bootstrap &copy; <strong class="text-info">Addy Osmani</strong> 2012 - 2013.</li>
<li>Twitter Bootstrap &copy; <strong class="text-info">Twitter</strong> 2012 - 2013</li>
<li>Bootstrap &copy; <strong class="text-info">Twitter, Inc.</strong> 2012 - 2013</li>
</ul>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion css/custom-theme/jquery-ui-1.10.3.custom.css
Expand Up @@ -5,7 +5,7 @@
* Copyright 2012 - 2013, Addy Osmani
* Dual licensed under the MIT or GPL Version 2 licenses.
*
* Portions copyright jQuery UI & Twitter Bootstrap
* Portions copyright jQuery UI & Twitter, Inc.
*/

/********** VJ - Move to Less - Start *************/
Expand Down
4 changes: 2 additions & 2 deletions extra.html
Expand Up @@ -131,7 +131,7 @@ <h1>jQuery UI Bootstrap</h1>
<h1>Wijmo</h1>
</div>
<p>
This is an example of how to retheme one of the Wijmo jQuery UI components to match the Twitter Bootstrap theme. Whilst a menu component will be arriving to jQueryUI soon, you can find the menu in <a href="http://wijmo.com/widgets/wijmo-open/">Wijmo Open</a>.
This is an example of how to retheme one of the Wijmo jQuery UI components to match the Bootstrap theme. Whilst a menu component will be arriving to jQueryUI soon, you can find the menu in <a href="http://wijmo.com/widgets/wijmo-open/">Wijmo Open</a>.
</p>
<div id="wijmo-container" class="container">
<ul id="menu1">
Expand Down Expand Up @@ -408,7 +408,7 @@ <h3><span class="icon-group"></span> Team</h3>
<h3><span class="icon-lightbulb"></span> Credits</h3>
<ul class="list-unstyled">
<li>jQuery UI Bootstrap &copy; <strong class="text-info">Addy Osmani</strong> 2012 - 2013.</li>
<li>Twitter Bootstrap &copy; <strong class="text-info">Twitter</strong> 2012 - 2013</li>
<li>Bootstrap &copy; <strong class="text-info">Twitter, Inc.</strong> 2012 - 2013</li>
</ul>
</div>
</div>
Expand Down
20 changes: 10 additions & 10 deletions index.html
Expand Up @@ -117,8 +117,8 @@ <h1>jQuery UI Bootstrap</h1>
<h1><span class="label label-default">1</span> Download</h1>
</div>
<p class="docs-lead">
Welcome! This is a live preview of jQuery UI Bootstrap - a project we started to bring the beauty of Twitter <a class="targetblank" href="http://getbootstrap.com">Bootstrap</a> to jQuery UI widgets.
With this theme, not only do you get the ability to use Bootstrap-themed widgets, but you can now also use (most) of Twitter Bootstrap side-by-wide with it without components breaking visually.
Welcome! This is a live preview of jQuery UI Bootstrap - a project we started to bring the beauty of <a class="targetblank" href="http://getbootstrap.com">Bootstrap</a> to jQuery UI widgets.
With this theme, not only do you get the ability to use Bootstrap-themed widgets, but you can now also use (most) of Bootstrap side-by-wide with it without components breaking visually.
</p>
<p>
<a class="download-btn ui-button-primary" href="https://github.com/addyosmani/jquery-ui-bootstrap/zipball/v0.5pre">Download stable (v0.5)</a>
Expand All @@ -132,10 +132,10 @@ <h1><span class="label label-default">1</span> Download</h1>
<div class="page-header">
<h1><span class="label label-default">2</span> Start with jQuery UI Bootstrap</h1>
</div>
<h2>Compatibility jQuery UI and Twitter Bootstrap</h2>
<h2>Compatibility jQuery UI and Bootstrap</h2>

<p>
In their original forms, jQuery UI and Bootstrap can't coexist resulting in conflicts with both CSS classes and styles as well as JavaScript when you do try to use them. jQuery UI Bootstrap provides the JavaScript and CSS required to quickly start a project using both jQuery UI and Twitter Bootstrap.
In their original forms, jQuery UI and Bootstrap can't coexist resulting in conflicts with both CSS classes and styles as well as JavaScript when you do try to use them. jQuery UI Bootstrap provides the JavaScript and CSS required to quickly start a project using both jQuery UI and Bootstrap.
</p>
<p>
Our solution offers a custom version of Bootstrap compatible with jQuery UI as well as a Bootstrap-themed jQuery UI theme you can use to prototype your projects.
Expand All @@ -145,7 +145,7 @@ <h3>Components</h3>
<thead>
<tr>
<th>jQuery UI</th>
<th>Twitter Bootstrap</th>
<th>Bootstrap</th>
</tr>
</thead>
<tbody>
Expand All @@ -169,7 +169,7 @@ <h3>jQuery UI components</h3>
<tr>
<th>Widget</th>
<th>jQuery UI</th>
<th>Twitter Bootstrap</th>
<th>Bootstrap</th>
</tr>
</thead>
<tbody>
Expand All @@ -188,7 +188,7 @@ <h3>jQuery UI components</h3>
<div class="alert alert-info">
<span class="icon-lightbulb icon-large"></span> Select custom jQuery UI components (eg exclude tooltip)
</div>
<h3> Twitter Bootstrap components</h3>
<h3>Bootstrap components</h3>
<div class="row">
<ul class="list-unstyled">
<li class="col-sm-6 col-lg-3 col-sm-3">
Expand Down Expand Up @@ -216,7 +216,7 @@ <h3> Twitter Bootstrap components</h3>
<tr>
<th>Widget</th>
<th>jQuery UI</th>
<th>Twitter Bootstrap</th>
<th>Bootstrap</th>
</tr>
</thead>
<tbody>
Expand All @@ -236,7 +236,7 @@ <h3> Twitter Bootstrap components</h3>
Selecting which jQuery UI and Bootstrap components and styles we wish to use, we can benefit from the advantages of both projects. jQuery UI Bootstrap also provides Bootstrap theming for a number of third-party jQuery UI widgets such as the Wijmo menu widget and others.
</p>
<p>
Note: if you want to use Font awesome with Twitter Bootstrap, you must exclude the CSS component icons.
Note: if you want to use Font Awesome with Bootstrap, you must exclude the CSS component icons.
</p>
<p>
The Awesome Font documentation indicates this information perfectly.
Expand Down Expand Up @@ -283,7 +283,7 @@ <h3><span class="icon-group"></span> Team</h3>
<h3><span class="icon-lightbulb"></span> Credits</h3>
<ul class="list-unstyled">
<li>jQuery UI Bootstrap &copy; <strong class="text-info">Addy Osmani</strong> 2012 - 2013.</li>
<li>Twitter Bootstrap &copy; <strong class="text-info">Twitter</strong> 2012 - 2013</li>
<li>Bootstrap &copy; <strong class="text-info">Twitter, Inc.</strong> 2012 - 2013</li>
</ul>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion less/bootstrap/component-animations.less
Expand Up @@ -5,7 +5,7 @@
// Heads up!
//
// We don't use the `.opacity()` mixin here since it causes a bug with text
// fields in IE7-8. Source: https://github.com/twitter/bootstrap/pull/3552.
// fields in IE7-8. Source: https://github.com/twbs/bootstrap/pull/3552.

.fade {
opacity: 0;
Expand Down
2 changes: 1 addition & 1 deletion less/jq-ui-bootstrap/accordion.less
Expand Up @@ -4,7 +4,7 @@
* jQuery UI Accordion 1.10.3
* http://jqueryui.com/accordion/
*
* Portions copyright Addy Osmani, jQuery UI & Twitter Bootstrap
* Portions copyright Addy Osmani, jQuery UI & Twitter, Inc.
* Created the LESS version by @dharapvj
* Released under MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion less/jq-ui-bootstrap/autocomplete.less
Expand Up @@ -4,7 +4,7 @@
* jQuery UI Autocomplete 1.10.3
* http://docs.jquery.com/UI/Autocomplete#theming
*
* Portions copyright Addy Osmani, jQuery UI & Twitter Bootstrap
* Portions copyright Addy Osmani, jQuery UI & Twitter, Inc.
* Created the LESS version by @dharapvj
* Released under MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion less/jq-ui-bootstrap/button.less
Expand Up @@ -4,7 +4,7 @@
* jQuery UI Button 1.10.3
* http://docs.jquery.com/UI/Button#theming
*
* Portions copyright Addy Osmani, jQuery UI & Twitter Bootstrap
* Portions copyright Addy Osmani, jQuery UI & Twitter, Inc.
* Created the LESS version by @dharapvj
* Released under MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion less/jq-ui-bootstrap/core.less
Expand Up @@ -3,7 +3,7 @@
*
* jQuery UI CSS Framework 1.10.3
*
* Portions copyright Addy Osmani, jQuery UI & Twitter Bootstrap
* Portions copyright Addy Osmani, jQuery UI & Twitter, Inc.
* Created the LESS version by @dharapvj
* Released under MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion less/jq-ui-bootstrap/datepicker.less
Expand Up @@ -4,7 +4,7 @@
* jQuery UI Datepicker 1.10.3
* http://docs.jquery.com/UI/Datepicker#theming
*
* Portions copyright Addy Osmani, jQuery UI & Twitter Bootstrap
* Portions copyright Addy Osmani, jQuery UI & Twitter, Inc.
* Created the LESS version by @dharapvj
* Released under MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion less/jq-ui-bootstrap/dialog.less
Expand Up @@ -4,7 +4,7 @@
* jQuery UI Dialog 1.10.3
* http://docs.jquery.com/UI/Dialog#theming
*
* Portions copyright Addy Osmani, jQuery UI & Twitter Bootstrap
* Portions copyright Addy Osmani, jQuery UI & Twitter, Inc.
* Created the LESS version by @dharapvj
* Released under MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion less/jq-ui-bootstrap/jq-ui-bootstrap-mixin-adapter.less
@@ -1,6 +1,6 @@
/*
* jQuery UI Bootstrap v1.0 Alpha (Mixins)
* Portions copyright Addy Osmani, jQuery UI & Twitter Bootstrap
* Portions copyright Addy Osmani, jQuery UI & Twitter, Inc.
* Created the LESS version by @dharapvj
* Released under MIT.
*/
Expand Down
2 changes: 1 addition & 1 deletion less/jq-ui-bootstrap/jq-ui-bootstrap.less
@@ -1,6 +1,6 @@
/*!
* jQuery UI Bootstrap v1.0 Alpha
* Portions copyright Addy Osmani, jQuery UI & Twitter Bootstrap
* Portions copyright Addy Osmani, jQuery UI & Twitter, Inc.
* Created the LESS version by @dharapvj
* Released under MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion less/jq-ui-bootstrap/menu.less
Expand Up @@ -4,7 +4,7 @@
* jQuery UI Menu 1.10.3
* http://docs.jquery.com/UI/Menu#theming
*
* Portions copyright Addy Osmani, jQuery UI & Twitter Bootstrap
* Portions copyright Addy Osmani, jQuery UI & Twitter, Inc.
* Created the LESS version by @dharapvj
* Released under MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion less/jq-ui-bootstrap/progressbar.less
Expand Up @@ -4,7 +4,7 @@
* jQuery UI Progressbar 1.10.3
* http://jqueryui.com/tooltip/
*
* Portions copyright Addy Osmani, jQuery UI & Twitter Bootstrap
* Portions copyright Addy Osmani, jQuery UI & Twitter, Inc.
* Created the LESS version by @dharapvj
* Released under MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion less/jq-ui-bootstrap/resizable.less
Expand Up @@ -4,7 +4,7 @@
* jQuery UI Resizable 1.10.3
* http://api.jqueryui.com/resizable/
*
* Portions copyright Addy Osmani, jQuery UI & Twitter Bootstrap
* Portions copyright Addy Osmani, jQuery UI & Twitter, Inc.
* Created the LESS version by @dharapvj
* Released under MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion less/jq-ui-bootstrap/selectable.less
Expand Up @@ -4,7 +4,7 @@
* jQuery UI Selectable 1.10.3
* http://jqueryui.com/selectable/
*
* Portions copyright Addy Osmani, jQuery UI & Twitter Bootstrap
* Portions copyright Addy Osmani, jQuery UI & Twitter, Inc.
* Created the LESS version by @dharapvj
* Released under MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion less/jq-ui-bootstrap/slider.less
Expand Up @@ -2,7 +2,7 @@
* jQuery UI Slider 1.10.3
* http://docs.jquery.com/UI/Slider#theming
*
* Portions copyright Addy Osmani, jQuery UI & Twitter Bootstrap
* Portions copyright Addy Osmani, jQuery UI & Twitter, Inc.
* Created the LESS version by @dharapvj
* Released under MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion less/jq-ui-bootstrap/spinner.less
Expand Up @@ -4,7 +4,7 @@
* jQuery UI spinner 1.10.3
* http://docs.jquery.com/UI/Menu#theming
*
* Portions copyright Addy Osmani, jQuery UI & Twitter Bootstrap
* Portions copyright Addy Osmani, jQuery UI & Twitter, Inc.
* Created the LESS version by @dharapvj
* Released under MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion less/jq-ui-bootstrap/tabs.less
Expand Up @@ -4,7 +4,7 @@
* jQuery UI Tabs 1.10.3
* http://docs.jquery.com/UI/Tabs#theming
*
* Portions copyright Addy Osmani, jQuery UI & Twitter Bootstrap
* Portions copyright Addy Osmani, jQuery UI & Twitter, Inc.
* Created the LESS version by @dharapvj
* Released under MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion less/jq-ui-bootstrap/tooltip.less
Expand Up @@ -4,7 +4,7 @@
* jQuery UI Tooltip 1.10.3
* http://jqueryui.com/tooltip/
*
* Portions copyright Addy Osmani, jQuery UI & Twitter Bootstrap
* Portions copyright Addy Osmani, jQuery UI & Twitter, Inc.
* Created the LESS version by @dharapvj
* Released under MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion map.html
Expand Up @@ -307,7 +307,7 @@ <h3><span class="icon-group"></span> Team</h3>
<h3><span class="icon-lightbulb"></span> Credits</h3>
<ul class="list-unstyled">
<li>jQuery UI Bootstrap &copy; <strong class="text-info">Addy Osmani</strong> 2012 - 2013.</li>
<li>Twitter Bootstrap &copy; <strong class="text-info">Twitter</strong> 2012 - 2013</li>
<li>Bootstrap &copy; <strong class="text-info">Twitter, Inc.</strong> 2012 - 2013</li>
</ul>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion theme/base/components.html
Expand Up @@ -1183,7 +1183,7 @@ <h3><span class="icon-group"></span> Team</h3>
<h3><span class="icon-lightbulb"></span> Credits</h3>
<ul class="list-unstyled">
<li>jQuery UI Bootstrap &copy; <strong class="text-info">Addy Osmani</strong> 2012 - 2013.</li>
<li>Twitter Bootstrap &copy; <strong class="text-info">Twitter</strong> 2012 - 2013</li>
<li>Bootstrap &copy; <strong class="text-info">Twitter, Inc.</strong> 2012 - 2013</li>
</ul>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions theme/base/extra.html
Expand Up @@ -133,7 +133,7 @@ <h1>jQuery UI Bootstrap</h1>
<h1>Wijmo</h1>
</div>
<p>
This is an example of how to retheme one of the Wijmo jQuery UI components to match the Twitter Bootstrap theme. Whilst a menu component will be arriving to jQueryUI soon, you can find the menu in <a href="http://wijmo.com/widgets/wijmo-open/">Wijmo Open</a>.
This is an example of how to retheme one of the Wijmo jQuery UI components to match the Bootstrap theme. Whilst a menu component will be arriving to jQueryUI soon, you can find the menu in <a href="http://wijmo.com/widgets/wijmo-open/">Wijmo Open</a>.
</p>
<div id="wijmo-container" class="container">
<ul id="menu1">
Expand Down Expand Up @@ -410,7 +410,7 @@ <h3><span class="icon-group"></span> Team</h3>
<h3><span class="icon-lightbulb"></span> Credits</h3>
<ul class="list-unstyled">
<li>jQuery UI Bootstrap &copy; <strong class="text-info">Addy Osmani</strong> 2012 - 2013.</li>
<li>Twitter Bootstrap &copy; <strong class="text-info">Twitter</strong> 2012 - 2013</li>
<li>Bootstrap &copy; <strong class="text-info">Twitter, Inc.</strong> 2012 - 2013</li>
</ul>
</div>
</div>
Expand Down

0 comments on commit 9a65800

Please sign in to comment.