Merge branch 'develop' of https://github.com/gtt-project/redmine_gtt into feature/dev-webpack

Signed-off-by: Taro Matsuzawa <[email protected]>

Author: smellman

lib/redmine_gtt/patches/geojson_attribute.rb

@@ -72,7 +72,7 @@ def geojson
       # doing a single select for each issue
       def geodata_for_print
         if row = self.class.where(id: id).where.not(geom: nil).
-                   pluck(Arel.sql("ST_AsGeoJson(ST_Transform(geom, 3857)) as geojson, ST_Transform(ST_Centroid(geom), 3857) as center")).
+                   pluck(Arel.sql("ST_AsGeoJson(ST_Transform(geom, 3857), 9, 0) as geojson, ST_Transform(ST_Centroid(geom), 3857) as center")).
                    first
           json, center = *row
           {

src/stylesheets/fonts.scss

@@ -1,5 +1,6 @@
 /* Generated by Glyphter (http://www.glyphter.com) on  Thu Jan 19 2017*/
 @font-face {
+<<<<<<< HEAD:src/stylesheets/fonts.scss
   font-family: 'Redmine';
   src: url('../fonts/Redmine.eot');
   src: url('../fonts/Redmine.eot?#iefix') format('embedded-opentype'),
@@ -8,6 +9,13 @@
        url('../fonts/Redmine.svg#Redmine') format('svg');
   font-weight: normal;
   font-style: normal;
+=======
+    font-family: 'Redmine';
+    src: url('../fonts/Redmine.woff') format('woff'),
+         url('../fonts/Redmine.ttf') format('truetype');
+    font-weight: normal;
+    font-style: normal;
+>>>>>>> f01e226debbbcf4ea9f3f19bbec11ba578ef9591:assets/stylesheets/fonts.css
 }
 [class^='gtt-icon-']:before{
 	display: inline-block;
@@ -40,12 +48,10 @@
 .gtt-icon-modify:before{content:'\0051';}
 
 @font-face {
-  font-family: 'mcr-icons';
-  src: url('../fonts/mcr-icons.eot?#iefix') format('embedded-opentype'),
-       url('../fonts/mcr-icons.woff2') format('woff2'),
-       url('../fonts/mcr-icons.woff') format('woff'),
-       url('../fonts/mcr-icons.ttf') format('truetype'),
-       url('../fonts/mcr-icons.svg#mcr-icons') format('svg');
+  font-family: "mcr-icons";
+  src: url("../fonts/mcr-icons.woff2") format("woff2"),
+       url("../fonts/mcr-icons.woff") format("woff"),
+       url("../fonts/mcr-icons.ttf") format("truetype");
 }
 
 [class^="mcr-icon-"]:before, i[class*=" mcr-icon-"]:before {
@@ -107,11 +113,8 @@
 */
 @font-face {
   font-family: 'fontmaki';
-  src: url('../fonts/fontmaki.eot');
-  src: url('../fonts/fontmaki.eot#iefix') format('embedded-opentype'),
-       url('../fonts/fontmaki.woff') format('woff'),
-       url('../fonts/fontmaki.ttf') format('truetype'),
-       url('../fonts/fontmaki.svg#fontmaki') format('svg');
+  src: url('../fonts/fontmaki.woff') format('woff'),
+       url('../fonts/fontmaki.ttf') format('truetype');
   font-weight: normal;
   font-style: normal;
 }
@@ -126,11 +129,11 @@
 }
 */
 
-[class^="maki-"]:before, [class*=" maki-"]:before {
+ [class^="maki-"]:before, [class*=" maki-"]:before {
   font-family: "fontmaki";
   font-style: normal;
   font-weight: normal;
-  speak: none;
+  /* speak: none; */
 
   display: inline-block;
   text-decoration: inherit;