Skip to content

Commit

Permalink
Merge branch 'honoka-master'
Browse files Browse the repository at this point in the history
  • Loading branch information
SAKATA Sinji committed Feb 6, 2016
2 parents 31b961b + 8a0fab5 commit 7c5d248
Show file tree
Hide file tree
Showing 10 changed files with 125 additions and 52 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
12 changes: 10 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,25 @@

### Download

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

### Bower

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

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

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

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

```
bower install --save-dev Umi#(version)
```

``(version)``にはバージョン番号を指定します(ex. ``Honoka#3.3.6-1``)。Umiの最新バージョン番号は[Relases](https://github.com/NKMR6194/Umi/releases)から確認してください。
``(version)``にはバージョン番号を指定します(ex. ``Honoka#3.3.6-1``)。Umiの最新バージョン番号は[Releases](https://github.com/NKMR6194/Umi/releases)から確認してください。

## Usage

Expand Down
12 changes: 6 additions & 6 deletions dist/assets/css/example.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 Down Expand Up @@ -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 Down Expand Up @@ -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
34 changes: 20 additions & 14 deletions dist/css/bootstrap.css
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
@charset "UTF-8";
/*!
* Umi v3.3.6-1
* Umi v3.3.6-2
* Website https://nkmr6194.github.io/Umi/
* Copyright 2015 SAKATA Sinji
* The MIT License
* Based on Bootstrap v3.3.6 (http://getbootstrap.com)
* Based on Honoka (http://honokak.osaka/) by windyakin
*/
/*!
* Bootstrap v3.3.6 (http://getbootstrap.com)
* Copyright 2011-2016 Twitter, Inc.
* Licensed under the MIT license
*/

/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
@import url(https://fonts.googleapis.com/css?family=Open+Sans);
html {
Expand Down Expand Up @@ -4636,12 +4642,12 @@ a.btn.disabled, fieldset[disabled] a.btn {
background-color: #e6e6e6;
border-color: #adadad;
}
.btn-default.active, .btn-default.active, .open > .btn-default.dropdown-toggle {
.btn-default:active, .btn-default.active, .open > .btn-default.dropdown-toggle {
color: #333;
background-color: #f2f2f2;
border-color: #bdbdbd;
}
.btn-default.active:hover, .btn-default.active:focus, .btn-default.active.focus, .btn-default.active:hover, .btn-default.active:focus, .btn-default.active.focus, .open > .btn-default.dropdown-toggle:hover, .open > .btn-default.dropdown-toggle:focus, .open > .btn-default.dropdown-toggle.focus {
.btn-default:active:hover, .btn-default:active:focus, .btn-default:active.focus, .btn-default.active:hover, .btn-default.active:focus, .btn-default.active.focus, .open > .btn-default.dropdown-toggle:hover, .open > .btn-default.dropdown-toggle:focus, .open > .btn-default.dropdown-toggle.focus {
color: #333;
background-color: #d4d4d4;
border-color: #8c8c8c;
Expand Down Expand Up @@ -4682,12 +4688,12 @@ a.btn.disabled, fieldset[disabled] a.btn {
background-color: #1a252f;
border-color: #131a22;
}
.btn-primary.active, .btn-primary.active, .open > .btn-primary.dropdown-toggle {
.btn-primary:active, .btn-primary.active, .open > .btn-primary.dropdown-toggle {
color: #fff;
background-color: #233140;
border-color: #1e2a36;
}
.btn-primary.active:hover, .btn-primary.active:focus, .btn-primary.active.focus, .btn-primary.active:hover, .btn-primary.active:focus, .btn-primary.active.focus, .open > .btn-primary.dropdown-toggle:hover, .open > .btn-primary.dropdown-toggle:focus, .open > .btn-primary.dropdown-toggle.focus {
.btn-primary:active:hover, .btn-primary:active:focus, .btn-primary:active.focus, .btn-primary.active:hover, .btn-primary.active:focus, .btn-primary.active.focus, .open > .btn-primary.dropdown-toggle:hover, .open > .btn-primary.dropdown-toggle:focus, .open > .btn-primary.dropdown-toggle.focus {
color: #fff;
background-color: #0d1318;
border-color: black;
Expand Down Expand Up @@ -4728,12 +4734,12 @@ a.btn.disabled, fieldset[disabled] a.btn {
background-color: #128f76;
border-color: #107d67;
}
.btn-success.active, .btn-success.active, .open > .btn-success.dropdown-toggle {
.btn-success:active, .btn-success.active, .open > .btn-success.dropdown-toggle {
color: #fff;
background-color: #15a589;
border-color: #13987e;
}
.btn-success.active:hover, .btn-success.active:focus, .btn-success.active.focus, .btn-success.active:hover, .btn-success.active:focus, .btn-success.active.focus, .open > .btn-success.dropdown-toggle:hover, .open > .btn-success.dropdown-toggle:focus, .open > .btn-success.dropdown-toggle.focus {
.btn-success:active:hover, .btn-success:active:focus, .btn-success:active.focus, .btn-success.active:hover, .btn-success.active:focus, .btn-success.active.focus, .open > .btn-success.dropdown-toggle:hover, .open > .btn-success.dropdown-toggle:focus, .open > .btn-success.dropdown-toggle.focus {
color: #fff;
background-color: #0e6f5c;
border-color: #084237;
Expand Down Expand Up @@ -4774,12 +4780,12 @@ a.btn.disabled, fieldset[disabled] a.btn {
background-color: #217dbb;
border-color: #1e72aa;
}
.btn-info.active, .btn-info.active, .open > .btn-info.dropdown-toggle {
.btn-info:active, .btn-info.active, .open > .btn-info.dropdown-toggle {
color: #fff;
background-color: #258cd1;
border-color: #2383c4;
}
.btn-info.active:hover, .btn-info.active:focus, .btn-info.active.focus, .btn-info.active:hover, .btn-info.active:focus, .btn-info.active.focus, .open > .btn-info.dropdown-toggle:hover, .open > .btn-info.dropdown-toggle:focus, .open > .btn-info.dropdown-toggle.focus {
.btn-info:active:hover, .btn-info:active:focus, .btn-info:active.focus, .btn-info.active:hover, .btn-info.active:focus, .btn-info.active.focus, .open > .btn-info.dropdown-toggle:hover, .open > .btn-info.dropdown-toggle:focus, .open > .btn-info.dropdown-toggle.focus {
color: #fff;
background-color: #1c699d;
border-color: #144c71;
Expand Down Expand Up @@ -4820,12 +4826,12 @@ a.btn.disabled, fieldset[disabled] a.btn {
background-color: #c87f0a;
border-color: #b47209;
}
.btn-warning.active, .btn-warning.active, .open > .btn-warning.dropdown-toggle {
.btn-warning:active, .btn-warning.active, .open > .btn-warning.dropdown-toggle {
color: #fff;
background-color: #e08e0b;
border-color: #d2850b;
}
.btn-warning.active:hover, .btn-warning.active:focus, .btn-warning.active.focus, .btn-warning.active:hover, .btn-warning.active:focus, .btn-warning.active.focus, .open > .btn-warning.dropdown-toggle:hover, .open > .btn-warning.dropdown-toggle:focus, .open > .btn-warning.dropdown-toggle.focus {
.btn-warning:active:hover, .btn-warning:active:focus, .btn-warning:active.focus, .btn-warning.active:hover, .btn-warning.active:focus, .btn-warning.active.focus, .open > .btn-warning.dropdown-toggle:hover, .open > .btn-warning.dropdown-toggle:focus, .open > .btn-warning.dropdown-toggle.focus {
color: #fff;
background-color: #a66908;
border-color: #754a06;
Expand Down Expand Up @@ -4866,12 +4872,12 @@ a.btn.disabled, fieldset[disabled] a.btn {
background-color: #d62c1a;
border-color: #c42818;
}
.btn-danger.active, .btn-danger.active, .open > .btn-danger.dropdown-toggle {
.btn-danger:active, .btn-danger.active, .open > .btn-danger.dropdown-toggle {
color: #fff;
background-color: #e43725;
border-color: #df2e1b;
}
.btn-danger.active:hover, .btn-danger.active:focus, .btn-danger.active.focus, .btn-danger.active:hover, .btn-danger.active:focus, .btn-danger.active.focus, .open > .btn-danger.dropdown-toggle:hover, .open > .btn-danger.dropdown-toggle:focus, .open > .btn-danger.dropdown-toggle.focus {
.btn-danger:active:hover, .btn-danger:active:focus, .btn-danger:active.focus, .btn-danger.active:hover, .btn-danger.active:focus, .btn-danger.active.focus, .open > .btn-danger.dropdown-toggle:hover, .open > .btn-danger.dropdown-toggle:focus, .open > .btn-danger.dropdown-toggle.focus {
color: #fff;
background-color: #b62516;
border-color: #891c11;
Expand Down
12 changes: 9 additions & 3 deletions dist/css/bootstrap.min.css
View file

Large diffs are not rendered by default.

69 changes: 55 additions & 14 deletions dist/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ <h1>Bootstrap Theme for Japanese.</h1>
<a href="http://honokak.osaka/" class="btn btn-warning btn-lg"><i class="fa fa-rocket"></i> Visit "Honoka"</a>
</div>
<div class="basedon small">
Last version v<span class="last-version"></span> ・ Based on <a href="http://getbootstrap.com/">Bootstrap</a> v3.3.6 and <a href="http://honokak.osaka">Honoka</a>
Last version v<span class="last-version"></span> ・ Based on <a href="http://getbootstrap.com/">Bootstrap</a> v<span class="base-version"></span> and <a href="http://honokak.osaka">Honoka</a>
</div>
</div>
</div>
Expand Down Expand Up @@ -218,8 +218,13 @@ <h2>Available on the Bower</h2>
</div>
</div>
<div class="row">
<div class="col-md-6 col-md-offset-3 col-xs-12 text-center">
<pre>bower install --save-dev Umi#<span class="last-version"></span></pre>
<div class="col-md-8 col-md-offset-2 col-xs-12 text-center">
<div class="input-group">
<input type="text" class="form-control input-lg" id="command" value="bower install --save-dev $(node -e &#34;$(curl -fsSL https://cdn.honokak.osaka/last.js)&#34; NKMR6194 Umi)" onclick="this.select();" readonly="readonly">
<span class="input-group-btn">
<button type="button" class="btn btn-default btn-lg" data-clipboard-target="#command"><i class="fa fa-clipboard"></i></button>
</span>
</div>
<p class="help-block">v3.3.6-1 以降から対応</p>
</div>
</div>
Expand All @@ -245,9 +250,9 @@ <h4>Proconist.net</h4>
</div>
<div class="col-md-4">
<div class="thumbnail">
<a href="http://turnkillquest.x0.com/tkq/"><img src="//cdn.honokak.osaka/assets/img/turnkill.png"></a>
<a href="http://sugoi.windyakin.net/"><img src="//cdn.honokak.osaka/assets/img/sugoi.png"></a>
<div class="caption text-center">
<h4>TurnKillQuest</h4>
<h4>この高専がすごい！</h4>
</div>
</div>
</div>
Expand All @@ -260,6 +265,32 @@ <h4>yashihei.net</h4>
</div>
</div>
</div>
<div class="row">
<div class="col-md-4">
<div class="thumbnail">
<a href="http://sysken.org/advent2015/"><img src="//cdn.honokak.osaka/assets/img/sysken.png"></a>
<div class="caption text-center">
<h4>SYSKEN Advent Calendar</h4>
</div>
</div>
</div>
<div class="col-md-4">
<div class="thumbnail">
<a href="http://timers-inc.com/"><img src="//cdn.honokak.osaka/assets/img/timers-inc.png"></a>
<div class="caption text-center">
<h4>TIMERS Inc</h4>
</div>
</div>
</div>
<div class="col-md-4">
<div class="thumbnail">
<a href="http://ost.procon-online.net/"><img src="//cdn.honokak.osaka/assets/img/ost.png"></a>
<div class="caption text-center">
<h4>PROCON O.S.T. Project</h4>
</div>
</div>
</div>
</div>
</div>
</section>

Expand Down Expand Up @@ -310,18 +341,28 @@ <h2>Honoka has been featured on</h2>
ga('send', 'pageview');
</script>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/clipboard.js/1.5.5/clipboard.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
<script src="js/bootstrap.min.js"></script>
<script>
new Clipboard('.btn');
$(document).ready(function(e) {
$.ajax({
url: 'https://api.github.com/repos/NKMR6194/Umi/releases/latest',
type: 'get',
dataType: 'json'
})
.done(function(data) {
$('.last-version').text(data.tag_name.split('v')[1]);
});
$.when(
$.ajax({
url: 'https://api.github.com/repos/NKMR6194/Umi/releases/latest',
type: 'get',
dataType: 'json'
}),
$.ajax({
url: 'https://cdn.rawgit.com/windyakin/Honoka/master/bower.json',
type: 'get',
dataType: 'json'
})
)
.done(function(last, base) {
$('.last-version').text(last[0].tag_name.split('v')[1]);
$('.base-version').text(base[0].devDependencies.bootstrap);
});
});
</script>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Umi",
"version": "3.3.6-1",
"version": "3.3.6-2",
"description": "Umi is a fork of Honoka which is a Bootstrap theme.",
"author": "SAKATA Sinji",
"website": "https://nkmr6194.github.io/Umi/",
Expand Down
2 changes: 1 addition & 1 deletion scss/honoka/_mixins.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
background-color: darken($background, 10%);
border-color: darken($border, 12%);
}
&.active,
&:active,
&.active,
.open > &.dropdown-toggle {
color: $color;
Expand Down
2 changes: 1 addition & 1 deletion scss/honoka/_override.scss
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@charset "UTF-8";

// font
@import url(https://fonts.googleapis.com/css?family=Open+Sans);
@import url(#{$font-family-open-sans-import-path});

// animation
a {
Expand Down
3 changes: 2 additions & 1 deletion scss/honoka/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ $link-hover-decoration: underline !default;
//== Typography
//
//## Font, line-height, and color for body text, headings, and more.
$font-family-open-sans-import-path: "https://fonts.googleapis.com/css?family=Open+Sans" !default;
$font-family-humanist-sans-serif: 'Open Sans','Helvetica Neue', Helvetica, 'Arial', '游ゴシック', YuGothic, 'ヒラギノ角ゴ ProN W3', 'Hiragino Kaku Gothic ProN', 'メイリオ', Meiryo, sans-serif !default;
$font-family-sans-serif: 'Open Sans','Helvetica Neue', Helvetica, 'Arial', 'ヒラギノ角ゴ ProN W3', 'Hiragino Kaku Gothic ProN', 'メイリオ', Meiryo, sans-serif !default;
$font-family-serif: 'Times New Roman', Times, '游明朝体', YuMincho, 'ヒラギノ明朝 ProN W3', 'Hiragino Mincho ProN', 'ＭＳ Ｐ明朝', 'MS PMincho', 'MS 明朝', serif !default;
Expand Down Expand Up @@ -220,7 +221,7 @@ $input-height-large: (ceil($font-size-large * $line-height-large) +
$input-height-small: (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2) !default;

//** `.form-group` margin
$form-group-margin-bottom: 15px;
$form-group-margin-bottom: 15px !default;

$legend-color: $gray-dark !default;
$legend-border-color: #e5e5e5 !default;
Expand Down

0 comments on commit 7c5d248

Please sign in to comment.