merge fix

This commit is contained in:
Kyle Drake 2014-04-19 19:54:16 -07:00
commit dda7e10c38
3 changed files with 6 additions and 6 deletions

View file

@ -149,7 +149,7 @@
.btn-Action.new-Page span {
background-image: url(../img/new-page.png);
background-position-y: 1px;
padding-left: 30px;
padding-left: 29px;
}
.btn-Action.new-Folder span {
background-image: url(../img/new-folder.png);
@ -157,7 +157,7 @@
}
.btn-Action.upload span {
background-image: url(../img/upload.png);
padding-left: 26px;
padding-left: 24px;
}
.files .list {
padding: 20px;

File diff suppressed because one or more lines are too long