0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-30 12:24:19 +01:00
Commit Graph

13075 Commits

Author SHA1 Message Date
Chris Rebert
2872ae5de1 Merge pull request #17737 from nextgenthemes/v4-dev
Rename .scsslint.yml to .scss-lint.yml
2015-09-29 16:15:49 -07:00
nextgenthemes
f7f29645a6 Rename .scsslint.yml to .scss-lint.yml 2015-09-30 00:50:45 +02:00
nextgenthemes
f80fdf2da5 add dash to .scsslint.yml 2015-09-30 00:48:56 +02:00
Chris Rebert
9f95b592ce Merge pull request #17727 from tomkel/docs-fade-fix-v4
v4-dev - Clarify the purpose of CSS class .in to .fade
[skip sauce]
2015-09-28 14:37:06 -07:00
Tommy Kelly
808fb03cf7 Clarify the purpose of CSS class .in to .fade 2015-09-28 16:59:21 -04:00
Chris Rebert
215d4c19f7 Merge pull request #17725 from twbs/curly-quotes
Use backticks/<code> for JS snippets in docs headings
2015-09-28 12:30:03 -07:00
Chris Rebert
a9f24fc59f Use backticks/<code> for JS snippets in docs headings; closes #17192
[skip sauce]
2015-09-28 12:24:41 -07:00
Mark Otto
fabba295c3 Merge pull request #17626 from wolfika/v4-dev
Add <h3> header example to Cards docs
2015-09-27 23:01:28 -07:00
Mark Otto
0240136e01 Merge pull request #17403 from twbs/use-px-for-window-sizes
Change grid and container sizes to px
2015-09-27 22:58:45 -07:00
Chris Rebert
a9a2912877 Merge pull request #17716 from michael-k/placeholder
Filled leftover placeholder in docs
2015-09-27 12:53:15 -07:00
Michael Käufl
b7bdde3d4c Filled leftover placeholder 2015-09-27 17:32:06 +02:00
Gleb Mazovetskiy
eabed0edf8 Change grid and container sizes to px
Changes grid and container sizes to `px`, as the
viewport pixel size does not depend on the font size.

The actual em values were inconsistent with the docs,
while the docs were not the same as the comments:

* `sm` breakpoint was 34em (544px) not 480px.
* `lg` container max-width was 60rem (960px), less gutter than `md`.
  Changed to 940px, same as Bootstrap 3.
* `xl` container max-width was 72.25rem which is 1140px not 1156px.
  Changed to 1140px matching the comment but not the docs.

Addresses #17070 and #17388.
2015-09-27 14:39:17 +01:00
Chris Rebert
3497d9937a Merge pull request #17713 from twbs/chrome-meta-v4
Port #17712 over to Bootstrap v4
2015-09-27 01:33:02 -07:00
Chris Rebert
ff2f9cd36c Port #17712 over to Bootstrap v4
[skip sauce]
2015-09-27 01:28:40 -07:00
Chris Rebert
ef5cc0bfa9 Merge pull request #17689 from twbs/fix-17169-more
Docs: Clarify [hidden] & .hidden
2015-09-27 00:34:12 -07:00
Chris Rebert
eab8907006 Merge pull request #17707 from alberto/docs-contributing-normalize-issues
Docs: Fix typo in contributing regarding normalize.css
[ci skip]
2015-09-26 11:06:40 -07:00
alberto
bb859c2173 Docs: Fix typo in contributing regarding normalize.css 2015-09-26 01:44:31 +02:00
Chris Rebert
172bba0222 Merge pull request #17704 from twbs/htmllint-travis-only
Only run htmllint on Travis
2015-09-25 15:57:44 -07:00
Chris Rebert
c8cc0a7f9a Update shrinkwrap 2015-09-25 15:34:55 -07:00
Chris Rebert
74cc05c032 Only run htmllint on Travis
So as to avoid any dependence on Java for normal users of the Gruntfile.

[skip sauce]
2015-09-25 15:34:31 -07:00
Chris Rebert
2a1597af5d Migration docs: capitalization; hyperlink Less and SCSS
[ci skip]
2015-09-25 14:56:40 -07:00
Johann-S
5a15971920 Use correct default value of constraints in Tooltip docs; fixes #17671
Closes #17699
2015-09-25 14:25:08 -07:00
XhmikosR
4cee3fd5d9 Update scsslint gem to v0.42.1.
[skip sauce]
[skip validator]
2015-09-25 21:54:10 +03:00
Chris Rebert
c240dd3549 Merge pull request #17688 from twbs/fix-17552
Travis: install npm dependencies using shrinkwrap
2015-09-24 20:20:18 -07:00
XhmikosR
22c8c1e887 Specify root: true for ESLint.
That way, ESLint won't look in parent dirs for configuration files.
2015-09-24 20:24:38 +03:00
Chris Rebert
7d712bb4a5 Travis: install npm dependencies using shrinkwrap; fixes #17552 2015-09-23 23:26:23 -07:00
Chris Rebert
f22f7beead Move {test-infra=>grunt}/npm-shrinkwrap.json 2015-09-23 23:26:23 -07:00
XhmikosR
ca5c2457ee Merge pull request #17646 from twbs/v4-dev-xmr-deps
Update devDependencies.
2015-09-24 09:21:53 +03:00
XhmikosR
6f8a94b7f5 Merge pull request #17687 from twbs/v4-dev-xmr-gems
Update Rubygems.
2015-09-24 09:20:01 +03:00
Chris Rebert
c91e4f5162 Clarify [hidden] attr docs; closes #17169
[ci skip]
2015-09-23 18:58:40 -07:00
Chris Rebert
6f025183d5 Move v3 .hidden note into Migration docs 2015-09-23 18:32:10 -07:00
XhmikosR
c9a72a7d71 Update Rubygems.
[skip sauce]
2015-09-24 00:39:48 +03:00
XhmikosR
b93c16341d Run grunt. 2015-09-23 09:39:13 +03:00
XhmikosR
6f9b0ba6ce Update devDependencies. 2015-09-23 09:39:11 +03:00
Mark Otto
eefd1a959e Merge pull request #17682 from Xerkus/feature/card-bg-variable
[V4]Add variable for card background color
2015-09-22 20:09:47 -07:00
Aleksey Khudyakov
7ad9d233f2 Add variable for card background color 2015-09-23 09:40:34 +10:00
Daniel Opitz
835e2a7fbe Update StackOverflow tag to bootstrap-4; closes #17675 2015-09-22 15:38:24 -07:00
Mark Otto
918d0c7122 Merge pull request #17589 from vsn4ik/use_scss_if_not
v4 - Use "@if not $bool" expression
2015-09-22 15:26:28 -07:00
Chris Rebert
c21679ceeb Merge pull request #17670 from petetnt/petetnt/docs-fix-2
Rename placeholders in forms.md according to the classes specified
2015-09-22 02:30:30 -07:00
petetnt
c0b5aba3fc Rename placeholders according to the classes specified 2015-09-22 11:31:04 +03:00
Chris Rebert
81435adff8 Merge pull request #17655 from zalog/patch-10
_alert.scss: add missing space between arguments
2015-09-20 16:38:26 -07:00
Catalin Zalog
c72a76e1fd Just some spaces... 2015-09-21 01:07:48 +03:00
XhmikosR
a503474645 Remove unneeded trailing whitespace.
[ci skip]
2015-09-20 19:04:54 +03:00
Mark Otto
64cdb791df Merge pull request #17522 from twbs/v4-dev-xmr-ie9-gradient
docs: IE9 gradient.
2015-09-19 12:07:01 -07:00
XhmikosR
7399607a03 Specify a filter gradient for IE 9. 2015-09-19 09:41:25 +03:00
XhmikosR
2c7e65a680 Use the individual background properties instead of the shorthand.
[ci skip]
2015-09-19 09:41:25 +03:00
wolfika
e305455ef0 Add <h3> header example to Cards docs
resolves #17609
2015-09-16 21:28:04 +02:00
Chris Rebert
62199b96dc Merge pull request #17613 from Johann-S/fixTooltipDestroy
Fix #17544: Update doc for tooltips and popover about dispose method
2015-09-16 11:41:28 -07:00
Johann-S
c9597b1c54 Fix doc for tooltips and popover method dispose 2015-09-16 09:40:26 +02:00
Mark Otto
c34fdd415e grunt 2015-09-15 21:11:19 -07:00