A wrong merge

This commit is contained in:
Karel Picman 2017-03-17 10:49:12 +01:00
parent 0bac37fa71
commit d714a66e86

View File

@ -172,11 +172,13 @@ div.dmsf_revision_inner_box .attribute .label {
} }
/* Command icons */ /* Command icons */
.dmsf_icon-link { background-image: url(../images/link.png); } .icon-wf-none { background-image: url(../images/none.png); }
.dmsf_icon-notification-on { background-image: url(../images/notify.png); margin-left: 3px; } .icon-wf-waiting { background-image: url(../images/waiting_for_approval.png); }
.dmsf_icon-notification-off { background-image: url(../images/notifynot.png); margin-left: 3px; } .icon-wf-assigned { background-image: url(../images/assigned.png); }
.dmsf_icon-lock { background-image: url(../images/lock.png); } .icon-delete { background-image: url(../images/rev_delete.png); }
.dmsf_icon-unlock { background-image: url(../images/unlock.png); } .icon-download { background-image: url(../images/rev_download.png); }
.icon-downloads { background-image: url(../images/rev_downloads.png); }
.icon-link { background-image: url(../../../images/link.png); }
/* File types */ /* File types */
.dmsf_gray .icon-folder { background-image: url(../images/folder_gray.png); } .dmsf_gray .icon-folder { background-image: url(../images/folder_gray.png); }
@ -207,7 +209,7 @@ div.dmsf_revision_inner_box .attribute .label {
.dmsf_gray .icon-file.text-x-c { background-image: url(../images/filetypes/c_gray.png); } .dmsf_gray .icon-file.text-x-c { background-image: url(../images/filetypes/c_gray.png); }
.dmsf_gray .icon-file.text-x-csharp { background-image: url(../images/filetypes/csharp_gray.png); } .dmsf_gray .icon-file.text-x-csharp { background-image: url(../images/filetypes/csharp_gray.png); }
.dmsf_gray .icon-file.text-x-java { background-image: url(../images/files/filetypes/java_gray.png); } .dmsf_gray .icon-file.text-x-java { background-image: url(../images/filetypes/java_gray.png); }
.dmsf_gray .icon-file.text-x-javascript { background-image: url(../images/filetypes/js_gray.png); } .dmsf_gray .icon-file.text-x-javascript { background-image: url(../images/filetypes/js_gray.png); }
.dmsf_gray .icon-file.text-x-php { background-image: url(../images/filetypes/php_gray.png); } .dmsf_gray .icon-file.text-x-php { background-image: url(../images/filetypes/php_gray.png); }
.dmsf_gray .icon-file.text-x-ruby { background-image: url(../images/filetypes/ruby_gray.png); } .dmsf_gray .icon-file.text-x-ruby { background-image: url(../images/filetypes/ruby_gray.png); }