Permalink
Browse files

Merge remote-tracking branch 'honoka/master'

Honoka v3.3.7
  • Loading branch information...
2 parents 9e1646c + d8dd7db commit b97592754158063ef29582f543e66969ae1f4c18 @NKMR6194 committed Jul 30, 2016
Showing with 78 additions and 65 deletions.
  1. +2 −2 README.md
  2. +2 −2 bower.json
  3. +1 −0 dist/assets/css/example.css
  4. +1 −4 dist/css/bootstrap.css
  5. +2 −2 dist/css/bootstrap.min.css
  6. +1 −1 dist/index.html
  7. +64 −50 dist/js/bootstrap.js
  8. +4 −4 dist/js/bootstrap.min.js
  9. +1 −0 src/scss/example.scss
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": {},
@@ -332,6 +332,7 @@ footer .copyright {
.bootstrap-default {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px;
+ line-height: 1.4285;
}
.bootstrap-default > h3 {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
@@ -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
@@ -27,7 +27,7 @@
<link rel="stylesheet" href="https://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 b975927

Please sign in to comment.