conflict fix in static/client/css_min/main.min.css

10 years ago · daeb320402
parent 35aff766e7 0054ee04ec
commit daeb320402
3 changed files with 4 additions and 2 deletions
--- a/README.md
+++ b/README.md
@ -2,6 +2,7 @@ Expomap project
 #mysql
 sudo apt-get install mysql-server mysql-client libmysqlclient-dev mysql-workbench

+
 #memcached
 sudo apt-get install libmemcached-dev

--- a/static/client/css/main.css
+++ b/static/client/css/main.css
@ -2601,7 +2601,8 @@ a.icon-big-ical {
 }
 .pw-form .pwf-line {
    margin-bottom: 15px;
-    display: table
+    display: table;
+    margin: 0px auto 15px;
 }
 .pw-form .pwf-line.subj-checks {
    margin-bottom: 25px
--- a/static/client/css_min/main.min.css
+++ b/static/client/css_min/main.min.css