aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-12-16 00:15:00 -0800
committerMark Otto <[email protected]>2014-12-16 00:15:00 -0800
commit059f6a01efc36ec7cf76538dd50dd8725b48d21b (patch)
tree87ab0aeddcd2ddc5648bdb1597f1858c04a85d1e
parent1e136a70a2391aae2e9a54d24874df59b40805a0 (diff)
parentea039ac72e08585c10916d5d737b691043551120 (diff)
downloadbootstrap-059f6a01efc36ec7cf76538dd50dd8725b48d21b.tar.xz
bootstrap-059f6a01efc36ec7cf76538dd50dd8725b48d21b.zip
Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
Diffstat
-rw-r--r--Gruntfile.js1
-rw-r--r--grunt/configBridge.json6
-rw-r--r--js/tests/visual/affix.html7
-rw-r--r--js/tests/visual/alert.html7
-rw-r--r--js/tests/visual/button.html7
-rw-r--r--js/tests/visual/carousel.html7
-rw-r--r--js/tests/visual/collapse.html7
-rw-r--r--js/tests/visual/dropdown.html7
-rw-r--r--js/tests/visual/modal.html7
-rw-r--r--js/tests/visual/popover.html7
-rw-r--r--js/tests/visual/scrollspy.html7
-rw-r--r--js/tests/visual/tab.html7
-rw-r--r--js/tests/visual/tooltip.html7
-rw-r--r--sache.json5
14 files changed, 8 insertions, 81 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index 31ea5628c..cbedb07b4 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -187,7 +187,6 @@ module.exports = function (grunt) {
cssmin: {
options: {
- compatibility: 'ie8',
keepSpecialComments: '*',
noAdvanced: true
},
diff --git a/grunt/configBridge.json b/grunt/configBridge.json
index b4bcdb60e..54fa7cef4 100644
--- 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"
]
}
-} \ No newline at end of file
+}
diff --git a/js/tests/visual/affix.html b/js/tests/visual/affix.html
index 4d772dc73..782fcb32c 100644
--- 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>
diff --git a/js/tests/visual/alert.html b/js/tests/visual/alert.html
index 0070315a2..2f824ace1 100644
--- 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>
diff --git a/js/tests/visual/button.html b/js/tests/visual/button.html
index d92a08329..e9b06dfa2 100644
--- 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>
diff --git a/js/tests/visual/carousel.html b/js/tests/visual/carousel.html
index 8dede0921..ee8cab63d 100644
--- 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>
diff --git a/js/tests/visual/collapse.html b/js/tests/visual/collapse.html
index b7a151516..89b36d7a6 100644
--- 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>
diff --git a/js/tests/visual/dropdown.html b/js/tests/visual/dropdown.html
index 02090b6cc..38f28bca1 100644
--- 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>
diff --git a/js/tests/visual/modal.html b/js/tests/visual/modal.html
index 0af79cc55..86d1427f9 100644
--- 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>
diff --git a/js/tests/visual/popover.html b/js/tests/visual/popover.html
index 0e84f5cee..e71ebca8c 100644
--- 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>
diff --git a/js/tests/visual/scrollspy.html b/js/tests/visual/scrollspy.html
index 5952b7e59..1edfbc383 100644
--- 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">
diff --git a/js/tests/visual/tab.html b/js/tests/visual/tab.html
index a3fed1e9f..a1dd8214c 100644
--- 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>
diff --git a/js/tests/visual/tooltip.html b/js/tests/visual/tooltip.html
index 8d10871c9..7c8361e4d 100644
--- 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>
diff --git a/sache.json b/sache.json
new file mode 100644
index 000000000..cd1a8c44f
--- /dev/null
+++ 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"]
+}
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-07 07:04:05 +0000