Merge branch 'master' into v4

Conflicts: .gitignore 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/js/bootstrap.js dist/js/bootstrap.min.js docs/_includes/components/navbar.html docs/_includes/components/progress-bars.html docs/_includes/css/grid.html docs/_includes/css/overview.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/disabling-responsiveness.html docs/_includes/getting-started/download.html docs/_includes/getting-started/examples.html docs/_includes/getting-started/license.html docs/_includes/getting-started/third-party-support.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/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/_includes/nav/main.html docs/about.html docs/assets/css/docs.min.css docs/assets/css/src/docs.css docs/assets/js/customize.min.js docs/assets/js/raw-files.min.js docs/assets/js/src/customizer.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/js/bootstrap.js docs/dist/js/bootstrap.min.js docs/migration.html js/affix.js js/alert.js js/button.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/tests/visual/modal.html js/tooltip.js less/component-animations.less less/jumbotron.less less/mixins/background-variant.less less/mixins/buttons.less less/mixins/responsive-visibility.less less/mixins/text-emphasis.less less/navbar.less less/navs.less less/scaffolding.less less/tooltip.less less/utilities.less less/variables.less package.json scss/_buttons.scss scss/_forms.scss scss/_modal.scss
2026-06-05 16:42:29 +03:00 · 2015-03-29 00:08:54 -07:00
parent 321c3b66bb ce75f289f2
commit 58082cd83e
38 changed files with 1054 additions and 361 deletions
@@ -32,7 +32,7 @@
  },
  "devDependencies": {
    "btoa": "~1.1.2",
-    "glob": "~4.4.0",
+    "glob": "~5.0.3",
    "grunt": "~0.4.5",
    "grunt-autoprefixer": "~2.2.0",
    "grunt-banner": "~0.3.1",
@@ -52,7 +52,7 @@
    "grunt-contrib-watch": "~0.6.1",
    "grunt-csscomb": "~3.0.0",
    "grunt-exec": "~0.4.6",
-    "grunt-html": "^3.0.0",
+    "grunt-html": "~4.0.1",
    "grunt-jekyll": "~0.4.2",
    "grunt-jscs": "~1.5.0",
    "grunt-postcss": "^0.3.0",
@@ -61,7 +61,7 @@
    "grunt-scss-lint": "^0.3.4",
    "grunt-sed": "~0.1.1",
    "load-grunt-tasks": "~3.1.0",
-    "markdown-it": "^3.0.7",
+    "markdown-it": "^4.0.1",
    "mq4-hover-shim": "^0.1.0",
    "npm-shrinkwrap": "^200.1.0",
    "superstartup-closure-compiler": "^0.1.6",
@@ -81,18 +81,12 @@
  ],
  "jspm": {
    "main": "js/bootstrap",
-    "directories": {
-      "example": "examples",
-      "lib": "dist"
-    },
    "shim": {
      "js/bootstrap": {
-        "imports": "jquery",
+        "deps": "jquery",
        "exports": "$"
      }
    },
-    "buildConfig": {
-      "uglify": true
-    }
+    "files": ["css", "fonts", "js"]
  }
 }