Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

2024-12-01 13:24:25 +01:00 · 2014-12-16 00:15:00 -08:00 · 2014-12-16 00:15:00 -08:00 · 059f6a01ef
commit 059f6a01ef
parent 1e136a70a2 ea039ac72e
14 changed files with 8 additions and 81 deletions
--- a/Gruntfile.js
+++ b/Gruntfile.js
@ -187,7 +187,6 @@ module.exports = function (grunt) {

    cssmin: {
      options: {
-        compatibility: 'ie8',
        keepSpecialComments: '*',
        noAdvanced: true
      },
--- a/grunt/configBridge.json
+++ b/grunt/configBridge.json
@ -11,8 +11,8 @@
      "Android 2.3",
      "Android >= 4",
      "Chrome >= 20",
-      "Firefox >= 24",
-      "Explorer >= 8",
+      "Firefox >= 31",
+      "Explorer >= 9",
      "iOS >= 6",
      "Opera >= 12",
      "Safari >= 6"
@ -31,4 +31,4 @@
      "}(jQuery);\n\n"
    ]
  }
-}
+}
--- a/js/tests/visual/affix.html
+++ b/js/tests/visual/affix.html
@ -40,13 +40,6 @@
      background-color: #85144B;
    }
  </style>
-
-  <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-  <!--[if lt IE 9]>
-    <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-  <![endif]-->
 </head>
 <body>

--- a/js/tests/visual/alert.html
+++ b/js/tests/visual/alert.html
@ -6,13 +6,6 @@
  <meta name="viewport" content="width=device-width, initial-scale=1">
  <title>Alert</title>
  <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css">
-
-  <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-  <!--[if lt IE 9]>
-    <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-  <![endif]-->
 </head>
 <body>

--- a/js/tests/visual/button.html
+++ b/js/tests/visual/button.html
@ -6,13 +6,6 @@
  <meta name="viewport" content="width=device-width, initial-scale=1">
  <title>Button</title>
  <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css">
-
-  <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-  <!--[if lt IE 9]>
-    <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-  <![endif]-->
 </head>
 <body>

--- a/js/tests/visual/carousel.html
+++ b/js/tests/visual/carousel.html
@ -6,13 +6,6 @@
  <meta name="viewport" content="width=device-width, initial-scale=1">
  <title>Carousel</title>
  <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css">
-
-  <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-  <!--[if lt IE 9]>
-    <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-  <![endif]-->
 </head>
 <body>

--- a/js/tests/visual/collapse.html
+++ b/js/tests/visual/collapse.html
@ -6,13 +6,6 @@
  <meta name="viewport" content="width=device-width, initial-scale=1">
  <title>Collapse</title>
  <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css">
-
-  <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-  <!--[if lt IE 9]>
-    <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-  <![endif]-->
 </head>
 <body>

--- a/js/tests/visual/dropdown.html
+++ b/js/tests/visual/dropdown.html
@ -6,13 +6,6 @@
  <meta name="viewport" content="width=device-width, initial-scale=1">
  <title>Dropdown</title>
  <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css">
-
-  <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-  <!--[if lt IE 9]>
-    <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-  <![endif]-->
 </head>
 <body>

--- a/js/tests/visual/modal.html
+++ b/js/tests/visual/modal.html
@ -6,13 +6,6 @@
  <meta name="viewport" content="width=device-width, initial-scale=1">
  <title>Modal</title>
  <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css">
-
-  <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-  <!--[if lt IE 9]>
-    <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-  <![endif]-->
 </head>
 <body>

--- a/js/tests/visual/popover.html
+++ b/js/tests/visual/popover.html
@ -6,13 +6,6 @@
  <meta name="viewport" content="width=device-width, initial-scale=1">
  <title>Popover</title>
  <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css">
-
-  <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-  <!--[if lt IE 9]>
-    <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-  <![endif]-->
 </head>
 <body>

--- a/js/tests/visual/scrollspy.html
+++ b/js/tests/visual/scrollspy.html
@ -10,13 +10,6 @@
  <style>
    body { padding-top: 70px; }
  </style>
-
-  <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-  <!--[if lt IE 9]>
-    <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-  <![endif]-->
 </head>
 <body data-spy="scroll" data-target=".navbar" data-offset="70">

--- a/js/tests/visual/tab.html
+++ b/js/tests/visual/tab.html
@ -16,13 +16,6 @@
      margin-bottom: 15px;
    }
  </style>
-
-  <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-  <!--[if lt IE 9]>
-    <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-  <![endif]-->
 </head>
 <body>

--- a/js/tests/visual/tooltip.html
+++ b/js/tests/visual/tooltip.html
@ -6,13 +6,6 @@
  <meta name="viewport" content="width=device-width, initial-scale=1">
  <title>Tooltip</title>
  <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css">
-
-  <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-  <!--[if lt IE 9]>
-    <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-  <![endif]-->
 </head>
 <body>

--- a/sache.json
+++ b/sache.json
@ -0,0 +1,5 @@
+{
+  "name": "bootstrap",
+  "description": "The most popular HTML, CSS, and JavaScript framework for developing responsive, mobile first projects on the web.",
+  "tags": ["bootstrap", "grid", "typography", "buttons", "ui", "responsive-web-design"]
+}