mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-30 15:24:08 +03:00
Code Activity

Merge pull request #19378 from twbs/v3-deps

Browse Source 
Update devDependencies
This commit is contained in:
XhmikosR
2016-03-11 10:58:57 +02:00
parent 0119e334a1 cf566a8041
commit 2744e4042f
30 changed files with 3097 additions and 2262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/_includes/components/navbar.html
+3 -3
View File
@@ -60,7 +60,7 @@
</ul>
</li>
</ul>
<form class="navbar-form navbar-left" role="search">
<form class="navbar-form navbar-left">
<div class="form-group">
<input type="text" class="form-control" placeholder="Search">
</div>
@@ -115,7 +115,7 @@
</ul>
</li>
</ul>
<form class="navbar-form navbar-left" role="search">
<form class="navbar-form navbar-left">
<div class="form-group">
<input type="text" class="form-control" placeholder="Search">
</div>
@@ -182,7 +182,7 @@
<a class="navbar-brand" href="#">Brand</a>
</div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-2">
<form class="navbar-form navbar-left" role="search">
<form class="navbar-form navbar-left">
<div class="form-group">
<input type="text" class="form-control" placeholder="Search">
</div>
docs/_includes/footer.html
+1 -1
View File
@@ -1,6 +1,6 @@
<!-- Footer
================================================== -->
<footer class="bs-docs-footer" role="contentinfo">
<footer class="bs-docs-footer">
<div class="container">
<ul class="bs-docs-footer-links">
docs/_includes/getting-started/grunt.html
+1 -1
View File
@@ -25,7 +25,7 @@
<p>Runs <a href="http://jshint.com">JSHint</a> and runs the <a href="http://qunitjs.com">QUnit</a> tests headlessly in <a href="http://phantomjs.org">PhantomJS</a>.</p>
<h3><code>grunt docs</code> (Build &amp; test the docs assets)</h3>
<p>Builds and tests CSS, JavaScript, and other assets which are used when running the documentation locally via <code>jekyll serve</code>.</p>
<p>Builds and tests CSS, JavaScript, and other assets which are used when running the documentation locally via <code>bundle exec jekyll serve</code>.</p>
<h3><code>grunt</code> (Build absolutely everything and run tests)</h3>
<p>Compiles and minifies CSS and JavaScript, builds the documentation website, runs the HTML5 validator against the docs, regenerates the Customizer assets, and more. Requires <a href="http://jekyllrb.com/docs/installation/">Jekyll</a>. Usually only necessary if you're hacking on Bootstrap itself.</p>
docs/_includes/nav/main.html
+1 -1
View File
@@ -1,4 +1,4 @@
<header class="navbar navbar-static-top bs-docs-nav" id="top" role="banner">
<header class="navbar navbar-static-top bs-docs-nav" id="top">
<div class="container">
<div class="navbar-header">
<button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#bs-navbar" aria-controls="bs-navbar" aria-expanded="false">
docs/assets/js/customize.min.js
Vendored
+6 -6
View File
File diff suppressed because one or more lines are too long
docs/assets/js/raw-files.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/assets/js/src/customizer.js
+1 -2
View File
@@ -6,8 +6,7 @@
* details, see https://creativecommons.org/licenses/by/3.0/.
*/
/* jshint es3:false */
/* global JSZip, less, autoprefixer, saveAs, UglifyJS, __configBridge, __js, __less, __fonts */
/* global JSON, JSZip, less, autoprefixer, saveAs, UglifyJS, __configBridge, __js, __less, __fonts */
window.onload = function () { // wait for load in a dumb way because B-0
'use strict';
docs/assets/js/vendor/uglify.min.js
Vendored
+6 -6
View File
File diff suppressed because one or more lines are too long
docs/dist/js/bootstrap.js
+1
View File
@@ -543,6 +543,7 @@ if (typeof jQuery === 'undefined') {
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
/* jshint latedef: false */
+function ($) {
'use strict';
docs/examples/non-responsive/index.html
+1 -1
View File
@@ -61,7 +61,7 @@
</ul>
</li>
</ul>
<form class="navbar-form navbar-left" role="search">
<form class="navbar-form navbar-left">
<div class="form-group">
<input type="text" class="form-control" placeholder="Search">
</div>
docs/examples/theme/index.html
+1 -1
View File
@@ -32,7 +32,7 @@
<![endif]-->
</head>
<body role="document">
<body>
<!-- Fixed navbar -->
<nav class="navbar navbar-inverse navbar-fixed-top">
docs/index.html
+1 -1
View File
@@ -4,7 +4,7 @@ title: Bootstrap &middot; The world's most popular mobile-first and responsive f
---
<main class="bs-docs-masthead" id="content" role="main" tabindex="-1">
<main class="bs-docs-masthead" id="content" tabindex="-1">
<div class="container">
<span class="bs-docs-booticon bs-docs-booticon-lg bs-docs-booticon-outline">B</span>
<p class="lead">Bootstrap is the most popular HTML, CSS, and JS framework for developing responsive, mobile first projects on the web.</p>
docs/sitemap.xml
-23
View File
@@ -1,23 +0,0 @@
---
---
<?xml version="1.0" encoding="UTF-8"?>
<urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url>
<loc>{{ site.url }}/</loc>
<lastmod>{{ site.time | date_to_xmlschema }}</lastmod>
<changefreq>daily</changefreq>
<priority>1.0</priority>
</url>
{% for page in site.html_pages %}
{% if page.layout != "home" %}
<url>
<loc>{{ site.url }}{{ page.url }}</loc>
<lastmod>{{ site.time | date_to_xmlschema }}</lastmod>
<changefreq>weekly</changefreq>
<priority>0.7</priority>
</url>
{% endif %}
{% endfor %}
</urlset>