Merge branch 'twohustlers' of github.com:okfocus/okcms into twohustlers

1 files changed, 11 insertions, 6 deletions

diff --git a/themes/okadmin/public/css/main.css b/themes/okadmin/public/css/main.css
index 747ec34..5dbd910 100644
--- a/themes/okadmin/public/css/main.css
+++ b/themes/okadmin/public/css/main.css
@@ -283,11 +283,11 @@ button, input[type=submit] {
   list-style-type: none;
   display: block;
   clear: both;
-  height: 10em;
+  height: 7em;
 }
 .main.resource form img {
   width: 10em;
-  max-height: 10em;
+  max-height: 6em;
   border: 0;
 }
 .main.resource form .images img {
@@ -296,7 +296,10 @@ button, input[type=submit] {
 }
 .main.resource form textarea.caption {
   width: 15em;
-  height: 9em;
+  height: 6em;
+}
+.main.resource form .video-element input[type=text] {
+  width: 15em;
 }
 .add-image-button {
   background: #ddd;
@@ -324,13 +327,15 @@ button, input[type=submit] {
   margin: 0; padding: 0;
   cursor: pointer;
 }
-.image-element:hover .remove-image {
+.video-element:hover .remove,
+.image-element:hover .remove {
   display: block;
 }
-.image-element .remove-image:hover {
+.video-element .remove:hover,
+.image-element .remove:hover {
 	color: red;
 }
-.remove-image {
+.remove {
   display: none;
 }