Merge branch 'develop'

CHANGELOG.md

@@ -0,0 +1,14 @@
+# Change log
+
+## 1.0.1
+
+* [#24](https://github.com/akabekobeko/redmine-theme-minimalflat2/issues/24) Changed the appearance of the tab
+* [#22](https://github.com/akabekobeko/redmine-theme-minimalflat2/issues/22) Added the version number to the name of the release for the ZIP file
+* [#21](https://github.com/akabekobeko/redmine-theme-minimalflat2/issues/21) Added a README file of Japanese ( README.ja.md )
+* [#20](https://github.com/akabekobeko/redmine-theme-minimalflat2/issues/20) Compress the release for the ZIP file in the root directory included
+* [#18](https://github.com/akabekobeko/redmine-theme-minimalflat2/issues/18) Changed the layouts and colors
+* [#17](https://github.com/akabekobeko/redmine-theme-minimalflat2/issues/17) Fixed td of the repository list is centered
+
+## 1.0.0
+
+* First release

README.ja.md

@@ -0,0 +1,39 @@
+# minimalflat2
+
+簡素でフラットな外観の Redmine テーマです。
+
+![Projects](ss.png)
+
+# 機能
+
+* 簡素でフラットな外観
+* モダンな配色
+ * [Flat UI](http://designmodo.github.io/Flat-UI/)
+ * [Espresso](https://github.com/mbadolato/iTerm2-Color-Schemes)
+* 解像度に依存しないアイコン画像
+ * [IcoMoon](https://icomoon.io/)
+* 開閉可能なプロジェクト一覧画面
+* Favicon 対応 ( Redmine 2.5 以降 )
+
+# インストール方法
+
+1. [release page](https://github.com/akabekobeko/redmine-theme-minimalflat2/releases) から ZIP ファイルをダウンロード 
+2. ZIP ファイルを展開し、Redmine ディレクトリ内の `public/themes/minimalflat2` に配置
+3. Redmine から **管理 > 設定 > 表示** へアクセス
+4. **テーマ** から **minimalflat2** を選択して設定を保存
+
+# ライブラリ
+
+|Library|Author|License|
+|:--|:--|:--|
+|[IcoMoon - Free](https://icomoon.io/#icons)|[Keyamoon](http://keyamoon.com/)|GPL/CC BY 4.0|
+|[Entypo](http://www.entypo.com/)|[Daniel Bruce](http://danielbruce.se/)|CC BY-SA 4.0|
+|[bymathias/normalize.styl](https://github.com/bymathias/normalize.styl)|[Mathias Brouilly](http://mathias.brouilly.fr/)|MIT|
+
+# 更新履歴
+
+* [CHANGELOG](CHANGELOG.md)
+
+# ライセンス
+
+* [GNU GENERAL PUBLIC LICENSE Version 2](LICENSE.txt)

README.md

@@ -14,10 +14,10 @@ Minimal and flat design theme for Redmine.
 
 # Installation
 
-1. Download archive ( minimalflat2.zip ) from [release page](https://github.com/akabekobeko/redmine-theme-minimalflat2/releases)
-2. Extract archive, and move to `public/themes/minimalflat` at Redmine directory
+1. Download zip file from [release page](https://github.com/akabekobeko/redmine-theme-minimalflat2/releases)
+2. Extract zip file, and move to `public/themes/minimalflat` at Redmine directory
 3. Open Redmine page, and go to **Administration > Settings > Display**
-4. Enable the **minimalflat2** from **Theme**
+4. Enable the **minimalflat2** from **Theme**, and **save** settings
 
 # Libraries
 
@@ -27,10 +27,10 @@ Minimal and flat design theme for Redmine.
 |[Entypo](http://www.entypo.com/)|[Daniel Bruce](http://danielbruce.se/)|CC BY-SA 4.0|
 |[bymathias/normalize.styl](https://github.com/bymathias/normalize.styl)|[Mathias Brouilly](http://mathias.brouilly.fr/)|MIT|
 
-# License
+# Change history
 
-* [GNU GENERAL PUBLIC LICENSE Version 2](LICENSE.txt)
+* [CHANGELOG](CHANGELOG.md)
 
-# Change log
+# License
 
-* 2015/09/06 : v1.0.0 release
+* [GNU GENERAL PUBLIC LICENSE Version 2](LICENSE.txt)

gulpfile.js

@@ -5,13 +5,14 @@ var $    = require( 'gulp-load-plugins' )();
 var common = {
   src:       './src',
   dest:      './dist',
+  archive:   './dist/minimalflat2',
   isRelease: false
 };
 
 // Stylus コンパイルと結合
 gulp.task( 'build:css', function() {
   var isSourceMaps = !( common.isRelease );
-  var dest         = ( common.isRelease ? common.dest : common.src );
+  var dest         = ( common.isRelease ? common.archive : common.src );
 
   return gulp.src( [ common.src + '/stylus/App.styl' ] )
     .pipe( $.plumber() )
@@ -25,7 +26,7 @@ gulp.task( 'build:css', function() {
 // リリース用イメージ削除
 gulp.task( 'release:clean', function( done ) {
   var del = require( 'del' );
-  del( [ common.dest, './minimalflat2.zip' ], done );
+  del( [ common.dest, './*.zip' ], done );
 } );
 
 gulp.task( 'release:css', [ 'release:clean' ], function( done ) {
@@ -43,7 +44,7 @@ gulp.task( 'release:copy-doc', [ 'release:css' ], function() {
   ];
 
   return gulp.src( src )
-    .pipe( gulp.dest( common.dest ) );
+    .pipe( gulp.dest( common.archive ) );
 } );
 
 // リリース用ファイルのコピー
@@ -55,13 +56,16 @@ gulp.task( 'release:copy', [ 'release:copy-doc' ], function() {
   ];
 
   return gulp.src( src, { base: common.src } )
-    .pipe( gulp.dest( common.dest ) );
+    .pipe( gulp.dest( common.archive ) );
 } );
 
 // リリース用イメージのビルドと ZIP イメージ生成
 gulp.task( 'release', [ 'release:copy', 'release:css' ], function() {
+  var pkg      = require( './package.json' );
+  var filename = 'minimalflat2-v' + pkg.version + '.zip';
+
   return gulp.src( common.dest + '/**/*.*' )
-    .pipe( $.zip( 'minimalflat2.zip' ) )
+    .pipe( $.zip( filename ) )
     .pipe( gulp.dest( './' ) );
 } );
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "redmine-theme-minimalflat2",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Minimal and flat design theme for Redmine.",
   "main": "index.js",
   "scripts": {

src/stylus/Base.styl

@@ -81,8 +81,8 @@ a {
 table.cal {
   border-collapse collapse
   width 100%
-  margin 0px 0 6px 0
-  border 1px solid #d7d7d7
+  margin 0 0 6px 0
+  border 1px solid color_gray_light_a
   font-size .8em
 
   thead th {
@@ -166,7 +166,7 @@ p.cal.legend span {
 
   &:hover{
     z-index 25
-    color #000
+    color color_black
   }
 
   span.tip {
@@ -181,11 +181,10 @@ div.tooltip:hover span.tip {
   top 12px
   left 24px
   width 270px
-  border 1px solid #555
-  background-color #fff
-  padding 4px
-  font-size 0.8em
-  color #505050
+  border 1px solid color_gray_dark
+  background-color color_white
+  padding .5em
+  font-size .8em
 }
 
 img.ui-datepicker-trigger {
@@ -294,15 +293,15 @@ a.close-icon:hover {
   }
 
   #main {
-    background #fff
+    background color_white
   }
 
   #content {
     width 99%
     margin 0
     padding 0
     border 0
-    background #fff
+    background color_white
     overflow visible !important
   }
 
@@ -322,7 +321,7 @@ a.close-icon:hover {
     margin-top .5em
 
     th, td {
-      border 1px solid #aaa
+      border 1px solid color_gray_light_a
     }
   }
 }
@@ -339,7 +338,7 @@ a.close-icon:hover {
 
 img.gravatar {
   padding 2px
-  border solid 1px #d5d5d5
+  border solid 1px color_gray
   background color_white
   vertical-align middle
 }

src/stylus/Form.styl

@@ -66,7 +66,7 @@ input[type="checkbox"] {
   left 40%
   width 20%
   padding .6em
-  border 1px solid #bbb
+  border 1px solid color_gray
   font-weight bold
   text-align center
 
@@ -297,12 +297,12 @@ div.attachments {
   }
 
   span.author {
-    font-size 0.9em
+    font-size .9em
   }
 }
 
 div.thumbnails {
-  margin-top 0.6em
+  margin-top .6em
 
   div {
     border 2px solid color_gray
@@ -465,11 +465,11 @@ input.autocomplete {
     column-width 200px
     -webkit-column-count auto
     -webkit-column-width 200px
-    -webkit-column-gap 0.5rem
-    -webkit-column-rule 1px solid #ccc
+    -webkit-column-gap .5rem
+    -webkit-column-rule 1px solid color_gray_light_a
     -moz-column-count auto
     -moz-column-width 200px
     -moz-column-gap .5rem
-    -moz-column-rule 1px solid #ccc
+    -moz-column-rule 1px solid color_gray_light_a
   }
 }

src/stylus/JSToolbar.styl

@@ -37,11 +37,7 @@
       padding 0
 
       &:before {
-        content "\f059"
-        font-family FontAwesome
-        color #3498db
-        margin-right .3em
-        font-size 1.2em
+        icon( icon_help, color_blue )
       }
     }
   }

src/stylus/Layout.styl

@@ -150,22 +150,23 @@
   li {
     float left
     list-style-type none
-    margin 0 2px 0 0
-    padding .3em 0
     white-space nowrap
 
     a {
       display block
+      border-top solid 2px color_indigo_light
+      border-bottom solid 2px color_indigo_light
       color color_gray
       text-decoration none
-      margin 0
-      padding .4em .8em .4em .8em
+      padding .5em 1em
 
       &:hover {
+        border-top solid 2px color_yellow
         color color_white
       }
 
-      &.selected, &.selected:hover {
+      &.selected {
+        border-top solid 2px color_red
         color color_white
       }
     }
@@ -282,7 +283,7 @@
     width 100%
     margin 0 auto
     height 1px
-    background color_gray
+    background color_gray_light_a
     border 0
   }
 
@@ -309,7 +310,7 @@
     width 95%
     position relative
     left -6px
-    color #ccc
+    color color_gray_light_a
   }
 }
 
@@ -319,7 +320,7 @@
   width 75%
   margin 0
   padding 6px 10px 10px 10px
-  border-right 1px solid #ddd
+  border-right 1px solid color_gray_light_a
   background-color color_page_back
 }
 
@@ -342,7 +343,7 @@ html > body #content {
 // Footer
 #footer {
   clear both
-  border-top 1px solid color_gray
+  border-top 1px solid color_gray_light_a
   font-size .9em
   color color_gray_dark
   padding 5px
@@ -401,7 +402,7 @@ input#openid_url {
   padding-left 18px
 }
 
-.clear:after{
+.clear:after {
   content "."
   display block
   height 0