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

Boostrap 1.9.0 #109

Merged
merged 11 commits into from Oct 20, 2012
Merged

Boostrap 1.9.0 #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ae437b6
* New branch for jquery UI 1.9.0
gtraxx Oct 11, 2012
b6eb6cd
Update README.md
gtraxx Oct 16, 2012
ef9a1f0
Update README.md
gtraxx Oct 16, 2012
e088d74
* Add demo jQuery ui menu in index.html
gtraxx Oct 16, 2012
6156e6c
* Add jquery ui menu in demo.js
gtraxx Oct 16, 2012
643af85
* Fix layout helper
gtraxx Oct 16, 2012
ec95440
* Removing unnecessary comments
gtraxx Oct 16, 2012
2f5c592
* Add ui spinner in css and javascript demo
gtraxx Oct 16, 2012
47c9580
* Add comment ui spinner
gtraxx Oct 16, 2012
44c075e
* Add jQuery tooltip css + demo
gtraxx Oct 17, 2012
2419485
Merge pull request #108 from gtraxx/Boostrap-1.9.0
gtraxx Oct 18, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
@@ -0,0 +1,4 @@
.svn-base
.svn
.idea
.DS_Store
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@ There *are* some minor known issues lingering that I'm working on, but the hope

##jQuery UI support

This theme targets jQuery UI 1.8.16 and the default version of jQuery included in the (current) jQuery UI builds (jQuery 1.6.2). I'm aware of jQuery 1.7.1 and intend on upgrading anything necessary in the theme to use it when the jQuery UI team officially include it in their theme packs.
This theme targets jQuery UI 1.9.0 and the default version of jQuery included in the (current) jQuery UI builds (jQuery 1.6.2). I'm aware of jQuery 1.8.2 and intend on upgrading anything necessary in the theme to use it when the jQuery UI team officially include it in their theme packs.

##Project status

Expand Down
1,375 changes: 1,375 additions & 0 deletions css/custom-theme/jquery-ui-1.9.0.custom.css
View file
Open in desktop

Large diffs are not rendered by default.

85 changes: 78 additions & 7 deletions index.html 100644 → 100755
View file
Open in desktop
Expand Up @@ -14,7 +14,9 @@


<!-- Styles -->
<link type="text/css" href="css/custom-theme/jquery-ui-1.8.16.custom.css" rel="stylesheet" />
<!--<link type="text/css" href="css/custom-theme/jquery-ui-1.8.16.custom.css" rel="stylesheet" />-->
<link type="text/css" href="css/custom-theme/jquery-ui-1.9.0.custom.css" rel="stylesheet" />

<link href="bootstrap/bootstrap.css" rel="stylesheet">
<link href="css/demo.css" rel="stylesheet">
<style type="text/css">
Expand Down Expand Up @@ -109,10 +111,10 @@ <h1>jQuery UI Bootstrap <small>A Bootstrap-themed kickstart for jQuery UI widget
<!--welcome-->
<div class="alert-message block-message warning">
<p>
<p><strong>Welcome!</strong> This is a live preview of the new jQuery UI Bootstrap theme - a project I started to bring the beauty of Twitter's <a href="http://twitter.github.com/bootstrap/">Bootstrap</a> to jQuery UI widgets.
<p><strong>Welcome!</strong> This is a live preview of new the jQuery UI Bootstrap theme - a project I started to bring the beauty of Twitter's <a href="http://twitter.github.com/bootstrap/">Bootstrap</a> to jQuery UI widgets.
</p>
<p>
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-side with it without components breaking visually. </p>
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. </p>
<p>
It's still a work-in-progress, but I hope you find it useful. Issues and pull requests are always welcome - <a href="http://twitter.com/addyosmani">@addyosmani</a>
</p>
Expand Down Expand Up @@ -669,11 +671,79 @@ <h2 class="demoHeaders">Vertical Slider</h2>

<div id="slider-vertical" style="height:200px;"></div>

<!-- Menu -->
<h2 class="demoHeaders">Menu</h2>
<p></p>
<ul id="menu">
<li><a href="#">Aberdeen</a></li>
<li><a href="#">Ada</a></li>
<li><a href="#">Adamsville</a></li>
<li><a href="#">Addyston</a></li>
<li>
<a href="#">Delphi</a>
<ul>
<li><a href="#">Ada</a></li>
<li><a href="#">Saarland</a></li>
<li><a href="#">Salzburg</a></li>
</ul>
</li>
<li><a href="#">Saarland</a></li>
<li>
<a href="#">Salzburg</a>
<ul>
<li>
<a href="#">Delphi</a>
<ul>
<li><a href="#">Ada</a></li>
<li><a href="#">Saarland</a></li>
<li><a href="#">Salzburg</a></li>
</ul>
</li>
<li>
<a href="?Delphi">Delphi</a>
<ul>
<li><a href="#">Ada</a></li>
<li><a href="#">Saarland</a></li>
<li><a href="#">Salzburg</a></li>
</ul>
</li>
<li><a href="#">Perch</a></li>
</ul>
</li>
</ul>
<!-- End demo -->
<p></p>
<!-- Spinner -->
<h2 class="demoHeaders">Spinner</h2>
<p>
<label for="spinner">Select a value:</label>
<input id="spinner" name="value" />
</p>

<p>
<button id="disable">Toggle disable/enable</button>
<button id="destroy">Toggle widget</button>
</p>

<p>
<button id="getvalue">Get value</button>
<button id="setvalue">Set value to 5</button>
</p>
<!-- End demo -->
<p></p>
<!-- Spinner -->
<h2 class="demoHeaders">Tooltip</h2>
<p><a href="#" title="That's what this widget is">Tooltips</a> can be attached to any element. When you hover
the element with your mouse, the title attribute is displayed in a little box next to the element, just like a native tooltip.</p>
<p>But as it's not a native tooltip, it can be styled. Any themes built with
<a href="http://themeroller.com" title="ThemeRoller: jQuery UI's theme builder application">ThemeRoller</a>
will also style tooltips accordingly.</p>
<p>Tooltips are also useful for form elements, to show some additional information in the context of each field.</p>
<p><label for="age">Your age:</label><input id="age" title="We ask for your age only for statistical purposes." /></p>
<p>Hover the field to see the tooltip.</p>
</div>
<!--end col-->


</div>
</div>

Expand All @@ -700,10 +770,11 @@ <h2 class="demoHeaders">Vertical Slider</h2>

<!--scripts-->

<script type="text/javascript" src="js/jquery-1.6.2.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
<!--<script type="text/javascript" src="js/jquery-1.6.2.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>-->


<script type="text/javascript" src="js/jquery-1.8.2.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.9.0.custom.min.js"></script>
<!--daterangepicker-->
<script type="text/javascript" src="third-party/jQuery-UI-Date-Range-Picker/js/date.js"></script>
<script type="text/javascript" src="third-party/jQuery-UI-Date-Range-Picker/js/daterangepicker.jQuery.js"></script>
Expand Down
36 changes: 34 additions & 2 deletions js/demo.js 100644 → 100755
View file
Open in desktop
Expand Up @@ -108,6 +108,38 @@ $(function () {
});
$("#amount").val($("#slider-vertical").slider("value"));

//Menu
$("#menu").menu();

//Spinner
var spinner = $( "#spinner" ).spinner();

$( "#disable" ).click(function() {
if ( spinner.spinner( "option", "disabled" ) ) {
spinner.spinner( "enable" );
} else {
spinner.spinner( "disable" );
}
});
$( "#destroy" ).click(function() {
if ( spinner.data( "ui-spinner" ) ) {
spinner.spinner( "destroy" );
} else {
spinner.spinner();
}
});
$( "#getvalue" ).click(function() {
alert( spinner.spinner( "value" ) );
});
$( "#setvalue" ).click(function() {
spinner.spinner( "value", 5 );
});

$( "button" ).button();

//Tooltip

$( document ).tooltip();

// Split button
$("#rerun").button().click(function () {
Expand Down Expand Up @@ -179,7 +211,7 @@ $(function () {

// close icon: removing the tab on click
// note: closable tabs gonna be an option in the future - see http://dev.jqueryui.com/ticket/3924
$("#tabs span.ui-icon-close").live("click", function () {
$("#tabs span.ui-icon-close").on("click", function () {
var index = $("li", $tabs).index($(this).parent());
$tabs.tabs("remove", index);
});
Expand Down Expand Up @@ -246,7 +278,7 @@ $(function () {

// close icon: removing the tab on click
// note: closable tabs gonna be an option in the future - see http://dev.jqueryui.com/ticket/3924
$("#tabs span.ui-icon-close").live("click", function () {
$("#tabs span.ui-icon-close").on("click", function () {
var index = $("li", $tabs).index($(this).parent());
$tabs.tabs("remove", index);
});
Expand Down