Mark Otto
352f5923d7
Merge branch 'master' of github.com:twbs/bootstrap
2013-09-03 00:55:29 -07:00
Mark Otto
36afdbcaac
mo betta docs on box-sizing to build on e521ee8309
2013-09-03 00:49:59 -07:00
Mark Otto
49373b9b45
fixes #10372 : two download buttons on homepage; also fixes broke button styles
2013-09-02 20:20:47 -07:00
Mark Otto
a4897aed88
Merge pull request #10382 from StevenBlack/GSEdits5
...
'Disabling responsiveness' section of docs: simplification and focus
2013-09-02 20:13:57 -07:00
Mark Otto
54b75ffae3
Merge branch 'master' of github.com:twbs/bootstrap
2013-09-02 19:53:20 -07:00
Mark Otto
e521ee8309
update box-sizing third party support section to include mention of google CSE and expand to include CSS and Less options
2013-09-02 19:52:59 -07:00
Steven Black
9361ebe4fd
Getting Started page: Simplified and focused the text of the 'Disabling responsiveness' section.
2013-09-02 20:01:36 -04:00
Steven Black
259be69e25
Refactoring the paragraph describing the 'Examples' section.
2013-09-02 15:24:55 -04:00
Julian Thilo
c6d51be2d8
Merge pull request #10374 from tagliala/patch-2
...
Fixed glyphicons count
2013-09-02 10:32:45 -07:00
Chris Rebert
e7f8d0c957
Merge pull request #10366 from coliff/patch-2
...
Update index.html (change from 'hero unit' to 'jumbotron')
2013-09-02 10:31:55 -07:00
Christian
5d88943a52
Update index.html
...
Updated text in the jumbotron container to reflect the Bootstrap 3 change from 'hero unit' to 'jumbotron'.
2013-09-02 21:36:54 +09:00
Chris Rebert
93dc003a83
Merge pull request #10364 from wangsai/patch-1
...
Completion of parentheses
2013-09-02 02:50:45 -07:00
wangsai
d132c48ec9
Completion of parentheses
2013-09-02 17:47:04 +08:00
Mark Otto
a245c0d1cd
derp, add on to #10153 with proper variable /cc @ggam
2013-09-01 20:52:23 -07:00
Mark Otto
079fa16b9f
Merge branch 'master' of github.com:twbs/bootstrap
2013-09-02 00:10:35 +02:00
Mark Otto
14b3a3542f
fixes #10316 : Document .active and :active for buttons
2013-09-02 00:09:49 +02:00
Mark Otto
f69da1c2ef
Merge pull request #10342 from twbs/affix-docs
...
minor improvements to affix docs
2013-09-01 14:59:34 -07:00
Mark Otto
741e0fc52c
fixes #10344 : Update IE8-9 support section with table of specific CSS3 and HTML5 features and their support in Bootstrap
2013-09-01 23:58:22 +02:00
Mark Otto
8df05b95df
Remove links to navbar examples from example navbars in Theme example--nullifies #9894
2013-09-01 23:46:23 +02:00
Mark Otto
de82c80784
update vars to use new component-active-color
2013-09-01 23:40:04 +02:00
Mark Otto
1fd9237840
fixes #9909 : Add component active color variable to complement component active bg variable
2013-09-01 23:38:11 +02:00
Mark Otto
bfda156bb9
alt fix to #10278 : Change Google Maps compatibility warning to a general box-sizing warning
2013-09-01 23:32:35 +02:00
Mark Otto
26727bfefd
Merge branch 'master' of github.com:twbs/bootstrap
2013-09-01 21:55:59 +02:00
Rodrigo Willrich
9d2491a808
Bower: Ignore development and documentation files on bower.json. Fix #10313 .
...
I've kept only the files I consider relevant to bower installation:
- Files in dist directory;
- Files in js directory;
- Files in less directory;
- bower.json file;
- README.md file;
- LICENSE file.
2013-09-01 16:50:24 -03:00
Geremia Taglialatela
f4fde25535
Fixed glyphicons count
...
Glyphicons are 200
refers to #9794
2013-09-01 14:36:32 +02:00
Chris Rebert
9369489883
fix straggler instance of "Tiny grid" terminology
2013-09-01 04:14:55 -07:00
Mark Otto
b45c3ea647
fixes #10164 : Document .center-block mixin and update CSS to include it as a class as well
2013-09-01 11:21:14 +02:00
Chris Rebert
d2e1fef34a
minor improvements to affix docs
2013-09-01 02:09:12 -07:00
Mark Otto
50bf4d47b1
reverse vars for backwards compatibility /cc @cvrebert
2013-09-01 11:06:33 +02:00
Mark Otto
25cc04c5ab
Merge branch 'deprecate_screen_containers'
2013-09-01 11:05:14 +02:00
Mark Otto
d28abc4bf1
fixes #10115 : Default carousel controls and Glyphicon controls should behave the same on small devices and up
2013-09-01 11:03:19 +02:00
Mark Otto
62477653e7
fixes #10111 : different colors for dropdown link hover and active states
2013-09-01 11:00:40 +02:00
Chris Rebert
604c3b2efc
tweak #10336 to double up on the hyphen-minuses to better approximate a long dash
2013-09-01 01:46:18 -07:00
Chris Rebert
24d45f26eb
Merge pull request #10336 from Shipow/master
...
Replace invalid US-ASCII character "\xE2")
2013-09-01 01:43:48 -07:00
Chris Rebert
5418a72243
tweak #10298
2013-09-01 01:35:56 -07:00
Mark Otto
e8f7d4fcef
fixes alignment and nav list in offcanvas example
2013-09-01 10:34:21 +02:00
Chris Rebert
2066ea50a2
Merge pull request #10298 from jhr007/patch-1
...
Note the change to the progress bar.
2013-09-01 01:34:15 -07:00
Mark Otto
129d8fcebc
fixes #10282 : Cross reference tabs and tabs plugin
2013-09-01 10:27:20 +02:00
Mark Otto
e2c6d32997
fixes #10277 : Mention removal of navbar vertical dividers in migration docs
2013-09-01 10:21:27 +02:00
Mark Otto
9616768659
remove unused link from navs section
2013-09-01 10:19:55 +02:00
Mark Otto
772e6e359e
Merge branch 'master' of github.com:twbs/bootstrap
2013-09-01 10:18:54 +02:00
Mark Otto
58401daf1c
finishes #10256 to add updated var to customizer; also fixes another old var
2013-09-01 10:15:39 +02:00
Mark Otto
9a32b21dc7
Merge branch 'master' into tagliala-patch-1
2013-09-01 10:13:47 +02:00
Mark Otto
c9303c17ab
Merge pull request #10249 from coliff/patch-1
...
Update index.html (update text from hero unit to jumbotron)
2013-09-01 01:09:55 -07:00
Chris Rebert
a7863c112d
restore "only" wording in docs regarding Recess/less.js
...
It was there for good reason.
We're not gonna deal with lessphp or dotless bugs.
2013-09-01 01:09:28 -07:00
Mark Otto
dfda3dfe37
fixes #10246 : Use correct variable for link hover color in Customizer
2013-09-01 10:07:15 +02:00
Mark Otto
7f6210cea4
Merge branch 'master' of github.com:twbs/bootstrap
2013-09-01 10:04:54 +02:00
Mark Otto
3a4ea1a7be
better layout
2013-09-01 10:04:44 +02:00
Mark Otto
e10bf3aa7f
finishes #10245 by adding it the new var to the customizer
2013-09-01 10:04:03 +02:00
Mark Otto
daa8330b41
Merge branch 'master' into dancek-breadcrumb-separator
2013-09-01 10:01:57 +02:00
