Merge branch 'next_version'

Conflicts:
	src/module_vmap/module/css/vmap.less
	src/module_vmap/module/template/layers/mapmodal/maplistlitle.html

src/module_vmap/module/css/vmap.less

@@ -2432,13 +2432,23 @@ div.vmap-select-scale-alert{
 
 #basic-tools-dropdown-comapremode{
     margin: -10px -1px;
-    width: 30%;
     min-width: 450px;
     max-width: 550px;
     min-height: 55px;
     padding-top: 15px !important;
 }
 
+@media only screen and (max-width:1200px) {
+    #basic-tools-dropdown-comapremode {
+        width: 30%;
+    }
+}
+@media only screen and (min-width:1200px) {
+    #basic-tools-dropdown-comapremode {
+        width: 550px;
+    }
+}
+
 .basic-tools-element>span.icon-mirror {
     font-size: 16px;
     line-height: 0;

src/module_vmap/module/template/layers/mapmodal/maplistlitle.html

@@ -47,7 +47,7 @@
                         <div url="{{map.url}}"
                              ng-if="compare"
                              title="{{map.description}}"
-                             class="col-md-6 margin-10 pointer opacity-hover underline-hover maplist-map"
+                             class="col-md-3 margin-10 pointer opacity-hover underline-hover maplist-map"
                              style="text-align: center; font-size: 12px;"
                              onclick="oVmap.getMapManager().loadCompareMap(this)"
                              data-dismiss="modal">
@@ -74,7 +74,7 @@
                     <div ng-if="($index + 1) % 4 !== 0 && compare"
                          url="{{map.url}}"
                          title="{{map.description}}"
-                         class="col-md-6 margin-10 pointer opacity-hover underline-hover maplist-map"
+                         class="col-md-3 margin-10 pointer opacity-hover underline-hover maplist-map"
                          style="text-align: center; font-size: 12px;"
                          onclick="oVmap.getMapManager().loadCompareMap(this)"
                          data-dismiss="modal">