Permalink
Browse files

mergeできてなかった…

  • Loading branch information...
2 parents 0cc1912 + d8dd7db commit 3a8b5c7b1f23109bbabdff37b57d95454b415012 @raryosu committed Jul 29, 2016
Showing with 102 additions and 91 deletions.
  1. +25 −25 README.md
  2. +2 −2 bower.json
  3. +1 −4 dist/css/bootstrap.css
  4. +2 −2 dist/css/bootstrap.min.css
  5. +4 −4 dist/index.html
  6. +64 −50 dist/js/bootstrap.js
  7. +4 −4 dist/js/bootstrap.min.js
View
@@ -80,31 +80,31 @@ Bootstrapをつかってウェブページを作成する際に基本となるHT
```html
<!DOCTYPE html>
<html lang="ja">
- <head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
- <title>Bootstrap 101 Template</title>
-
- <!-- Bootstrap -->
- <link href="css/bootstrap.min.css" rel="stylesheet">
-
- <!-- 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>
- <h1>Hello, world!</h1>
-
- <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
- <!-- Include all compiled plugins (below), or include individual files as needed -->
- <script src="js/bootstrap.min.js"></script>
- </body>
+ <head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+ <title>Bootstrap 101 Template</title>
+
+ <!-- Bootstrap -->
+ <link href="css/bootstrap.min.css" rel="stylesheet">
+
+ <!-- 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.3/html5shiv.min.js"></script>
+ <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+ <![endif]-->
+ </head>
+ <body>
+ <h1>Hello, world!</h1>
+
+ <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
+ <!-- Include all compiled plugins (below), or include individual files as needed -->
+ <script src="js/bootstrap.min.js"></script>
+ </body>
</html>
```
View
@@ -33,8 +33,8 @@
],
"dependencies": {},
"devDependencies": {
- "bootstrap": "3.3.6",
- "bootstrap-sass": "3.3.6"
+ "bootstrap": "3.3.7",
+ "bootstrap-sass": "3.3.7"
},
"exportsOverride": {
"bootstrap-sass": {},
@@ -7,7 +7,7 @@
* Based on Honoka (http://honokak.osaka/) by windyakin
*/
/*!
- * Bootstrap v3.3.6 (http://getbootstrap.com)
+ * Bootstrap v3.3.7 (http://getbootstrap.com)
* Copyright 2011-2016 Twitter, Inc.
* Licensed under the MIT license
*/
@@ -2335,7 +2335,6 @@ a:hover, a:focus {
text-decoration: underline;
}
a:focus {
- outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
@@ -4038,7 +4037,6 @@ select[size] {
input[type="file"]:focus,
input[type="radio"]:focus,
input[type="checkbox"]:focus {
- outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
@@ -4592,7 +4590,6 @@ select[multiple].input-lg,
border-radius: 2px;
}
.btn:focus, .btn.focus, .btn:active:focus, .btn:active.focus, .btn.active:focus, .btn.active.focus {
- outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
Oops, something went wrong.
View
@@ -26,10 +26,10 @@
<link rel="stylesheet" type="text/css" href="assets/css/example.css">
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
- <!--[if lt IE 9]>
- <script src="//oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
- <script src="//oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
- <![endif]-->
+ <!--[if lt IE 9]>
+ <script src="//oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+ <script src="//oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+ <![endif]-->
</head>
<body>
Oops, something went wrong.

0 comments on commit 3a8b5c7

Please sign in to comment.