Merge pull request #14 from kubosho/feature/merge-honoka

merge honoka v3.3.7-a
kubosho · Nov 1, 2016 · ccba36e · ccba36e
2 parents 429a97f + 580bedb
commit ccba36e
Show file tree

Hide file tree

Showing 15 changed files with 158 additions and 39 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.2.3
+2.3.0
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: node_js
 
 node_js:
-  - '4.2'
+  - '6.9'
 
 sudo: false
 
@@ -23,8 +23,8 @@ git:
   submodules: false
 
 before_install:
-  - rvm install 2.2.3
-  - rvm use 2.2.3 --fuzzy
+  - rvm install 2.3.0
+  - rvm use 2.3.0 --fuzzy
   - export GEMDIR=$(rvm gemdir)
   - ruby --version
   - gem --version

diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,7 @@
 # Pull gems from RubyGems
 source 'https://rubygems.org'
 
-gem 'sass', '~> 3.4.19'
-gem 'scss_lint', '~> 0.47.0'
+gem 'sass', '~> 3.x'
+gem 'scss_lint', '~> 0.x'
 gem 'windows-pr' if RUBY_PLATFORM =~ /win32/i || RUBY_PLATFORM =~ /mingw32/i
 gem 'win32console' if RUBY_PLATFORM =~ /win32/i || RUBY_PLATFORM =~ /mingw32/i
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,18 +1,18 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    rake (10.5.0)
+    rake (11.3.0)
     sass (3.4.22)
-    scss_lint (0.47.1)
-      rake (>= 0.9, < 11)
-      sass (~> 3.4.15)
+    scss_lint (0.50.2)
+      rake (>= 0.9, < 12)
+      sass (~> 3.4.20)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  sass (~> 3.4.19)
-  scss_lint (~> 0.47.0)
+  sass (~> 3.x)
+  scss_lint (~> 0.x)
 
 BUNDLED WITH
    1.11.0
diff --git a/appveyor.yml b/appveyor.yml
@@ -4,8 +4,8 @@ init:
   - git config --global core.autocrlf true
 
 environment:
-  nodejs_version: 4.2.2
-  ruby_verison: 22-x64
+  nodejs_version: 6.9.1
+  ruby_version: 23-x64
 
 install:
   - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
@@ -1,6 +1,6 @@
 @charset "UTF-8";
 /*!
- * Nico v3.3.7-1.2.0
+ * Nico v3.3.7-1.2.1
  * Website http:http://nico.kubosho.com
  * Copyright 2015 kubosho
  * The MIT License
@@ -12,8 +12,68 @@
  * 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);
+@font-face {
+  font-family: "Yu Gothic";
+  font-weight: 100;
+
+  src: local("Yu Gothic Medium");
+}
+@font-face {
+  font-family: "Yu Gothic";
+  font-weight: 200;
+
+  src: local("Yu Gothic Medium");
+}
+@font-face {
+  font-family: "Yu Gothic";
+  font-weight: 300;
+
+  src: local("Yu Gothic Medium");
+}
+@font-face {
+  font-family: "Yu Gothic";
+  font-weight: 400;
+
+  src: local("Yu Gothic Medium");
+}
+@font-face {
+  font-family: "Yu Gothic";
+  font-weight: bold;
+
+  src: local("Yu Gothic Bold");
+}
+@font-face {
+  font-family: "Yu Mincho";
+  font-weight: 100;
+
+  src: local("Yu Mincho Medium");
+}
+@font-face {
+  font-family: "Yu Mincho";
+  font-weight: 200;
+
+  src: local("Yu Mincho Medium");
+}
+@font-face {
+  font-family: "Yu Mincho";
+  font-weight: 300;
+
+  src: local("Yu Mincho Medium");
+}
+@font-face {
+  font-family: "Yu Mincho";
+  font-weight: 400;
+
+  src: local("Yu Mincho Medium");
+}
+@font-face {
+  font-family: "Yu Mincho";
+  font-weight: bold;
+
+  src: local("Yu Mincho Bold");
+}
+/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
 html {
   font-family: sans-serif;
   -webkit-text-size-adjust: 100%;
@@ -2310,7 +2370,7 @@ html {
 }
 
 body {
-  font-family: "Open Sans", "Helvetica Neue", Helvetica, "Arial", "游ゴシック", YuGothic, "ヒラギノ角ゴ ProN W3", "Hiragino Kaku Gothic ProN", "メイリオ", Meiryo, sans-serif;
+  font-family: "Open Sans", "Helvetica Neue", Helvetica, "Arial", "Yu Gothic", YuGothic, "ヒラギノ角ゴ ProN W3", "Hiragino Kaku Gothic ProN", "メイリオ", Meiryo, sans-serif;
   font-size: 16px;
   line-height: 1.5;
   color: #333;
@@ -7542,7 +7602,7 @@ button.close {
   position: absolute;
   z-index: 1070;
   display: block;
-  font-family: "Open Sans", "Helvetica Neue", Helvetica, "Arial", "游ゴシック", YuGothic, "ヒラギノ角ゴ ProN W3", "Hiragino Kaku Gothic ProN", "メイリオ", Meiryo, sans-serif;
+  font-family: "Open Sans", "Helvetica Neue", Helvetica, "Arial", "Yu Gothic", YuGothic, "ヒラギノ角ゴ ProN W3", "Hiragino Kaku Gothic ProN", "メイリオ", Meiryo, sans-serif;
   font-size: 12px;
   font-style: normal;
   font-weight: normal;
@@ -7665,7 +7725,7 @@ button.close {
   display: none;
   max-width: 276px;
   padding: 1px;
-  font-family: "Open Sans", "Helvetica Neue", Helvetica, "Arial", "游ゴシック", YuGothic, "ヒラギノ角ゴ ProN W3", "Hiragino Kaku Gothic ProN", "メイリオ", Meiryo, sans-serif;
+  font-family: "Open Sans", "Helvetica Neue", Helvetica, "Arial", "Yu Gothic", YuGothic, "ヒラギノ角ゴ ProN W3", "Hiragino Kaku Gothic ProN", "メイリオ", Meiryo, sans-serif;
   font-size: 16px;
   font-style: normal;
   font-weight: normal;

diff --git a/dist/css/bootstrap.min.css b/dist/css/bootstrap.min.css
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Nico",
-  "version": "3.3.7-1.2.0",
+  "version": "3.3.7-1.2.1",
   "description": "Nico a fork of Honoka which is a Bootstrap theme.",
   "author": "kubosho",
   "website": "http:http://nico.kubosho.com",
@@ -17,20 +17,20 @@
     "url": "https://github.com/kubosho/Nico.git"
   },
   "devDependencies": {
-    "bower": "^1.7.7",
-    "grunt": "^0.4.5",
+    "bower": "^1.7.9",
+    "grunt": "^1.0.1",
     "grunt-autoprefixer": "^3.0.4",
     "grunt-bower-task": "^0.4.0",
-    "grunt-cli": "^0.1.13",
+    "grunt-cli": "^1.2.0",
     "grunt-contrib-clean": "^1.0.0",
-    "grunt-contrib-compress": "^1.0.0",
-    "grunt-contrib-connect": "^1.0.1",
+    "grunt-contrib-compress": "^1.3.0",
+    "grunt-contrib-connect": "^1.0.2",
     "grunt-contrib-copy": "^1.0.0",
-    "grunt-contrib-cssmin": "^1.0.1",
+    "grunt-contrib-cssmin": "^1.0.2",
     "grunt-contrib-sass": "^1.0.0",
     "grunt-contrib-watch": "^1.0.0",
-    "grunt-csscomb": "^3.1.0",
-    "grunt-scss-lint": "^0.3.8",
+    "grunt-csscomb": "^3.1.1",
+    "grunt-scss-lint": "^0.5.0",
     "grunt-text-replace": "^0.4.0"
   }
 }
diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss
@@ -1,3 +1,3 @@
 @charset "UTF-8";
 
-@import "nico/nico";
+@import "honoka/honoka";
diff --git a/scss/honoka/_font.scss b/scss/honoka/_font.scss
@@ -0,0 +1,58 @@
+@charset "UTF-8";
+
+// Open Sans
+@import url(#{$font-family-open-sans-import-path});
+
+// Yu Gothic (for Windows)
+@font-face {
+	font-family: "Yu Gothic";
+	src: local("Yu Gothic Medium");
+	font-weight: 100;
+}
+@font-face {
+	font-family: "Yu Gothic";
+	src: local("Yu Gothic Medium");
+	font-weight: 200;
+}
+@font-face {
+	font-family: "Yu Gothic";
+	src: local("Yu Gothic Medium");
+	font-weight: 300;
+}
+@font-face {
+	font-family: "Yu Gothic";
+	src: local("Yu Gothic Medium");
+	font-weight: 400;
+}
+@font-face {
+	font-family: "Yu Gothic";
+	src: local("Yu Gothic Bold");
+	font-weight: bold;
+}
+
+// Yu Mincho (for Windows)
+@font-face {
+	font-family: "Yu Mincho";
+	src: local("Yu Mincho Medium");
+	font-weight: 100;
+}
+@font-face {
+	font-family: "Yu Mincho";
+	src: local("Yu Mincho Medium");
+	font-weight: 200;
+}
+@font-face {
+	font-family: "Yu Mincho";
+	src: local("Yu Mincho Medium");
+	font-weight: 300;
+}
+@font-face {
+	font-family: "Yu Mincho";
+	src: local("Yu Mincho Medium");
+	font-weight: 400;
+}
+@font-face {
+	font-family: "Yu Mincho";
+	src: local("Yu Mincho Bold");
+	font-weight: bold;
+}
diff --git a/scss/nico/_nico.scss → scss/honoka/_honoka.scss b/scss/nico/_nico.scss → scss/honoka/_honoka.scss
@@ -6,6 +6,9 @@
 @import "bootstrap/mixins";
 @import "mixins";
 
+// Honoka Font Setting
+@import "font";
+
 @import "bootstrap/normalize";
 @import "bootstrap/grid";
 @import "bootstrap/print";
@@ -53,4 +56,5 @@
 @import "bootstrap/utilities";
 @import "bootstrap/responsive-utilities";
 
+// Honoka Original Setting
 @import "override";
diff --git a/scss/nico/_mixins.scss → scss/honoka/_mixins.scss b/scss/nico/_mixins.scss → scss/honoka/_mixins.scss
diff --git a/scss/nico/_override.scss → scss/honoka/_override.scss b/scss/nico/_override.scss → scss/honoka/_override.scss
@@ -1,8 +1,5 @@
 @charset "UTF-8";
 
-// font
-@import url(#{$font-family-open-sans-import-path});
-
 // animation
 a {
 	transition-timing-function: ease;

diff --git a/scss/nico/_variables.scss → scss/honoka/_variables.scss b/scss/nico/_variables.scss → scss/honoka/_variables.scss
@@ -49,9 +49,9 @@ $link-hover-decoration: underline !default;
 //
 //## 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;
+$font-family-humanist-sans-serif: 'Open Sans', 'Helvetica Neue', Helvetica, 'Arial', 'Yu Gothic', 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, 'Yu Mincho', YuMincho, 'ヒラギノ明朝 ProN W3', 'Hiragino Mincho ProN', 'ＭＳ Ｐ明朝', 'MS PMincho', 'MS 明朝', serif !default;
 //** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
 $font-family-monospace:   Consolas, "Liberation Mono", Menlo, Courier, monospace !default;
 $font-family-base:        $font-family-humanist-sans-serif !default;

diff --git a/src/scss/example.scss b/src/scss/example.scss
@@ -2,8 +2,8 @@
 
 @import url(http://fonts.googleapis.com/css?family=Montserrat);
 
-@import "nico/variables";
-@import "nico/mixins";
+@import "honoka/variables";
+@import "honoka/mixins";
 
 $brand-nico: #fec4d8;
 $brand-twitter: #55acee;