Merge branch 'develop'

CHANGELOG.md

@@ -1,4 +1,11 @@
-# Change log
+# ChangeLog
+
+## 1.0.2
+
+* [#29](https://github.com/akabekobeko/redmine-theme-minimalflat2/issues/29) Fixed the left border of the display tab of Settings screen.
+* [#28](https://github.com/akabekobeko/redmine-theme-minimalflat2/issues/28) Change the appearance of the button
+* [#27](https://github.com/akabekobeko/redmine-theme-minimalflat2/issues/27) Fixed icon display is broken problem in the context menu of issues
+* [#25](https://github.com/akabekobeko/redmine-theme-minimalflat2/issues/25) Fixed multiple selection doesn't work problem of issues 
 
 ## 1.0.1
 
@@ -7,7 +14,7 @@
 * [#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
+* [#17](https://github.com/akabekobeko/redmine-theme-minimalflat2/issues/17) Fixed "TD" of the repository list is centered
 
 ## 1.0.0
 

README.md

@@ -27,7 +27,7 @@ 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|
 
-# Change history
+# ChangeLog
 
 * [CHANGELOG](CHANGELOG.md)
 

package.json

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

src/javascripts/theme.js

@@ -18,7 +18,12 @@
     function imageToIcon( target, icon ) {
       $( target ).each( function() {
         var title = $( this ).attr( 'alt' );
-        $( this ).replaceWith( $( '<i>' ).addClass( icon ).attr( 'title', title ) );
+        $( this ).replaceWith( $( '<i>' ).addClass( icon ).attr( 'title', title ).on( 'click', function() {
+          if( target === 'img[src*="toggle_check.png"]' && typeof toggleIssuesSelection === 'function' ) {
+            toggleIssuesSelection( $( this ).parent() );
+            return false;
+          }
+        } ) );
       } );
     }
 

src/stylus/Form.styl

@@ -24,31 +24,29 @@ textarea {
 
 // Submit button
 input[type="submit"] {
-  background-color color_white
-  border solid 2px color_blue
-  color color_blue
-  padding .2em .5em
+  background-color color_blue
+  border solid 1px color_blue
+  color color_white
+  padding .3em 1em
   border-radius .2em
-  letter-spacing .09em
+  letter-spacing .12em
 
   &:hover {
-    background-color color_blue
-    color color_white
+    opacity .8
   }
 }
 
 // Normal button
 input[type="button"] {
-  background-color color_white
-  border solid 2px color_green
-  color color_green
-  padding .2em .5em
+  background-color color_green
+  border solid 1px color_green
+  color color_white
+  padding .3em 1em
   border-radius .2em
-  letter-spacing .09em
+  letter-spacing .12em
 
   &:hover {
-    background-color color_green
-    color color_white
+    opacity .8
   }
 }
 

src/stylus/Tabs.styl

@@ -25,8 +25,8 @@
     position relative
     margin-bottom -1px
 
-    &:first-child {
-      border-left 1px solid color_gray_light_a
+    &:last-child {
+      border-right 1px solid color_gray_light_a
     }
   }
 
@@ -37,7 +37,7 @@
     line-height 1.3em
     padding .3em .5em
     border-top 2px solid color_gray_light_a
-    border-right 1px solid color_gray_light_a
+    border-left 1px solid color_gray_light_a
     border-bottom 1px solid color_gray_light_a
     background-color color_gray_light_c
     color color_gray_dark

src/stylus/Widget.styl

@@ -187,3 +187,8 @@
   background #fafafa
   border 0px
 }
+
+#context-menu a[class^="icon-"], #context-menu a[class*=" icon-"] {
+  background none !important
+  margin-left -1.2em !important
+}