Mark Otto
5a905ef8a5
basic responsive top nav hacks for docs
2015-08-18 23:44:18 -07:00
Mark Otto
f83ca1c6b0
ads colors
2015-08-18 19:56:28 -07:00
Mark Otto
7de3b3eced
fix footer to use new dropdown markup
2015-08-18 19:51:21 -07:00
Mark Otto
15b7ce59df
grunt
2015-08-18 18:45:12 -07:00
Mark Otto
2685475919
downsize that nav
2015-08-18 01:27:33 -07:00
Mark Otto
ff72ea6b81
navbar positioning
2015-08-18 01:18:21 -07:00
Mark Otto
4c7e4e4454
grunt
2015-08-18 01:06:40 -07:00
Mark Otto
03f21a75e5
grunt
2015-08-18 00:47:15 -07:00
Mark Otto
34f24ddd20
docs grunt
2015-08-17 21:31:23 -07:00
Mark Otto
b430ed19d8
docs grunt
2015-08-17 21:16:12 -07:00
Mark Otto
c9ed01d972
grunt
2015-08-17 21:13:54 -07:00
Mark Otto
86f7ee0184
grunt
2015-08-17 20:41:13 -07:00
Mark Otto
bce36ae026
narrow homepage grid cols
2015-08-17 00:12:20 -07:00
Mark Otto
0048e3a32e
grunt
2015-08-16 18:20:10 -07:00
Mark Otto
c064eef67b
Massive cleanup
...
- Simpler main nav on all pages
- Back to purple masthead on homepage instead of dark graphite
- Active link styles on the main nav
- Cleaned up sidebar nav
- New docs layout name
- Homepage copy edits
- Updated bright purple docs color
2015-08-14 22:45:55 -07:00
Mark Otto
0babe3568c
simpler gruntfile watch
2015-08-12 20:14:14 -07:00
Jacob Thornton
23d05f1585
get the js working for docs
2015-08-12 19:59:55 -07:00
Mark Otto
575a886437
fix general page and page header layout
2015-08-12 17:45:47 -07:00
Mark Otto
2e98fd872c
compile latest
2015-08-10 23:43:32 -07:00
Mark Otto
28bcf047c8
container illustrations
2015-08-10 23:07:50 -07:00
Mark Otto
b814a96aba
ads spacing
2015-08-10 16:50:48 -07:00
Mark Otto
d1f06ffe83
light gray on docs search input
2015-08-10 16:47:43 -07:00
Mark Otto
f5008769a5
really fix that spacing and nesting
2015-08-10 16:46:21 -07:00
Mark Otto
d02017e0e5
more margin there
2015-08-10 16:44:47 -07:00
Mark Otto
80a1b69ce5
compile latest docs css
2015-08-10 16:11:49 -07:00
Mark Otto
491cc512ad
build
2015-08-09 22:50:04 -07:00
Mark Otto
44fe355ec2
un-affix top navbar
2015-08-09 20:31:16 -07:00
Mark Otto
7c3f5b6d59
rewrite some forms docs, use new validation styles and icons
2015-08-08 14:15:09 -07:00
Mark Otto
ee133a9cd4
fix ads styles
2015-08-05 23:26:10 -07:00
Mark Otto
0173b553d5
fix broken table in the forms docs
2015-08-05 23:19:15 -07:00
Mark Otto
fed0d8a2d4
restore page headers, use partial and page frontmatter to organize it
2015-08-05 17:47:45 -07:00
Mark Otto
bc88c90b2c
footer overhaul again
2015-08-05 00:54:30 -07:00
Mark Otto
d80f26fe49
unaffix sidebar and simplify styles of docs side nav to be more like v3
2015-08-05 00:38:36 -07:00
Mark Otto
6836530f72
account for nav on docs pages
2015-08-05 00:10:15 -07:00
Mark Otto
b728fe2bbd
tweak homepage copy and layout
2015-08-05 00:05:05 -07:00
Mark Otto
95b0ec18f4
new global navbar for all docs pages
2015-08-04 23:39:51 -07:00
Mark Otto
60a045634c
grunt
2015-08-04 23:24:22 -07:00
Mark Otto
042b5fc7eb
tweak footer styles
2015-08-04 22:39:54 -07:00
Mark Otto
d318d64c08
grunt
2015-08-04 22:31:18 -07:00
Mark Otto
847470ca09
grunt
2015-06-22 23:25:18 -07:00
Mark Otto
96e7ceed90
grunt
2015-06-22 16:30:56 -07:00
Mark Otto
e4d72c914d
fix vars, grunt that shit
2015-06-19 00:01:57 -07:00
Mark Otto
b39ce7d6c0
grunt
2015-06-18 15:48:54 -07:00
Mark Otto
840938f09d
tweak code styles
2015-06-09 16:28:17 -07:00
Mark Otto
7f37ec1be3
grunt
2015-06-09 15:23:21 -07:00
Mark Otto
c1a84e38c7
grunt
2015-05-31 23:53:14 -07:00
Mark Otto
38c7813c72
grunt
2015-05-29 13:09:57 -07:00
Mark Otto
43b083effb
grunt
2015-05-29 02:09:44 -07:00
Mark Otto
663576a7ae
Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
...
Conflicts:
dist/css/bootstrap.css
dist/css/bootstrap.css.map
docs/assets/css/docs.min.css
2015-05-27 15:49:55 -07:00
Mark Otto
4238e2057f
grunt
2015-05-22 22:34:04 -07:00
fat
3452e8dc83
rewritten tooltip + tether integration and death to our positioner jank
2015-05-11 23:32:37 -07:00
Mark Otto
b8fa32edd2
le grunt
2015-04-29 12:02:02 -07:00
Mark Otto
52133e41c5
grunt
2015-04-29 11:42:53 -07:00
Mark Otto
b9ed61854c
grunt
2015-04-27 00:51:34 -07:00
Mark Otto
3117c98f13
nav
2015-04-25 13:20:59 -07:00
Mark Otto
37e543759b
scope grid example styles better
2015-04-23 01:30:55 -07:00
Mark Otto
46a3506a42
clarify some docs, improve layout
2015-04-22 23:09:05 -07:00
Mark Otto
fd88ae4b4e
recenter homepage
2015-04-20 16:59:21 -07:00
Mark Otto
8f94078da8
New form control sizing, new navbar condensed variation, update nav and navbar spacing
2015-04-18 18:12:10 -07:00
Mark Otto
80239a3da4
grunt
2015-04-17 20:59:26 -07:00
Mark Otto
bf5931b5ee
massive rewrite of forms docs and some css
2015-04-17 16:02:41 -07:00
Mark Otto
8b93787fd2
move all JS buttons docs to regular buttons docs page, rewrite the callouts and some docs verbage
2015-04-17 14:11:08 -07:00
Mark Otto
970e76ea25
try out a light gray sidebar
2015-04-17 01:32:15 -07:00
Mark Otto
b1f48d3098
more reboot updates
2015-04-16 19:33:42 -07:00
Mark Otto
06c2862d25
start stubbing out a new reboot section and file
2015-04-16 18:39:45 -07:00
Mark Otto
5c0b459eb5
break down docs scss into imports, hell yeah
2015-04-16 14:57:49 -07:00
Mark Otto
0da9e749e3
redo the anchor css in scss, comment out unused code, add our own styles /cc @xhmikosr
2015-04-16 14:33:32 -07:00
Mark Otto
c84cf4f7f5
rename classes from .bs-docs and .bs to .bd
2015-04-16 14:07:20 -07:00
Mark Otto
3c93681245
more docs nav changes
2015-04-15 16:07:50 -07:00
Mark Otto
650d168fd8
grunt
2015-04-15 15:30:41 -07:00
Mark Otto
53a3ff74ca
redo sidenav
2015-04-13 19:00:59 -07:00
Mark Otto
f522f1841e
docs derp
2015-04-13 16:36:44 -07:00
Mark Otto
309264509d
Remove grid sizing styles on tables
2015-03-30 18:11:43 -07:00
Mark Otto
6749e5509c
rewrite table modifiers to use .table- prefix
2015-03-30 18:08:01 -07:00
Mark Otto
608be81a43
Fixes #13583 : Move .sr-only and .sr-only-focusable to mixins, then use them to create classes in _utilities.scss
2015-03-30 17:36:00 -07:00
Mark Otto
6a2d456719
grunt dist and docs
2015-03-29 00:14:02 -07:00
Mark Otto
3f3f4c6420
grunt css
2015-03-11 19:19:26 +00:00
Mark Otto
928cfb0697
grunt css
2015-03-11 19:03:18 +00:00
Mark Otto
fd3b376e0d
fix examples alignment
2015-03-09 14:30:41 +00:00
Mark Otto
6944e418eb
docs redesign a bit
2015-03-09 14:07:46 +00:00
Mark Otto
9dc5868ea7
Remove dupe docs CSS, move anchor styles to scss directory, recompile
2015-03-01 14:13:13 -08:00
Mark Otto
517977fca4
fix validation, run grunt dist
2015-03-01 14:11:22 -08:00
Mark Otto
c16fee5efd
Merge branch 'master' into v4
...
Conflicts:
.travis.yml
Gruntfile.js
bower.json
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/js/bootstrap.js
dist/js/bootstrap.min.js
docs/_data/glyphicons.yml
docs/_includes/components/breadcrumbs.html
docs/_includes/components/button-dropdowns.html
docs/_includes/components/button-groups.html
docs/_includes/components/dropdowns.html
docs/_includes/components/glyphicons.html
docs/_includes/components/labels.html
docs/_includes/components/list-group.html
docs/_includes/components/media.html
docs/_includes/components/navs.html
docs/_includes/components/panels.html
docs/_includes/components/progress-bars.html
docs/_includes/components/thumbnails.html
docs/_includes/components/wells.html
docs/_includes/css/buttons.html
docs/_includes/css/forms.html
docs/_includes/css/helpers.html
docs/_includes/css/images.html
docs/_includes/css/less.html
docs/_includes/customizer-variables.html
docs/_includes/getting-started/accessibility.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/getting-started/community.html
docs/_includes/getting-started/examples.html
docs/_includes/getting-started/grunt.html
docs/_includes/getting-started/license.html
docs/_includes/getting-started/template.html
docs/_includes/header.html
docs/_includes/js/affix.html
docs/_includes/js/alerts.html
docs/_includes/js/carousel.html
docs/_includes/js/collapse.html
docs/_includes/js/dropdowns.html
docs/_includes/js/modal.html
docs/_includes/js/overview.html
docs/_includes/js/popovers.html
docs/_includes/js/scrollspy.html
docs/_includes/js/tabs.html
docs/_includes/js/tooltips.html
docs/_includes/js/transitions.html
docs/_includes/nav/javascript.html
docs/_layouts/default.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/customize.min.js
docs/assets/js/docs.min.js
docs/assets/js/raw-files.min.js
docs/assets/js/vendor/FileSaver.js
docs/assets/js/vendor/autoprefixer.js
docs/assets/js/vendor/uglify.min.js
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/dist/js/bootstrap.min.js
docs/examples/blog/index.html
docs/examples/carousel/index.html
docs/examples/cover/index.html
docs/examples/dashboard/index.html
docs/examples/narrow-jumbotron/narrow-jumbotron.css
docs/examples/navbar-fixed-top/index.html
docs/examples/navbar-static-top/index.html
docs/examples/non-responsive/index.html
docs/examples/non-responsive/non-responsive.css
docs/examples/theme/index.html
grunt/configBridge.json
js/affix.js
js/carousel.js
js/collapse.js
js/dropdown.js
js/modal.js
js/popover.js
js/scrollspy.js
js/tab.js
js/tests/unit/affix.js
js/tests/unit/button.js
js/tests/unit/carousel.js
js/tests/unit/modal.js
js/tests/unit/tooltip.js
js/tooltip.js
less/badges.less
less/glyphicons.less
less/type.less
less/variables.less
package.json
scss/_dropdown.scss
scss/_forms.scss
test-infra/npm-shrinkwrap.json
2015-03-01 13:44:10 -08:00
XhmikosR
81115cd089
Run grunt.
2015-02-10 10:50:57 +02:00
Patrick H. Lauke
c0892d1470
Skip link workarounds for Chrome and IE
...
Add tabindex="-1" to main #content to work around bug in Chrome (and old
WebKits) and IE
Update advice in accessibility section
Include patch in docs CSS to suppress outline when #content is focused
(particularly as Chrome sets focus as result of mouse click for
tabindex="-1" elements)
2015-01-31 13:09:57 +00:00
Mark Otto
a3890a72cf
Merge branch 'master' into move-inline-css
...
Conflicts:
docs/assets/css/docs.min.css
2015-01-21 20:16:08 -08:00
Mark Otto
84e41378e6
style changes
2015-01-21 19:20:16 -08:00
XhmikosR
a6f3bdb71f
Move inline CSS to docs.css.
2015-01-21 09:51:12 +02:00
XhmikosR
3f512c927b
Add AnchorJS for docs anchors.
2015-01-21 09:50:51 +02:00
Mark Otto
9e0c4ff786
several docs cleanup things
2015-01-20 22:57:24 -08:00
Mark Otto
97eb12561d
large page titles
2015-01-20 18:50:07 -08:00
Mark Otto
474ea24fc3
fix docs homepage ad
2015-01-20 17:05:39 -08:00
Mark Otto
33e32bffc8
new headers, ad placements, intro paragraphs on several pages, etc
2015-01-19 20:03:08 -08:00
Mark Otto
e2c6dd29d8
tons of docs helpers cleanup
2015-01-19 16:15:51 -08:00
Mark Otto
dfdb99c989
fix broken breadcrumb divider
2015-01-19 16:08:48 -08:00
Mark Otto
3fe96e8f50
fix border color on inverse tables
2015-01-19 15:52:40 -08:00
Mark Otto
72bc9b97f0
fix homepage nav styles
2015-01-19 15:44:45 -08:00
Mark Otto
d4f1331e51
grunt
2015-01-15 15:51:02 -08:00
Chris Rebert
698b3a7ace
grunt
2015-01-07 17:04:59 -08:00
Mark Otto
20cdb62200
Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
2015-01-06 16:06:06 -08:00
Mark Otto
b542137dd5
streamline homepage nav
2015-01-06 16:05:58 -08:00
Chris Rebert
00e6fae8fb
Remove affix from docs & CSS; add migration guidance
2015-01-05 11:36:51 -08:00
Mark Otto
615eb99067
fix broke shit, recompile
2015-01-03 20:16:46 -08:00
Mark Otto
e4fa95eb57
grunt dist
2015-01-01 12:02:02 -08:00
XhmikosR
13d7cc7d4c
Use a glyphicon instead of the unicode character.
2014-12-30 09:56:24 +02:00
Mark Otto
489f2bc1fa
no results in search form accounted for
2014-12-25 22:40:25 -08:00
Mark Otto
18e08e777b
add custom forms, stub out examples for radios and checkboxes
2014-12-24 04:13:23 -08:00
Mark Otto
e1bb907050
rearrange contents docs--type, tables, images, forms, etc--into own docs section
2014-12-24 03:26:51 -08:00
Mark Otto
73e59c26e6
basic docs search
2014-12-24 02:44:38 -08:00
Mark Otto
952be04cb0
grunt
2014-12-23 22:57:03 -08:00
Mark Otto
6011b4678b
rearrange some docs css
2014-12-23 22:56:45 -08:00
Mark Otto
1f5a75e2d7
increase spacing in docs h2s
2014-12-23 13:56:11 -08:00
Mark Otto
f9aec74124
add [hidden] utility for hiding any html element (see #15274 for more context)
2014-12-23 04:10:59 -08:00
Mark Otto
28d847a1e0
grunt
2014-12-20 23:05:23 -08:00
Mark Otto
28932261ac
docs grunt
2014-12-19 00:36:22 -08:00
Mark Otto
41226bd91e
replace html tables with markdown in migration
2014-12-18 20:19:45 -08:00
Chris Rebert
90f4767d06
grunt dist
2014-12-17 15:26:12 -08:00
Chris Rebert
f24a1cb28d
remove remaining remnants of the Customizer
2014-12-17 13:44:52 -08:00
Chris Rebert
a8299b5b45
Remove ancillary references to IE<9 in comments+docs
2014-12-16 19:06:57 -08:00
Patrick H. Lauke
d5647e1f62
Make skip link look less "bare bones"
...
Additional markup for the skip link (to ensure it has the same effective
width as the main content, and to provide an outline around just the
link text) plus some basic styles...make it look a bit more in keeping
with the overall look and feel of the docs.
2014-12-14 21:27:58 +00:00
Mark Otto
3737cb1d46
Use grid classes or mixins on .dl-horizontal, update docs to include it, removes auto truncate and makes .text-overflow mixin into a .text-truncate class and mixin combo for better granularity
2014-12-11 14:12:10 -08:00
Mark Otto
e0a9a7722f
Merge pull request #14 from twbs/nuke_customizer
...
Nuke the customizer
2014-12-11 12:21:05 -08:00
Mark Otto
2edc779391
Merge branch 'v4' into scss-lint
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
scss/_card.scss
2014-12-11 12:07:09 -08:00
Mark Otto
2a78159a20
grunt
2014-12-11 12:06:08 -08:00
Mark Otto
fef873a840
fix all validation, turn off some settings, add sort order
2014-12-11 12:05:29 -08:00
XhmikosR
4e27c48248
Run grunt.
2014-12-11 08:24:31 +02:00
XhmikosR
aa1e3e7325
Tweak colors to improve accessibility.
2014-12-11 08:14:07 +02:00
XhmikosR
46b0e94e25
Specify img dimensions in the HTML.
2014-12-11 08:14:07 +02:00
Mark Otto
0e371ddf87
Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/css/docs.min.css.map
2014-12-10 20:51:17 -08:00
Mark Otto
95da2a9428
nuke the customizer
2014-12-10 13:51:43 -08:00
Mark Otto
63d4423fc0
grunt
2014-12-10 13:49:53 -08:00
Mark Otto
8ef926b4fb
clean up some docs css
2014-12-06 00:20:57 -08:00
Mark Otto
57071cc68a
grunt--fuuuuuuuuuuuuuck you line comments
2014-12-05 14:56:29 -08:00
Mark Otto
27df020852
convert to scss
2014-12-02 14:02:35 -08:00
Mark Otto
b648a77ed3
Merge branch 'master' into v4
...
Conflicts:
Gruntfile.js
_config.yml
dist/css/bootstrap-theme.css
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/fonts/glyphicons-halflings-regular.eot
dist/fonts/glyphicons-halflings-regular.svg
dist/fonts/glyphicons-halflings-regular.ttf
dist/fonts/glyphicons-halflings-regular.woff
docs/_data/glyphicons.yml
docs/_includes/components/alerts.html
docs/_includes/components/badges.html
docs/_includes/components/button-dropdowns.html
docs/_includes/components/button-groups.html
docs/_includes/components/dropdowns.html
docs/_includes/components/glyphicons.html
docs/_includes/components/input-groups.html
docs/_includes/components/labels.html
docs/_includes/components/media.html
docs/_includes/components/navbar.html
docs/_includes/components/navs.html
docs/_includes/components/pagination.html
docs/_includes/components/panels.html
docs/_includes/components/progress-bars.html
docs/_includes/css/buttons.html
docs/_includes/css/forms.html
docs/_includes/css/grid.html
docs/_includes/css/helpers.html
docs/_includes/css/images.html
docs/_includes/css/less.html
docs/_includes/css/responsive-utilities.html
docs/_includes/css/sass.html
docs/_includes/css/tables.html
docs/_includes/css/type.html
docs/_includes/getting-started/accessibility.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/getting-started/community.html
docs/_includes/getting-started/download.html
docs/_includes/getting-started/examples.html
docs/_includes/getting-started/whats-included.html
docs/_includes/js/affix.html
docs/_includes/js/alerts.html
docs/_includes/js/buttons.html
docs/_includes/js/carousel.html
docs/_includes/js/collapse.html
docs/_includes/js/dropdowns.html
docs/_includes/js/modal.html
docs/_includes/js/overview.html
docs/_includes/js/tabs.html
docs/_includes/nav/components.html
docs/_includes/nav/css.html
docs/_includes/nav/javascript.html
docs/_includes/nav/main.html
docs/about.html
docs/assets/css/docs.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap-theme.css
docs/dist/css/bootstrap-theme.min.css
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/dist/fonts/glyphicons-halflings-regular.eot
docs/dist/fonts/glyphicons-halflings-regular.svg
docs/dist/fonts/glyphicons-halflings-regular.ttf
docs/dist/fonts/glyphicons-halflings-regular.woff
docs/examples/carousel/index.html
docs/examples/navbar-fixed-top/index.html
docs/examples/navbar-static-top/index.html
docs/examples/navbar/index.html
docs/examples/non-responsive/index.html
docs/examples/non-responsive/non-responsive.css
docs/examples/sticky-footer-navbar/index.html
docs/examples/theme/index.html
fonts/glyphicons-halflings-regular.eot
fonts/glyphicons-halflings-regular.svg
fonts/glyphicons-halflings-regular.ttf
fonts/glyphicons-halflings-regular.woff
less/_carousel.less
less/_forms.less
less/glyphicons.less
2014-11-30 20:17:45 -08:00
Mark Otto
9928144dc4
Fixes #15241 : Add simple example to docs for collapse plugin
2014-11-29 23:03:47 -08:00
Mark Otto
c901287394
remove more mentions of theme
2014-11-29 15:01:44 -08:00
Mark Otto
15d98dc6b7
disable shadows on buttons for now
2014-11-25 17:47:32 -08:00
Mark Otto
7ca73b7542
fix margin on .bs-example thumbs
2014-11-25 17:10:47 -08:00
XhmikosR
7ea49019b8
Run grunt.
2014-11-24 09:53:42 +02:00
XhmikosR
0c816d910d
Merge pull request #15159 from twbs/docs-muted
...
Clean up old `muted` references and switch to `text-muted`.
2014-11-20 10:27:42 +02:00
XhmikosR
a1b8aa351e
Clean up old muted references and switch to text-muted.
2014-11-20 08:02:25 +02:00
Chris Rebert
ddf39cc2e7
Don't line wrap event names in JS plugin docs
2014-11-12 16:32:51 -08:00
XhmikosR
bf4a331f1a
Run grunt.
2014-11-10 12:55:26 +02:00
Mark Otto
8c954fd13d
run cssmin on docs css for dist-css task
2014-11-10 00:20:41 -08:00
Mark Otto
2cc66cbb58
Merge branch 'master' into derp
...
Conflicts:
dist/css/bootstrap-theme.css
dist/css/bootstrap-theme.css.map
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/_includes/customizer-variables.html
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap-theme.css
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap-theme.min.css
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
less/_variables.less
2014-11-09 23:48:56 -08:00
Mark Otto
eb74a8cbf3
darken primary blue for accessibility contrast on link colors
2014-11-09 23:11:28 -08:00
Mark Otto
f17b636bce
color contrast for links, gets us to 4.63:1
2014-11-09 23:01:50 -08:00
Mark Otto
e020d50838
fix variable, run grunt
2014-11-09 22:05:09 -08:00
Mark Otto
86af1f39ab
Merge branch 'master' into derp
...
Conflicts:
Gruntfile.js
_config.yml
dist/css/bootstrap-theme.css
dist/css/bootstrap-theme.css.map
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/_includes/components/button-groups.html
docs/_includes/components/jumbotron.html
docs/_includes/components/media.html
docs/_includes/components/navs.html
docs/_includes/customizer-variables.html
docs/_includes/footer.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/js/carousel.html
docs/_includes/js/dropdowns.html
docs/_includes/js/modal.html
docs/_includes/js/popovers.html
docs/_includes/js/tooltips.html
docs/_includes/nav/getting-started.html
docs/_includes/nav/javascript.html
docs/_layouts/default.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/customize.min.js
docs/assets/js/docs.min.js
docs/assets/js/raw-files.min.js
docs/browser-bugs.html
docs/dist/css/bootstrap-theme.css
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap-theme.min.css
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/examples/justified-nav/index.html
less/_forms.less
less/_tooltip.less
less/navs.less
less/theme.less
2014-11-09 22:02:53 -08:00
