mitri4
/
expomap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
remotes/origin/stage5
Alexander Burdeiny 10 years ago
parent 35aff766e7 0054ee04ec
commit daeb320402
3 changed files with 4 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      README.md
  2. 3
      static/client/css/main.css
  3. 2
      static/client/css_min/main.min.css

1
README.md
Unescape View File

@ -2,6 +2,7 @@ Expomap project
#mysql #mysql
sudo apt-get install mysql-server mysql-client libmysqlclient-dev mysql-workbench sudo apt-get install mysql-server mysql-client libmysqlclient-dev mysql-workbench
#memcached #memcached
sudo apt-get install libmemcached-dev sudo apt-get install libmemcached-dev

3
static/client/css/main.css
Unescape View File

@ -2601,7 +2601,8 @@ a.icon-big-ical {
} }
.pw-form .pwf-line { .pw-form .pwf-line {
margin-bottom: 15px; margin-bottom: 15px;
display: table display: table;
margin: 0px auto 15px;
} }
.pw-form .pwf-line.subj-checks { .pw-form .pwf-line.subj-checks {
margin-bottom: 25px margin-bottom: 25px

2
static/client/css_min/main.min.css vendored
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save