~xingchuan/SewerAndRainNetwork.git

派生自 wuyushui/SewerAndRainNetwork

parent: f8039fe1 | 补丁 | 提交 | show whitespace

Merge remote-tracking branch 'origin/master'

徐旺旺

2021-03-11 666536895e3a8c99294eeb322b222a1b3f259cf1

Merge remote-tracking branch 'origin/master'

2个文件已删除

2个文件已修改

	public/assets/css/map/custom-popup.css	36 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	public/assets/css/map/magic.min.css	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	public/index.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/assets/css/map/map-popup.less	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 public/assets/css/map/custom-popup.css

File was deleted

 public/assets/css/map/magic.min.css

File was deleted

 public/index.html

@@ -3,7 +3,9 @@
  <head>
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width,initial-scale=1.0">
<!--    <meta name="viewport" content="width=device-width,initial-scale=1.0">-->
      <meta name="viewport" content="width=device-width">
      <meta http-equiv="X-UA-Compatible" content="IE=11">
    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
    <title><%= htmlWebpackPlugin.options.title %></title>
  </head>

 src/assets/css/map/map-popup.less

@@ -7,8 +7,10 @@
        /*background-color: transparent;*/
        border: .00521rem solid @color;
        padding: .10417rem;
        -webkit-box-shadow: 0 0 0.03125rem 0 @color;
        box-shadow: 0 0 0.03125rem 0 @color;
        //-webkit-box-shadow: 0 0 0.03125rem 0 @color;
        //box-shadow: 0 0 0.03125rem 0 @color;
        -webkit-box-shadow: 0 0 10px 0 @color;
        box-shadow: 0 0 10px @color;
        border-radius: 1rem;
    }

			@@ -3,7 +3,9 @@
			<head>
			<meta charset="utf-8">
			<meta http-equiv="X-UA-Compatible" content="IE=edge">
			<meta name="viewport" content="width=device-width,initial-scale=1.0">
			<!-- <meta name="viewport" content="width=device-width,initial-scale=1.0">-->
			<meta name="viewport" content="width=device-width">
			<meta http-equiv="X-UA-Compatible" content="IE=11">
			<link rel="icon" href="<%= BASE_URL %>favicon.ico">
			<title><%= htmlWebpackPlugin.options.title %></title>
			</head>

			@@ -7,8 +7,10 @@
			/background-color: transparent;/
			border: .00521rem solid @color;
			padding: .10417rem;
			-webkit-box-shadow: 0 0 0.03125rem 0 @color;
			box-shadow: 0 0 0.03125rem 0 @color;
			//-webkit-box-shadow: 0 0 0.03125rem 0 @color;
			//box-shadow: 0 0 0.03125rem 0 @color;
			-webkit-box-shadow: 0 0 10px 0 @color;
			box-shadow: 0 0 10px @color;
			border-radius: 1rem;
			}