Permalink
Browse files

Fix merge conflict

  • Loading branch information...
pippinsplugins committed Mar 6, 2014
2 parents a45a2b3 + 0834113 commit 14b1f22fd5646a1303e40280d9c0c30cade6352a
Showing with 5 additions and 5 deletions.
  1. +4 −4 assets/css/edd-admin.css
  2. +1 −1 assets/css/edd-admin.min.css
View
@@ -108,13 +108,13 @@ textarea#edd-payment-note { width: 100%; height: 4em; margin: 0; }
#edd-edit-order-form .column,
#edd-purchased-files .row > ul > li,
#edd-purchased-files .inside > ul > li { display: inline-block; position: relative; vertical-align: top; }
-#edd-purchased-files li.actions { margin-top: 14px; text-align: right; }
+#edd-purchased-files li.actions { text-align: right; }
#edd-purchased-files ul li.remove { text-align: right; }
#edd-purchased-files .row { padding: 12px; border-bottom: 1px solid #eee; }
#edd-purchased-files ul { font-size: 0; }
-#edd-purchased-files ul li { font-size: 13px; margin-bottom: 0; }
+#edd-purchased-files ul li { font-size: 13px; }
@media screen and ( max-width: 782px ) { .order-data-column input[type="email"] { padding: 6px 10px; } }
-@media screen and ( max-width: 1280px ) { #edd-purchased-files .inside li.actions { width: 100%; } }
+@media screen and ( max-width: 1280px ) { #edd-purchased-files .inside li.actions { width: 35%; } }
@media screen and ( min-width: 851px ) { #edd-purchased-files .inside li.actions { text-align: right; } }
@media screen and ( min-width: 1280px ) {
#edd-edit-order-form .column, #edd-purchased-files.columns-3 .row > ul > li,
@@ -127,7 +127,7 @@ textarea#edd-payment-note { width: 100%; height: 4em; margin: 0; }
#edd-purchased-files.columns-4 li.download { width:33%; }
#edd-purchased-files.columns-4 li.price,
#edd-purchased-files.columns-3 .row > ul > li.price,
- #edd-purchased-files.columns-3 .inside > ul > li.price { width:13%; }
+ #edd-purchased-files.columns-3 .inside > ul > li.price { width:14%; }
#edd-purchased-files.columns-4 li.actions { width: 25%; margin-top: 0; margin-right: 0; }
}
#edd-order-data .data span { color: #666; font-weight: 600; }

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

0 comments on commit 14b1f22

Please sign in to comment.