rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-12 00:08:59 +01:00
Code Issues Actions Packages Releases Activity

Merge branch 'master' into poveropt

Browse Source
This commit is contained in:
Rod Vagg 2011-11-06 12:41:55 +11:00
commit 3628eb79ae
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bootstrap.css vendored
View File

@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Fri Nov 4 13:44:15 PDT 2011 * Date: Sat Nov 5 17:07:48 PDT 2011
*/ */
/* Reset.less /* Reset.less
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).

2
docs/index.html
View File

@ -2024,7 +2024,7 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
<!-- Le javascript --> <!-- Le javascript -->
<script src="http://code.jquery.com/jquery-1.5.2.min.js"></script> <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
<script src="http://autobahn.tablesorter.com/jquery.tablesorter.min.js"></script> <script src="http://autobahn.tablesorter.com/jquery.tablesorter.min.js"></script>
<script src="assets/js/google-code-prettify/prettify.js"></script> <script src="assets/js/google-code-prettify/prettify.js"></script>
<script>$(function () { prettyPrint() })</script> <script>$(function () { prettyPrint() })</script>

2
docs/javascript.html
View File

@ -12,7 +12,7 @@
<![endif]--> <![endif]-->
<!-- Le javascript --> <!-- Le javascript -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js"></script> <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
<script src="assets/js/google-code-prettify/prettify.js"></script> <script src="assets/js/google-code-prettify/prettify.js"></script>
<script>$(function () { prettyPrint() })</script> <script>$(function () { prettyPrint() })</script>
<script src="../js/bootstrap-modal.js"></script> <script src="../js/bootstrap-modal.js"></script>

9
js/bootstrap-twipsy.js vendored
View File

@ -168,10 +168,7 @@
} }
, tip: function() { , tip: function() {
if (!this.$tip) { return this.$tip = this.$tip || $('<div class="twipsy" />').html(this.options.template)
this.$tip = $('<div class="twipsy" />').html(this.options.template)
}
return this.$tip
} }
, validate: function() { , validate: function() {
@ -194,6 +191,10 @@
this.enabled = !this.enabled this.enabled = !this.enabled
} }
, toggle: function () {
this[this.tip().hasClass('in') ? 'hide' : 'show']()
}
} }

2
lib/forms.less Normal file → Executable file
View File

@ -184,7 +184,7 @@ select:focus {
border-color: @borderColor; border-color: @borderColor;
&:focus { &:focus {
border-color: darken(@borderColor, 10%); border-color: darken(@borderColor, 10%);
.box-shadow(0 0 6px lighten(@borderColor, 20%); .box-shadow(0 0 6px lighten(@borderColor, 20%));
} }
} }
// Give a small background color for input-prepend/-append // Give a small background color for input-prepend/-append