Skip to content

Commit 2517df8

Browse files
MarkRobboMark Robinson
authored andcommitted
Fix merge conflicts
1 parent 1a937e8 commit 2517df8

File tree

2 files changed

+5
-208
lines changed

2 files changed

+5
-208
lines changed

src/main/resources/static/css/main-20170613.css

Lines changed: 0 additions & 206 deletions
This file was deleted.

src/main/resources/static/css/main-20170616.css

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,11 @@ body {
3737

3838
#logo {
3939
height: 61px;
40-
margin-top: -20px;
41-
margin-left: -20px
40+
padding: 5px;
41+
}
42+
43+
#explore {
44+
padding-top: 20px;
4245
}
4346

4447
#githubURL {

0 commit comments

Comments
 (0)