From 05ebcccc2c8099c0252501fea0e1797e5a1361d2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 15 七月 2020 10:59:46 +0800
Subject: [PATCH] Merge branches 'master' and 'xtyasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xtyasrs
---
src/main/webapp/static/css/common.css | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/static/css/common.css b/src/main/webapp/static/css/common.css
index af20387..db9f679 100644
--- a/src/main/webapp/static/css/common.css
+++ b/src/main/webapp/static/css/common.css
@@ -1,9 +1,9 @@
-*, *::before, *::after {
- -webkit-box-sizing: border-box;
- box-sizing: border-box;
- margin: 0;
- padding: 0;
-}
+/**, *::before, *::after {*/
+/* -webkit-box-sizing: border-box;*/
+/* box-sizing: border-box;*/
+/* margin: 0;*/
+/* padding: 0;*/
+/*}*/
body {
background-color: #fff;
--
Gitblit v1.9.1