]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
12 years agoRemove type attribute of tag "script". 9080/head 9081/head
vsn4ik [Mon, 5 Aug 2013 01:40:25 +0000 (05:40 +0400)] 
Remove type attribute of tag "script".
In HTML5 in tag script, the type attribute is no longer required. The default value is "text/javascript".
http://www.w3.org/TR/html5/scripting-1.html#attr-script-type

12 years agofixes #8880
fat [Mon, 5 Aug 2013 00:22:49 +0000 (17:22 -0700)] 
fixes #8880

12 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
fat [Sun, 4 Aug 2013 22:45:51 +0000 (15:45 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

12 years agoremove js anchor interference
fat [Sun, 4 Aug 2013 22:45:27 +0000 (15:45 -0700)] 
remove js  anchor interference

12 years agotrivial docs grammar improvements
Chris Rebert [Sun, 4 Aug 2013 07:06:56 +0000 (00:06 -0700)] 
trivial docs grammar improvements

12 years agoMerge pull request #9059 from twbs/nested-btn-groups-docs
Chris Rebert [Sun, 4 Aug 2013 06:45:08 +0000 (23:45 -0700)] 
Merge pull request #9059 from twbs/nested-btn-groups-docs

adjust description & give source for nested `.btn-group`s example

12 years agoadjust description & give source for nested `.btn-group`s example 9059/head
Chris Rebert [Sun, 4 Aug 2013 06:34:26 +0000 (23:34 -0700)] 
adjust description & give source for nested `.btn-group`s example

12 years agocomponents.html: rm disconnected sentence fragment
Chris Rebert [Sun, 4 Aug 2013 06:23:40 +0000 (23:23 -0700)] 
components.html: rm disconnected sentence fragment

12 years agostreamline $().dropdown('toggle') description
Chris Rebert [Sun, 4 Aug 2013 06:16:09 +0000 (23:16 -0700)] 
streamline $().dropdown('toggle') description

12 years agoJS docs: capitalize Bootstrap
Chris Rebert [Sun, 4 Aug 2013 06:01:05 +0000 (23:01 -0700)] 
JS docs: capitalize Bootstrap

12 years agoMerge pull request #9056 from twbs/large-to-lg-etc
Mark Otto [Sun, 4 Aug 2013 05:44:44 +0000 (22:44 -0700)] 
Merge pull request #9056 from twbs/large-to-lg-etc

Greater standardization of sizing terminology

12 years agoadd missing ref to .btn-xs in button sizes docs 9056/head
Chris Rebert [Sun, 4 Aug 2013 04:59:30 +0000 (21:59 -0700)] 
add missing ref to .btn-xs in button sizes docs

12 years agoadd .btn-xs to .btn-group example
Chris Rebert [Sun, 4 Aug 2013 04:59:01 +0000 (21:59 -0700)] 
add .btn-xs to .btn-group example

12 years agorm stray space in components.html
Chris Rebert [Sun, 4 Aug 2013 04:58:31 +0000 (21:58 -0700)] 
rm stray space in components.html

12 years agoGreater standardization of sizing terminology
Chris Rebert [Sun, 4 Aug 2013 04:39:57 +0000 (21:39 -0700)] 
Greater standardization of sizing terminology

In class names:
* large => lg
* small => sm
* mini => xs ("Extra small")

In screen size categories:
* Tiny => Extra small

12 years agoMerge pull request #9052 from liuyl/inputgroups
Mark Otto [Sun, 4 Aug 2013 03:44:41 +0000 (20:44 -0700)] 
Merge pull request #9052 from liuyl/inputgroups

fix #9051

12 years agoadd line-height 9052/head
liuyl [Sun, 4 Aug 2013 01:27:23 +0000 (09:27 +0800)] 
add line-height

12 years agoMerge pull request #9036 from eratzlaff/3.0.0-wip
Mark Otto [Sat, 3 Aug 2013 23:50:08 +0000 (16:50 -0700)] 
Merge pull request #9036 from eratzlaff/3.0.0-wip

Change value with variables for btn-large, btn-small and pagination

12 years agoMerge pull request #9050 from jonschlinkert/3.0.0-wip
Mark Otto [Sat, 3 Aug 2013 23:25:12 +0000 (16:25 -0700)] 
Merge pull request #9050 from jonschlinkert/3.0.0-wip

organizes the Gruntfile a bit and makes better use of Grunt conventions

12 years agoThis pull request organizes the Gruntfile, makes better use of Grunt conventions... 9050/head
Jon Schlinkert [Sat, 3 Aug 2013 23:03:38 +0000 (19:03 -0400)] 
This pull request organizes the Gruntfile, makes better use of Grunt conventions and placates my OCD.

Changes in the Gruntfile:

* Use two spaces for consistency with the rest of the codebase.
* Tasks are now organize based on task type. since lodash templates are used across tasks/targets, this makes it easier to follow.
* Use `src-dest` files format when only src-dest pairing is necessary. This saves a line over the files-object format, but more importantly it allows use the src or dest in lodash templates (e.g. `<%= concat.bootstrap.src %>`), which isn't possible in the files-object or files-array formats.
* Make the explicit order of the javascript files more obvious in concat task , maybe just a tiny bit more usable and easier to customize - but really just OCD
* Use `<%= pkg.name %>` variable for dest CSS, both for consistency with how javascript targets are defined, and to make it just little easier for devs to customize bootstrap.

ran the build to test, everything seems good.

12 years agoMerge pull request #9045 from naneau/3.0.0-wip
Mark Otto [Sat, 3 Aug 2013 23:01:52 +0000 (16:01 -0700)] 
Merge pull request #9045 from naneau/3.0.0-wip

using @line-height-computed in .navbar-nav link

12 years agousing @line-height-computed in .navbar-nav link 9045/head
Maurice Fonk [Sat, 3 Aug 2013 19:07:43 +0000 (15:07 -0400)] 
using @line-height-computed in .navbar-nav link

When a user changed the @line-height-base/@line-height-computed var, the
nav-bar items would not scale appropriately.

12 years agoJS docs: put `transitionEnd` within <code>
Chris Rebert [Sat, 3 Aug 2013 09:24:31 +0000 (02:24 -0700)] 
JS docs: put `transitionEnd` within <code>

12 years agoJavaScript docs: fix caps of "JS"
Chris Rebert [Sat, 3 Aug 2013 09:22:55 +0000 (02:22 -0700)] 
JavaScript docs: fix caps of "JS"

12 years agoJS docs: fix caps of "CSS" acronym
Chris Rebert [Sat, 3 Aug 2013 09:21:29 +0000 (02:21 -0700)] 
JS docs: fix caps of "CSS" acronym

12 years agoMerge remote-tracking branch 'upstream/3.0.0-wip' into 3.0.0-wip 9036/head
Elvis Ratzlaff [Sat, 3 Aug 2013 08:52:09 +0000 (04:52 -0400)] 
Merge remote-tracking branch 'upstream/3.0.0-wip' into 3.0.0-wip

12 years agoMerge pull request #9037 from ChrisRiddell/horizontal-form-fix
Chris Rebert [Sat, 3 Aug 2013 08:27:20 +0000 (01:27 -0700)] 
Merge pull request #9037 from ChrisRiddell/horizontal-form-fix

Fix Horizontal form docs

12 years agofix Horizontal form docs 9037/head
ChrisRiddell [Sat, 3 Aug 2013 08:18:15 +0000 (17:48 +0930)] 
fix Horizontal form docs

12 years agoChange value for padding on pagination to variables
Elvis Ratzlaff [Sat, 3 Aug 2013 07:59:37 +0000 (03:59 -0400)] 
Change value for padding on pagination to variables

12 years agoChange line-height value with variable for btn-large and btn-small
Elvis Ratzlaff [Sat, 3 Aug 2013 07:56:06 +0000 (03:56 -0400)] 
Change line-height value with variable for btn-large and btn-small

12 years agoMerge branch 'btngroup' of https://github.com/liuyl/bootstrap into liuyl-btngroup
Mark Otto [Sat, 3 Aug 2013 03:19:20 +0000 (20:19 -0700)] 
Merge branch 'btngroup' of https://github.com/liuyl/bootstrap into liuyl-btngroup

Conflicts:
dist/css/bootstrap.min.css

12 years agoMerge pull request #8939 from frabrunelle/3.0.0-wip
Mark Otto [Sat, 3 Aug 2013 02:58:17 +0000 (19:58 -0700)] 
Merge pull request #8939 from frabrunelle/3.0.0-wip

add nav to media object and thumbnails

12 years agoMerge branch 'navtext' of https://github.com/liuyl/bootstrap into liuyl-navtext
Mark Otto [Sat, 3 Aug 2013 02:30:03 +0000 (19:30 -0700)] 
Merge branch 'navtext' of https://github.com/liuyl/bootstrap into liuyl-navtext

Conflicts:
dist/css/bootstrap.min.css

12 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Sat, 3 Aug 2013 02:05:49 +0000 (19:05 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

12 years agoMerge pull request #8934 from twbs/generalize-horiz-form-example
Mark Otto [Sat, 3 Aug 2013 01:59:06 +0000 (18:59 -0700)] 
Merge pull request #8934 from twbs/generalize-horiz-form-example

use separate `form-group`s in horiz form example for greater generality

12 years agomove form layouts from input groups back to forms (messed this up in b281ad64096d9191...
Mark Otto [Sat, 3 Aug 2013 01:48:44 +0000 (18:48 -0700)] 
move form layouts from input groups back to forms (messed this up in b281ad64096d919145159ffbc4e1a5b284708d9b)

12 years agoRemove requirement of `.list-group-flush` when list groups are in panels
Mark Otto [Sat, 3 Aug 2013 00:57:19 +0000 (17:57 -0700)] 
Remove requirement of `.list-group-flush` when list groups are in panels

Fixes #8900

12 years agofix typo in comment
Chris Rebert [Fri, 2 Aug 2013 23:36:54 +0000 (16:36 -0700)] 
fix typo in comment

12 years agofixes #8957
fat [Fri, 2 Aug 2013 22:13:12 +0000 (15:13 -0700)] 
fixes #8957

12 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
fat [Fri, 2 Aug 2013 22:10:47 +0000 (15:10 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

12 years agofixes #8955
fat [Fri, 2 Aug 2013 22:10:14 +0000 (15:10 -0700)] 
fixes #8955

12 years agoTighten up buttons and form controls
Mark Otto [Fri, 2 Aug 2013 22:09:48 +0000 (15:09 -0700)] 
Tighten up buttons and form controls

* Smaller padding on buttons and large buttons
* Same with inputs and large inputs
* Remove about 10px from height of large inputs/buttons and 4px from
regular ones

Fixes #8707 and #8700.

(Also relevant: #8711)

12 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Fri, 2 Aug 2013 21:08:58 +0000 (14:08 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

12 years agofixes #9015: bold links not semibold in alerts
Mark Otto [Fri, 2 Aug 2013 21:07:26 +0000 (14:07 -0700)] 
fixes #9015: bold links not semibold in alerts

12 years agoMerge pull request #9018 from adamwoodbeck/3.0.0-wip
Mark Otto [Fri, 2 Aug 2013 21:04:16 +0000 (14:04 -0700)] 
Merge pull request #9018 from adamwoodbeck/3.0.0-wip

Added ".col-sm-*" to the grid example per the description above the

12 years agoMerge branch '3.0.0-wip-fixed-grid-push-pull-offset' of https://github.com/jtickle...
Mark Otto [Fri, 2 Aug 2013 20:58:06 +0000 (13:58 -0700)] 
Merge branch '3.0.0-wip-fixed-grid-push-pull-offset' of https://github.com/jtickle/fp-bootstrap into jtickle-3.0.0-wip-fixed-grid-push-pull-offset

Conflicts:
dist/css/bootstrap.min.css

12 years agoAdded ".col-sm-*" to the grid example per the description above the 9018/head
Adam Woodbeck [Fri, 2 Aug 2013 20:30:13 +0000 (16:30 -0400)] 
Added ".col-sm-*" to the grid example per the description above the
example.

12 years agoMerge pull request #9017 from jonschlinkert/3.0.0-wip
Mark Otto [Fri, 2 Aug 2013 19:48:39 +0000 (12:48 -0700)] 
Merge pull request #9017 from jonschlinkert/3.0.0-wip

updates mixins to consistently use semicolons as argument separator.

12 years agoResolves https://github.com/twbs/bootstrap/issues/9014. updates mixins to consistentl... 9017/head
Jon Schlinkert [Fri, 2 Aug 2013 19:31:13 +0000 (15:31 -0400)] 
Resolves https://github.com/twbs/bootstrap/issues/9014. updates mixins to consistently use semicolons as argument separator. Rebuild to confirm, no diff in compiled CSS.

12 years agorun grunt dist for #8967
Mark Otto [Fri, 2 Aug 2013 17:11:39 +0000 (10:11 -0700)] 
run grunt dist for #8967

12 years agoMerge pull request #8967 from bassjobsen/patch-2
Mark Otto [Fri, 2 Aug 2013 17:11:06 +0000 (10:11 -0700)] 
Merge pull request #8967 from bassjobsen/patch-2

Update input-groups.less

12 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Fri, 2 Aug 2013 17:02:46 +0000 (10:02 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

12 years agoMerge pull request #8979 from ggam/patch-6
Mark Otto [Fri, 2 Aug 2013 16:44:32 +0000 (09:44 -0700)] 
Merge pull request #8979 from ggam/patch-6

Add dropdown class

12 years agoFixes #8996: shift placement of justified CSS for nav component
Mark Otto [Fri, 2 Aug 2013 16:42:50 +0000 (09:42 -0700)] 
Fixes #8996: shift placement of justified CSS for nav component

12 years agowhitespace in js file?
Mark Otto [Fri, 2 Aug 2013 16:33:12 +0000 (09:33 -0700)] 
whitespace in js file?

12 years agoFix #9008: consolidate `.alert-block` styles into `.alert`
Mark Otto [Fri, 2 Aug 2013 16:32:58 +0000 (09:32 -0700)] 
Fix #9008: consolidate `.alert-block` styles into `.alert`

12 years agoMerge pull request #9011 from Rycul/patch-1
Mark Otto [Fri, 2 Aug 2013 16:27:03 +0000 (09:27 -0700)] 
Merge pull request #9011 from Rycul/patch-1

Added short instruction for obtaining respond.js in example HTML code (see description).

12 years agoMerge pull request #8980 from ggam/patch-7
Mark Otto [Fri, 2 Aug 2013 16:26:19 +0000 (09:26 -0700)] 
Merge pull request #8980 from ggam/patch-7

Removed data-toggle class when it wasn't been applied

12 years agoAdded short instruction for obtaining respond.js 9011/head
Bryan Keiren [Fri, 2 Aug 2013 16:07:31 +0000 (18:07 +0200)] 
Added short instruction for obtaining respond.js

The Getting-Started page only lists the actual instructions for respond.js (its purpose and source) *after* listing a piece of example HTML code for the user to copy and paste. It would probably be more clear if that piece of HTML code actually lists where the user can obtain respond.js. Otherwise the user has to scroll down and read 1 specific line on the rest of the page (under the 'IE 8 and 9' compatibility section), in order to know that respond.js can be obtained from a GitHub page (and that it is in fact NOT part of the downloadable Bootstrap file that's provided earlier on the page, even though the use of response.js in the example HTML code seems to suggest that it *is* part of the Bootstrap download).

It's a minor issue but this fix should make it just a little bit more clear to a user how the example HTML code works (lest they copy/paste it and find out the browser can't find respond.js).

12 years agofix typo in CSS docs; fixes #8992
Chris Rebert [Fri, 2 Aug 2013 00:05:23 +0000 (17:05 -0700)] 
fix typo in CSS docs; fixes #8992

"from" => "form"

12 years agoRemoved data-toggle class when it wasn't been applied 8980/head
Guillermo González de Agüero [Thu, 1 Aug 2013 18:13:08 +0000 (20:13 +0200)] 
Removed data-toggle class when it wasn't been applied

12 years agoFix #8944 8979/head
Guillermo González de Agüero [Thu, 1 Aug 2013 18:07:34 +0000 (20:07 +0200)] 
Fix #8944

12 years agoMerge pull request #8965 from leonardovcid/patch-1
Chris Rebert [Thu, 1 Aug 2013 16:33:09 +0000 (09:33 -0700)] 
Merge pull request #8965 from leonardovcid/patch-1

Correct comment which is showing a wrong mixin call example (mixins.less)

12 years agoAdded classes for lg-pull, lg-push, lg-offset, sm-pull, sm-push, sm-offset 8974/head
Jeff Tickle [Thu, 1 Aug 2013 15:49:16 +0000 (11:49 -0400)] 
Added classes for lg-pull, lg-push, lg-offset, sm-pull, sm-push, sm-offset

12 years agoUpdate input-groups.less 8967/head
Bass Jobsen [Thu, 1 Aug 2013 14:05:07 +0000 (16:05 +0200)] 
Update input-groups.less

align inline radio and checkbox groups with their label for horizontal forms, see http://stackoverflow.com/q/17990310/1596547 (Question 2)

12 years agoCorrect comment which is showing a wrong mixin call example (mixins.less) 8965/head
leonardovcid [Thu, 1 Aug 2013 13:39:28 +0000 (14:39 +0100)] 
Correct comment which is showing a wrong mixin call example (mixins.less)

I was copy-pasting the example and it wasn't working. Then I found that the example in the comment was a typo.
Thanks

12 years agofixes #8892
Jacob Thornton [Thu, 1 Aug 2013 05:57:00 +0000 (22:57 -0700)] 
fixes #8892

12 years agofixes #8864
Jacob Thornton [Thu, 1 Aug 2013 05:28:05 +0000 (22:28 -0700)] 
fixes #8864

12 years agoadd table-layout 8940/head
liuyl [Thu, 1 Aug 2013 03:26:12 +0000 (11:26 +0800)] 
add table-layout

12 years agoadd nav to media object and thumbnails 8939/head
Francis Brunelle [Thu, 1 Aug 2013 02:37:36 +0000 (22:37 -0400)] 
add nav to media object and thumbnails

12 years agofixes #8937: align the dropdown menus in input groups
Mark Otto [Thu, 1 Aug 2013 01:06:20 +0000 (18:06 -0700)] 
fixes #8937: align the dropdown menus in input groups

12 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Thu, 1 Aug 2013 01:02:49 +0000 (18:02 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

12 years agoRun make on prev work
Mark Otto [Thu, 1 Aug 2013 00:07:55 +0000 (17:07 -0700)] 
Run make on prev work

12 years agouse separate `form-group`s in horiz form example for greater generality; fixes #8925 8934/head
Chris Rebert [Wed, 31 Jul 2013 23:46:21 +0000 (16:46 -0700)] 
use separate `form-group`s in horiz form example for greater generality; fixes #8925

12 years agoMerge pull request #8911 from codejet/patch-1
Chris Rebert [Wed, 31 Jul 2013 19:18:09 +0000 (12:18 -0700)] 
Merge pull request #8911 from codejet/patch-1

title attr, not tag, in tooltip/popover docs

12 years agoUpdate javascript.html 8911/head
Oliver Schmidt [Wed, 31 Jul 2013 18:51:37 +0000 (20:51 +0200)] 
Update javascript.html

12 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Wed, 31 Jul 2013 17:27:52 +0000 (10:27 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

12 years agodat purple homepage--http://www.youtube.com/watch?v=k2C5TjS2sh4
Mark Otto [Wed, 31 Jul 2013 17:27:43 +0000 (10:27 -0700)] 
dat purple homepage--http://www.youtube.com/watch?v=k2C5TjS2sh4

12 years agoMerge pull request #8915 from diowa/whitespaces-tabs-etc
Mark Otto [Wed, 31 Jul 2013 17:24:20 +0000 (10:24 -0700)] 
Merge pull request #8915 from diowa/whitespaces-tabs-etc

Removed trailing whitespaces and hard tabs

12 years agoMerge pull request #8908 from bbeng89/3.0.0-wip
Mark Otto [Wed, 31 Jul 2013 16:48:33 +0000 (09:48 -0700)] 
Merge pull request #8908 from bbeng89/3.0.0-wip

Small fix to justified button groups docs

12 years agoMerge pull request #8899 from englishtown/twbs-pullrequest
Mark Otto [Wed, 31 Jul 2013 16:44:27 +0000 (09:44 -0700)] 
Merge pull request #8899 from englishtown/twbs-pullrequest

Miss one 'div' close tag under components page

12 years agoRemoved trailing whitespaces 8915/head
Cesidio Di Landa [Wed, 31 Jul 2013 16:11:11 +0000 (18:11 +0200)] 
Removed trailing whitespaces
Changed hard tabs to soft tabs

12 years agoUpdate javascript.html
Oliver Schmidt [Wed, 31 Jul 2013 14:14:27 +0000 (16:14 +0200)] 
Update javascript.html

12 years agoSmall fix to justified button groups docs 8908/head
Blake Bengtson [Wed, 31 Jul 2013 13:39:07 +0000 (08:39 -0500)] 
Small fix to justified button groups docs

12 years agomiss one 'div' close tag under components page 8899/head
faceach [Wed, 31 Jul 2013 10:57:39 +0000 (18:57 +0800)] 
miss one 'div' close tag under components page

12 years agoMerge pull request #8885 from mikefrancis/patch-1
Chris Rebert [Wed, 31 Jul 2013 08:33:18 +0000 (01:33 -0700)] 
Merge pull request #8885 from mikefrancis/patch-1

Added attribute whitespace

12 years agoAdded attribute whitespace 8885/head
Mike Francis [Wed, 31 Jul 2013 08:26:45 +0000 (09:26 +0100)] 
Added attribute whitespace

12 years agoedit modal docs code to fix #8769
Mark Otto [Tue, 30 Jul 2013 22:14:38 +0000 (15:14 -0700)] 
edit modal docs code to fix #8769

12 years agoMerge pull request #8726 from andreypopp/3.0.0-wip
Mark Otto [Tue, 30 Jul 2013 21:14:51 +0000 (14:14 -0700)] 
Merge pull request #8726 from andreypopp/3.0.0-wip

Fix out of order variable declaration order

12 years agoMerge pull request #8852 from briannelsondesign/label_baselines
Mark Otto [Tue, 30 Jul 2013 21:07:00 +0000 (14:07 -0700)] 
Merge pull request #8852 from briannelsondesign/label_baselines

Adjusts vertical alignment of labels and badges

12 years agofixes #8216
fat [Tue, 30 Jul 2013 20:41:24 +0000 (13:41 -0700)] 
fixes #8216

12 years agofixes #8814
fat [Tue, 30 Jul 2013 20:33:56 +0000 (13:33 -0700)] 
fixes #8814

12 years agofixes #8816
fat [Tue, 30 Jul 2013 20:31:57 +0000 (13:31 -0700)] 
fixes #8816

12 years agotrivial spacing fix
Chris Rebert [Tue, 30 Jul 2013 19:35:39 +0000 (12:35 -0700)] 
trivial spacing fix

12 years agoMerge pull request #8846 from ggam/patch-5
Mark Otto [Tue, 30 Jul 2013 16:40:01 +0000 (09:40 -0700)] 
Merge pull request #8846 from ggam/patch-5

Fix grid sizes documentation

12 years agoCompiles changes to CSS 8852/head
Brian Nelson [Tue, 30 Jul 2013 15:35:13 +0000 (11:35 -0400)] 
Compiles changes to CSS

12 years agoImproves label and badge alignment so text aligns with baseline
Brian Nelson [Tue, 30 Jul 2013 15:23:25 +0000 (11:23 -0400)] 
Improves label and badge alignment so text aligns with baseline

12 years agoFix #8658 8846/head
Guillermo González de Agüero [Tue, 30 Jul 2013 14:34:13 +0000 (16:34 +0200)] 
Fix #8658

12 years agoMerge pull request #8821 from twbs/twbs-license-faq-tweak
Chris Rebert [Tue, 30 Jul 2013 05:11:37 +0000 (22:11 -0700)] 
Merge pull request #8821 from twbs/twbs-license-faq-tweak

tweak part of license FAQ to reflect Twitter->twbs change

12 years agotweak part of license FAQ to reflect Twitter->twbs change 8821/head
Chris Rebert [Tue, 30 Jul 2013 01:48:50 +0000 (18:48 -0700)] 
tweak part of license FAQ to reflect Twitter->twbs change