Merge pull request #4 from kubosho/merge/honoka

Honoka v3.3.5b マージ + 配色の変更

Gruntfile.js

@@ -1,22 +1,63 @@
 'use strict';
 
 module.exports = function(grunt) {
-	var pkg, taskName, ect_var;
+	var pkg, taskName, name;
 	pkg = grunt.file.readJSON('package.json');
+	name = pkg.name.toLowerCase();
 	grunt.initConfig({
 		// bannerの調整
 		replace: {
+			// バージョン表記
+			version: {
+				src: ['dist/css/bootstrap.**css'],
+				dest: 'dist/css/',
+				replacements: [
+					{
+						from: '{%version%}',
+						to: pkg.version
+					},
+					{
+						from: '{%website%}',
+						to: pkg.website
+					},
+					{
+						from: '{%year%}',
+						to: new Date().getFullYear()
+					},
+					{
+						from: '{%author%}',
+						to: pkg.author
+					},
+					{
+						from: '{%license%}',
+						to: pkg.license
+					}
+				]
+			},
+			// minifyファイルの改行の追加
 			banner: {
 				src: ['dist/css/bootstrap.min.css'],
 				dest: 'dist/css/bootstrap.min.css',
-				replacements: [{
-					from: '@charset "UTF-8";/*!',
-					to: '@charset "UTF-8";\n/*!',
-				},
-				{
-					from: 'Based on Bootstrap\n */',
-					to: 'Based on Bootstrap\n */\n'
-				}]
+				replacements: [
+					{
+						from: '@charset "UTF-8";/*!',
+						to: '@charset "UTF-8";\n/*!'
+					},
+					{
+						from: /Based on Bootstrap v([\d\.]+)\n \*\//g,
+						to: 'Based on Bootstrap v$1\n */\n'
+					}
+				]
+			},
+			basedon: {
+				src: ['dist/css/bootstrap.**css'],
+				dest: 'dist/css/',
+				replacements: [
+					{
+						from: '{%version%}',
+						to: pkg.version
+					}
+				]
 			}
 		},
 		// cssmin
@@ -69,7 +110,7 @@ module.exports = function(grunt) {
 			// compassの自動コンパイル
 			compass: {
 				files: ['src/compass/**/*.scss'],
-				tasks: ['compass:dist'],
+				tasks: ['compass:dist', 'replace:version'],
 			}
 		},
 		// テストサーバ
@@ -85,41 +126,41 @@ module.exports = function(grunt) {
 		compress: {
 			main: {
 				options: {
-					archive: 'data/bootstrap-nico-'+ pkg.version +'-dist.zip'
+					archive: 'data/bootstrap-'+ name +'-'+ pkg.version +'-dist.zip'
 				},
 				files: [
 					{
 						//CSS
 						expand: true,
 						cwd: "dist/css/",
 						src: ["bootstrap**.css"],
-						dest: "nico/css"
+						dest: name +"/css"
 					},
 					{
 						// Font
 						expand: true,
 						cwd: "dist/fonts/",
 						src: ["**/*"],
-						dest: "nico/fonts"
+						dest: name +"/fonts"
 					},
 					{
 						// JavaScript
 						expand: true,
 						cwd: "dist/js/",
 						src: ["bootstrap.**js"],
-						dest: "nico/js"
+						dest: name +"/js"
 					},
 					{
 						// Sample html
 						expand: true,
 						cwd: "dist/",
 						src: ["bootstrap.html"],
-						dest: "nico"
+						dest: name
 					},
 					{
 						// README
 						src: ["README.md"],
-						dest: "nico"
+						dest: name
 					}
 				]
 			},
@@ -137,7 +178,7 @@ module.exports = function(grunt) {
 	grunt.registerTask('server', ['compass:dist', 'connect', 'watch']);
 
 	// ミニファイ
-	grunt.registerTask('build', ['clean:build', 'copy:build', 'compass:dist', 'cssmin:minify', 'replace:banner']);
+	grunt.registerTask('build', ['clean:build', 'copy:build', 'compass:dist', 'cssmin:minify', 'replace:banner', 'replace:version']);
 
 	// 配布用パッケージ作成
 	grunt.registerTask('package', ['build', 'compress:main']);

dist/bootstrap-ja.html

@@ -1053,8 +1053,8 @@ <h2>List groups</h2>
         <div class="bs-component">
           <div class="list-group">
             <a href="#" class="list-group-item">
-              <h4 class="list-group-item-heading">高坂 穂乃果</h4>
-              <p class="list-group-item-text">μ'sの発起人。いつも笑顔で、行動力に満ちている。</p>
+              <h4 class="list-group-item-heading">矢澤 にこ</h4>
+              <p class="list-group-item-text">アイドルを目指して日夜励んでいる。「にっこにっこにー」が合い言葉。</p>
             </a>
             <a href="#" class="list-group-item">
               <h4 class="list-group-item-heading">絢瀬 絵里</h4>

dist/css/bootstrap.css

@@ -1,13 +1,13 @@
 @charset "UTF-8";
 /*!
- * Nico v3.3.5
- * Website: kubosho.github.io/Nico
- * Copyright 2015 windyakin, Editor: kubosho
+ * Nico v3.3.5b
+ * Website: http://kubosho.github.io/Nico
+ * Copyright 2015 kubosho
  * The MIT License
- * Based on Bootstrap, Honoka
+ * Based on Bootstrap v3.3.5, Honoka
  */
 /*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
-@import url(http://fonts.googleapis.com/css?family=Open+Sans);
+@import url(https://fonts.googleapis.com/css?family=Open+Sans);
 html {
   font-family: sans-serif;
   -ms-text-size-adjust: 100%;
@@ -5953,7 +5953,7 @@ tbody.collapse.in {
   background-color: transparent;
 }
 .navbar-default .navbar-text {
-  color: #fff;
+  color: #222222;
 }
 .navbar-default .navbar-nav > li > a {
   color: #333333;
@@ -6032,7 +6032,7 @@ tbody.collapse.in {
   background-color: transparent;
 }
 .navbar-inverse .navbar-text {
-  color: #222222;
+  color: #fff;
 }
 .navbar-inverse .navbar-nav > li > a {
   color: #eeeeee;
@@ -8294,6 +8294,20 @@ a {
   }
 }
 
+.navbar-default {
+  background-color: #f3d4df;
+}
+
+.navbar-inverse {
+  background-color: #ff50ac;
+}
+
+.navbar-inverse .navbar-nav > li > a:focus,
+.navbar-inverse .navbar-nav > li > a:hover {
+  background-color: #ff92cb;
+  color: #fff;
+}
+
 .navbar-brand {
   font-size: 20px;
   margin-right: 5px;

package.json

@@ -1,10 +1,10 @@
 {
   "name": "Nico",
-  "version": "3.3.5",
+  "version": "3.3.5b",
   "description": "\"Nico\" a fork of Honoka which is a Bootstrap theme.",
   "author": "kubosho",
   "website": "http://kubosho.github.io/Nico",
-  "license": "MIT License",
+  "license": "MIT",
   "main": "Gruntfile.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

src/compass/css/bootstrap.scss

@@ -2,11 +2,11 @@
 
 @import "nico/variables";
 /*!
- * Nico v#{$bootstrap-version}
- * Website: kubosho.github.io/Nico
- * Copyright 2015 windyakin, Editor: kubosho
- * The MIT License
- * Based on Bootstrap, Honoka
+ * Nico v{%version%}
+ * Website: {%website%}
+ * Copyright {%year%} {%author%}
+ * The {%license%} License
+ * Based on Bootstrap v#{$bootstrap-version}, Honoka
  */
 // Core variables and mixins
 @import "bootstrap/mixins";

src/compass/css/nico/_override.scss

@@ -1,5 +1,5 @@
 // font
-@import url(http://fonts.googleapis.com/css?family=Open+Sans);
+@import url(https://fonts.googleapis.com/css?family=Open+Sans);
 
 @import "compass";
 @import "compass/css3";
@@ -33,7 +33,7 @@ a {
 				border-radius:  $border-radius-large;
 			}
 			> .dropdown-menu {
-				margin-top: -$navbar-padding-vertical/4*3;	
+				margin-top: -$navbar-padding-vertical/4*3;
 			}
 		}
 		> li:not(:last-child) {
@@ -42,6 +42,20 @@ a {
 	}
 }
 
+.navbar-default {
+    background-color: #f3d4df;
+}
+
+.navbar-inverse {
+    background-color: #ff50ac;
+}
+
+.navbar-inverse .navbar-nav > li > a:focus,
+.navbar-inverse .navbar-nav > li > a:hover {
+    background-color: #ff92cb;
+    color: #fff;
+}
+
 .navbar-brand {
 	font-size: $font-size-large;
 	margin-right: $navbar-padding-horizontal/3;

src/compass/css/nico/_variables.scss

@@ -369,7 +369,7 @@ $navbar-padding-horizontal:        floor(($grid-gutter-width / 2)) !default;
 $navbar-padding-vertical:          (($navbar-height - $line-height-computed) / 2) !default;
 $navbar-collapse-max-height:       340px !default;
 
-$navbar-default-color:             #fff !default;
+$navbar-default-color:             $gray-darker !default;
 $navbar-default-bg:                #fff !default;
 $navbar-default-border:            darken($navbar-default-bg, 6.5%) !default;
 
@@ -395,7 +395,7 @@ $navbar-default-toggle-border-color:       #ddd !default;
 
 //=== Inverted navbar
 // Reset inverted navbar basics
-$navbar-inverse-color:                      $gray-darker !default;
+$navbar-inverse-color:                      #fff !default;
 $navbar-inverse-bg:                         $gray-darker !default;
 $navbar-inverse-border:                     darken($navbar-inverse-bg, 10%) !default;