Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into merge/honoka
Browse files Browse the repository at this point in the history
  • Loading branch information
@kubosho
kubosho committed Mar 31, 2016
2 parents 40fe15c + 8a0fab5 commit 328f612
Show file tree
Hide file tree
Showing 9 changed files with 635 additions and 569 deletions.
29 changes: 20 additions & 9 deletions Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,20 @@ module.exports = function(grunt) {
banner: '/*!\n' +
' * <%= pkg.name %> v<%= pkg.version %>\n' +
' * Website <%= pkg.website %>\n' +
' * Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
' * Copyright 2015 <%= pkg.author %>\n' +
' * The <%= pkg.license %> License\n' +
' * Based on Bootstrap v<%= bowerJSON.devDependencies.bootstrap %> (http://getbootstrap.com)\n' +
' */',
(
pkg.name !== "Honoka" ?
' * Based on Honoka (http://honokak.osaka/) by windyakin\n'
:
''
) +
' */\n' +
'/*!\n' +
' * Bootstrap v<%= twbs.version %> (<%= twbs.homepage %>)\n' +
' * Copyright 2011-<%= grunt.template.today("yyyy") %> <%= twbs.author %>\n' +
' * Licensed under the <%= twbs.license %> license\n' +
' */\n',
// bannerの調整
replace: {
// バナーの追加
Expand Down Expand Up @@ -207,19 +217,20 @@ module.exports = function(grunt) {
}

// 本家Bootstrapのautoprefixerの設定を読み込む
grunt.task.registerTask('setAutoPrefixerConfig', 'Get autoprefixer config from bootstrap', function() {
grunt.task.registerTask('getTwbsConfig', 'Get config from bootstrap', function() {
try {
var configBridge = grunt.file.readJSON('bower_components/bootstrap/grunt/configBridge.json');
var twbsPkg = grunt.file.readJSON('bower_components/bootstrap/package.json');
grunt.verbose.ok();
} catch (e) {
grunt.verbose.or.write("Loading Bootstrap configBridge...").error().error(e.message);
grunt.verbose.or.write("Loading Bootstrap config...").error().error(e.message);
grunt.fail.fatal('Do you install bower component? Try "grunt bower:install"');
}
var prefixConfig = configBridge.config.autoprefixerBrowsers;
grunt.config.merge({
twbs: twbsPkg,
autoprefixer: {
options: {
browsers: prefixConfig
browsers: configBridge.config.autoprefixerBrowsers
}
}
});
Expand All @@ -235,10 +246,10 @@ module.exports = function(grunt) {
grunt.registerTask('optimize', ['csscomb', 'cssmin:minify']);

// 開発用
grunt.registerTask('server', ['bower:install', 'setAutoPrefixerConfig', 'test', 'css', 'connect', 'watch']);
grunt.registerTask('server', ['bower:install', 'getTwbsConfig', 'test', 'css', 'connect', 'watch']);

// ビルドタスク
grunt.registerTask('build', ['clean:build', 'bower:install', 'setAutoPrefixerConfig', 'test', 'css', 'optimize', 'replace:banner']);
grunt.registerTask('build', ['clean:build', 'bower:install', 'getTwbsConfig', 'test', 'css', 'optimize', 'replace:banner']);

// 配布用パッケージ作成
grunt.registerTask('package', ['build', 'compress:main']);
Expand Down
10 changes: 9 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,20 @@

### Download

[Relases](https://github.com/windyakin/Honoka/releases)から最新版をダウンロードしてください。
[Releases](https://github.com/windyakin/Honoka/releases)から最新版をダウンロードしてください。

### Bower

[Bower](http://bower.io/)からインストールすることができます。

最新版をインストールするには以下のコマンドを実行してください。

```
bower install --save-dev $(node -e "$(curl -fsSL https://cdn.honokak.osaka/last.js)" windyakin Honoka)
```

もしcURLが入っていない環境の場合には、

```
bower install --save-dev Nico#(version)
```
Expand Down
64 changes: 32 additions & 32 deletions dist/assets/css/example.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
color: #fff;
background-color: #55acee;
border-color: #4ca7ed;
-webkit-transition-timing-function: ease;
-o-transition-timing-function: ease;
transition-timing-function: ease;
-webkit-transition-duration: .3s;
-o-transition-duration: .3s;
transition-duration: .3s;
-webkit-transition-property: all;
-o-transition-property: all;
transition-property: all;
-webkit-transition-duration: 0.3s;
-o-transition-duration: 0.3s;
transition-duration: 0.3s;
-webkit-transition-timing-function: ease;
-o-transition-timing-function: ease;
transition-timing-function: ease;
}
.btn-twitter:focus, .btn-twitter.focus {
color: #fff;
Expand All @@ -29,12 +29,12 @@
background-color: #2795e9;
border-color: #178ce5;
}
.btn-twitter.active, .btn-twitter.active, .open > .btn-twitter.dropdown-toggle {
.btn-twitter:active, .btn-twitter.active, .open > .btn-twitter.dropdown-toggle {
color: #fff;
background-color: #3ea1ec;
border-color: #309aea;
}
.btn-twitter.active:hover, .btn-twitter.active:focus, .btn-twitter.active.focus, .btn-twitter.active:hover, .btn-twitter.active:focus, .btn-twitter.active.focus, .open > .btn-twitter.dropdown-toggle:hover, .open > .btn-twitter.dropdown-toggle:focus, .open > .btn-twitter.dropdown-toggle.focus {
.btn-twitter:active:hover, .btn-twitter:active:focus, .btn-twitter:active.focus, .btn-twitter.active:hover, .btn-twitter.active:focus, .btn-twitter.active.focus, .open > .btn-twitter.dropdown-toggle:hover, .open > .btn-twitter.dropdown-toggle:focus, .open > .btn-twitter.dropdown-toggle.focus {
color: #fff;
background-color: #1583d7;
border-color: #1167a8;
Expand All @@ -55,15 +55,15 @@
color: #fff;
background-color: #3b5998;
border-color: #385591;
-webkit-transition-timing-function: ease;
-o-transition-timing-function: ease;
transition-timing-function: ease;
-webkit-transition-duration: .3s;
-o-transition-duration: .3s;
transition-duration: .3s;
-webkit-transition-property: all;
-o-transition-property: all;
transition-property: all;
-webkit-transition-duration: 0.3s;
-o-transition-duration: 0.3s;
transition-duration: 0.3s;
-webkit-transition-timing-function: ease;
-o-transition-timing-function: ease;
transition-timing-function: ease;
}
.btn-facebook:focus, .btn-facebook.focus {
color: #fff;
Expand All @@ -75,12 +75,12 @@
background-color: #2d4373;
border-color: #273b65;
}
.btn-facebook.active, .btn-facebook.active, .open > .btn-facebook.dropdown-toggle {
.btn-facebook:active, .btn-facebook.active, .open > .btn-facebook.dropdown-toggle {
color: #fff;
background-color: #344e86;
border-color: #30487b;
}
.btn-facebook.active:hover, .btn-facebook.active:focus, .btn-facebook.active.focus, .btn-facebook.active:hover, .btn-facebook.active:focus, .btn-facebook.active.focus, .open > .btn-facebook.dropdown-toggle:hover, .open > .btn-facebook.dropdown-toggle:focus, .open > .btn-facebook.dropdown-toggle.focus {
.btn-facebook:active:hover, .btn-facebook:active:focus, .btn-facebook:active.focus, .btn-facebook.active:hover, .btn-facebook.active:focus, .btn-facebook.active.focus, .open > .btn-facebook.dropdown-toggle:hover, .open > .btn-facebook.dropdown-toggle:focus, .open > .btn-facebook.dropdown-toggle.focus {
color: #fff;
background-color: #23345a;
border-color: #141f35;
Expand All @@ -101,15 +101,15 @@
color: #fff;
background-color: #178fde;
border-color: #1689d5;
-webkit-transition-timing-function: ease;
-o-transition-timing-function: ease;
transition-timing-function: ease;
-webkit-transition-duration: .3s;
-o-transition-duration: .3s;
transition-duration: .3s;
-webkit-transition-property: all;
-o-transition-property: all;
transition-property: all;
-webkit-transition-duration: 0.3s;
-o-transition-duration: 0.3s;
transition-duration: 0.3s;
-webkit-transition-timing-function: ease;
-o-transition-timing-function: ease;
transition-timing-function: ease;
}
.btn-hatebu:focus, .btn-hatebu.focus {
color: #fff;
Expand All @@ -121,12 +121,12 @@
background-color: #1271b0;
border-color: #10659d;
}
.btn-hatebu.active, .btn-hatebu.active, .open > .btn-hatebu.dropdown-toggle {
.btn-hatebu:active, .btn-hatebu.active, .open > .btn-hatebu.dropdown-toggle {
color: #fff;
background-color: #1580c7;
border-color: #1377b9;
}
.btn-hatebu.active:hover, .btn-hatebu.active:focus, .btn-hatebu.active.focus, .btn-hatebu.active:hover, .btn-hatebu.active:focus, .btn-hatebu.active.focus, .open > .btn-hatebu.dropdown-toggle:hover, .open > .btn-hatebu.dropdown-toggle:focus, .open > .btn-hatebu.dropdown-toggle.focus {
.btn-hatebu:active:hover, .btn-hatebu:active:focus, .btn-hatebu:active.focus, .btn-hatebu.active:hover, .btn-hatebu.active:focus, .btn-hatebu.active.focus, .open > .btn-hatebu.dropdown-toggle:hover, .open > .btn-hatebu.dropdown-toggle:focus, .open > .btn-hatebu.dropdown-toggle.focus {
color: #fff;
background-color: #0f5c8f;
border-color: #0a3f61;
Expand Down Expand Up @@ -180,7 +180,7 @@ body {

.social {
padding: 10px 0;
background: #eee;
background: #eeeeee;
}

.jumbotron.special {
Expand Down Expand Up @@ -216,7 +216,7 @@ body {
}
.jumbotron.special .basedon {
margin: 11px auto;
color: #777;
color: #777777;
text-shadow: #fff 0 1px 2px;
}

Expand Down Expand Up @@ -295,17 +295,17 @@ section.section .subtitle h2 {
background-position: center center;
-webkit-background-size: contain;
background-size: contain;
opacity: .3;
opacity: 0.3;
}

.featured .subtitle h2 {
font-size: 24px;
}
.featured ul.featured-list a {
opacity: .7;
opacity: 0.7;
}
.featured ul.featured-list a:hover, .featured ul.featured-list a:active, .featured ul.featured-list a:focus {
opacity: .5;
opacity: 0.5;
}
.featured ul.featured-list li {
padding: 6px 20px;
Expand All @@ -315,13 +315,13 @@ section.section .subtitle h2 {
background: #fff;
}
.thumbnail > a:hover, .thumbnail > a:active, .thumbnail > a:focus {
opacity: .7;
opacity: 0.7;
}

footer {
padding: 40px 0;
color: #eee;
background-color: #333;
color: #eeeeee;
background-color: #333333;
}
footer .copyright {
padding-top: 10px;
Expand Down
Loading

0 comments on commit 328f612

Please sign in to comment.