Permalink
Browse files

Merge pull request #22 from windyakin/update_3.3.7

Update v3.3.7
  • Loading branch information...
2 parents 668d61b + 12f6668 commit d8dd7dbe6189bb90516b9c54d478e718280803f7 @windyakin committed on GitHub Jul 28, 2016
Showing with 79 additions and 68 deletions.
  1. +2 −2 README.md
  2. +2 −2 bower.json
  3. +2 −5 dist/css/bootstrap.css
  4. +3 −3 dist/css/bootstrap.min.css
  5. +1 −1 dist/index.html
  6. +64 −50 dist/js/bootstrap.js
  7. +4 −4 dist/js/bootstrap.min.js
  8. +1 −1 package.json
View
@@ -93,15 +93,15 @@ Bootstrapをつかってウェブページを作成する際に基本となるHT
<!-- 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/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.11.2/jquery.min.js"></script>
+ <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>
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": {},
@@ -1,12 +1,12 @@
@charset "UTF-8";
/*!
- * Honoka v3.3.6-b
+ * Honoka v3.3.7
* Website http://honokak.osaka/
* Copyright 2015 windyakin
* The MIT License
*/
/*!
- * Bootstrap v3.3.6 (http://getbootstrap.com)
+ * Bootstrap v3.3.7 (http://getbootstrap.com)
* Copyright 2011-2016 Twitter, Inc.
* Licensed under the MIT license
*/
@@ -2334,7 +2334,6 @@ a:hover, a:focus {
text-decoration: underline;
}
a:focus {
- outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
@@ -4037,7 +4036,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;
}
@@ -4591,7 +4589,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
@@ -27,7 +27,7 @@
<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/html5shiv/3.7.3/html5shiv.min.js"></script>
<script src="//oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
Oops, something went wrong.

0 comments on commit d8dd7db

Please sign in to comment.