Skip to content
This repository has been archived by the owner on Sep 26, 2023. It is now read-only.

Commit

Permalink
updated all source to v3.1.1. updated less and mvc nuspec files and r…
Browse files Browse the repository at this point in the history
…emoved less.js dependency from less package per community request. Fixes #28
  • Loading branch information
sirkirby committed Feb 13, 2014
1 parent d94495e commit d3b68e3
Show file tree
Hide file tree
Showing 23 changed files with 235 additions and 211 deletions.
8 changes: 4 additions & 4 deletions src/twitter.bootstrap.less/Twitter.Bootstrap.Less.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>Twitter.Bootstrap.Less</id>
<version>3.1.0</version>
<version>3.1.1</version>
<title>Bootstrap Less Source</title>
<authors>Jacob Thornton,Mark Otto</authors>
<owners>sirkirby</owners>
Expand All @@ -15,14 +15,14 @@

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.</summary>
<releaseNotes>Latest source release. Updated Less.js dependency to v1.5.1. Updated jquery dependency to 1.10.2.
<releaseNotes>- Latest source release.
- Removed less.js dependency

http://blog.getbootstrap.com/2014/01/30/bootstrap-3-1-0-released/</releaseNotes>
http://blog.getbootstrap.com/2014/02/13/bootstrap-3-1-1-released/</releaseNotes>
<language>en-US</language>
<tags>twitter less css css3 html5 bootstrap responsive</tags>
<dependencies>
<dependency id="jQuery" version="1.10.2" />
<dependency id="Less.js" version="1.5.1" />
</dependencies>
</metadata>
<files>
Expand Down
28 changes: 14 additions & 14 deletions src/twitter.bootstrap.less/bootstrap.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/*!
* Bootstrap v3.1.0 (http://getbootstrap.com)
* Bootstrap v3.1.1 (http://getbootstrap.com)
* Copyright 2011-2014 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/

if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery') }
if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript requires jQuery') }

/* ========================================================================
* Bootstrap: transition.js v3.1.0
* Bootstrap: transition.js v3.1.1
* http://getbootstrap.com/javascript/#transitions
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
Expand Down Expand Up @@ -56,7 +56,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
}(jQuery);

/* ========================================================================
* Bootstrap: alert.js v3.1.0
* Bootstrap: alert.js v3.1.1
* http://getbootstrap.com/javascript/#alerts
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
Expand Down Expand Up @@ -145,7 +145,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
}(jQuery);

/* ========================================================================
* Bootstrap: button.js v3.1.0
* Bootstrap: button.js v3.1.1
* http://getbootstrap.com/javascript/#buttons
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
Expand Down Expand Up @@ -253,7 +253,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
}(jQuery);

/* ========================================================================
* Bootstrap: carousel.js v3.1.0
* Bootstrap: carousel.js v3.1.1
* http://getbootstrap.com/javascript/#carousel
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
Expand Down Expand Up @@ -459,7 +459,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
}(jQuery);

/* ========================================================================
* Bootstrap: collapse.js v3.1.0
* Bootstrap: collapse.js v3.1.1
* http://getbootstrap.com/javascript/#collapse
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
Expand Down Expand Up @@ -630,7 +630,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
}(jQuery);

/* ========================================================================
* Bootstrap: dropdown.js v3.1.0
* Bootstrap: dropdown.js v3.1.1
* http://getbootstrap.com/javascript/#dropdowns
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
Expand Down Expand Up @@ -778,7 +778,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
}(jQuery);

/* ========================================================================
* Bootstrap: modal.js v3.1.0
* Bootstrap: modal.js v3.1.1
* http://getbootstrap.com/javascript/#modals
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
Expand Down Expand Up @@ -1022,7 +1022,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
}(jQuery);

/* ========================================================================
* Bootstrap: tooltip.js v3.1.0
* Bootstrap: tooltip.js v3.1.1
* http://getbootstrap.com/javascript/#tooltip
* Inspired by the original jQuery.tipsy by Jason Frame
* ========================================================================
Expand Down Expand Up @@ -1422,7 +1422,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
}(jQuery);

/* ========================================================================
* Bootstrap: popover.js v3.1.0
* Bootstrap: popover.js v3.1.1
* http://getbootstrap.com/javascript/#popovers
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
Expand Down Expand Up @@ -1533,7 +1533,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
}(jQuery);

/* ========================================================================
* Bootstrap: scrollspy.js v3.1.0
* Bootstrap: scrollspy.js v3.1.1
* http://getbootstrap.com/javascript/#scrollspy
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
Expand Down Expand Up @@ -1687,7 +1687,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
}(jQuery);

/* ========================================================================
* Bootstrap: tab.js v3.1.0
* Bootstrap: tab.js v3.1.1
* http://getbootstrap.com/javascript/#tabs
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
Expand Down Expand Up @@ -1813,7 +1813,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
}(jQuery);

/* ========================================================================
* Bootstrap: affix.js v3.1.0
* Bootstrap: affix.js v3.1.1
* http://getbootstrap.com/javascript/#affix
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
Expand Down
4 changes: 2 additions & 2 deletions src/twitter.bootstrap.less/bootstrap.min.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/twitter.bootstrap.less/button-groups.less
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,9 @@
//
// Remix the default button sizing classes into new ones for easier manipulation.

.btn-group-xs > .btn { .btn-xs(); }
.btn-group-sm > .btn { .btn-sm(); }
.btn-group-lg > .btn { .btn-lg(); }
.btn-group-xs > .btn { &:extend(.btn-xs); }
.btn-group-sm > .btn { &:extend(.btn-sm); }
.btn-group-lg > .btn { &:extend(.btn-lg); }


// Split button dropdowns
Expand Down
8 changes: 6 additions & 2 deletions src/twitter.bootstrap.less/buttons.less
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,12 @@
.button-size(@padding-base-vertical; @padding-base-horizontal; @font-size-base; @line-height-base; @border-radius-base);
.user-select(none);

&:focus {
.tab-focus();
&,
&:active,
&.active {
&:focus {
.tab-focus();
}
}

&:hover,
Expand Down
6 changes: 3 additions & 3 deletions src/twitter.bootstrap.less/carousel.less
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
// Account for jankitude on images
> img,
> a > img {
.img-responsive();
&:extend(.img-responsive);
line-height: 1;
}
}
Expand Down Expand Up @@ -206,8 +206,8 @@

// Scale up the controls a smidge
.carousel-control {
.glyphicons-chevron-left,
.glyphicons-chevron-right,
.glyphicon-chevron-left,
.glyphicon-chevron-right,
.icon-prev,
.icon-next {
width: 30px;
Expand Down
25 changes: 22 additions & 3 deletions src/twitter.bootstrap.less/forms.less
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,10 @@ output {
.placeholder();

// Disabled and read-only inputs
// Note: HTML5 says that controls under a fieldset > legend:first-child won't
// be disabled if the fieldset is disabled. Due to implementation difficulty,
// we don't honor that edge case; we style them as disabled anyway.
//
// HTML5 says that controls under a fieldset > legend:first-child won't be
// disabled if the fieldset is disabled. Due to implementation difficulty, we
// don't honor that edge case; we style them as disabled anyway.
&[disabled],
&[readonly],
fieldset[disabled] & {
Expand All @@ -150,10 +151,24 @@ output {
}
}


// Search inputs in iOS
//
// This overrides the extra rounded corners on search inputs in iOS so that our
// `.form-control` class can properly style them. Note that this cannot simply
// be added to `.form-control` as it's not specific enough. For details, see
// https://github.com/twbs/bootstrap/issues/11586.

input[type="search"] {
-webkit-appearance: none;
}


// Special styles for iOS date input
//
// In Mobile Safari, date inputs require a pixel line-height that matches the
// given height of the input.

input[type="date"] {
line-height: @input-height-base;
}
Expand Down Expand Up @@ -334,6 +349,10 @@ input[type="checkbox"],
width: auto; // Prevent labels from stacking above inputs in `.form-group`
vertical-align: middle;
}
// Input groups need that 100% width though
.input-group > .form-control {
width: 100%;
}

.control-label {
margin-bottom: 0;
Expand Down
Binary file modified src/twitter.bootstrap.less/glyphicons-halflings-regular.eot
Binary file not shown.
Loading

0 comments on commit d3b68e3

Please sign in to comment.