From 09c071b9417ba0d8f11c9221f5f77b2e8e2f4040 Mon Sep 17 00:00:00 2001 From: Jonathan Wall Date: Mon, 21 Feb 2011 14:38:16 -0800 Subject: [PATCH] Removed some inline styles from the media picker. --HG-- branch : dev --- .../Styles/mediapicker.css | 100 +----------------- .../Views/Admin/Tab_Gallery.cshtml | 4 +- .../Views/Admin/Tab_Url.cshtml | 6 +- 3 files changed, 10 insertions(+), 100 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/mediapicker.css b/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/mediapicker.css index 84f92be8b..c6f1100a9 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/mediapicker.css +++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/mediapicker.css @@ -7,6 +7,7 @@ body { line-height:1.6em; padding:12px; width:640px; + min-width:640px; margin: 0 auto; } @@ -19,6 +20,10 @@ body { text-decoration:none; } +#file-details, #image-preview, #gallery {width:280px; float:left;} + +#file-details {float:right;} + input[disabled], input[disabled="disabled"], input.disabled { color: White } @@ -129,101 +134,6 @@ textarea { min-height:8em; } - -form.link button { - background:inherit; - border:0; - padding:0; - width:auto; - margin:-2px -3px 0; - - /*Remove CSS3 button properties*/ - filter:none; - background:none; - background:none; - box-shadow:none; - -webkit-box-shadow:none; - -moz-box-shadow:none; - border-radius:none; - -webkit-border-radius:none; - -moz-border-radius:none; -} - -button.remove, .remove.button, .remove.button:link, .remove.button:visited { - background-color:#DECCCA; - background-image:url(images/tableHeaderBackgroundRed.gif); - border-color:#d6c9c7; - color:#5c3732; -} -button.remove:hover, .remove.button:hover, -button.remove:active, .remove.button:active, -button.remove:focus, .remove.button:focus { - background:#8f7c79; - border-color:#6e5551; - color:#faedeb; -} -button.remove:focus::-moz-focus-inner, .remove.button:focus::-moz-focus-inner { - border-color:#8f7c79; -} -.delete.button { - float:right; -} -input[type="submit"], input[type="reset"], input[type="button"], button, submit, .button, .button:link, .button:visited { - background:#6a7b42; - border:1px solid #487328; - color:#fff; - cursor:pointer; - padding:0 14px 2px 14px; - text-align:center; - margin:0px; - - /*CSS3 properties*/ - text-shadow: rgba(0,0,0,.5) 0px 0px 1px; - /*In ie the first couplet sets the alpha value so 00=transparent and ff=opaque)*/ - filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#ff6e7f45', endColorstr='#ff6a7b42'); - background: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(110, 127, 69, 1.0)), rgba((106, 123, 66, 1.0))); - background: -moz-linear-gradient(top, rgba(110, 127, 69, 1.0), rgba(106, 123, 66, 1.0)); - - box-shadow: inset 0px 0px 1px rgba(255, 255, 255, 1.0), 1px 1px 1px rgba(102, 102, 102, 0.2); - -webkit-box-shadow: inset 0px 0px 1px rgba(255, 255, 255, 1.0), 1px 1px 1px rgba(102, 102, 102, 0.2); - -moz-box-shadow: inset 0px 0px 1px rgba(255, 255, 255, 1.0), 1px 1px 1px rgba(102, 102, 102, 0.2); - - border-radius: 2px; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - - } -input[type="submit"]:hover,input[type="reset"]:hover, input[type="button"]:hover, button:hover, .button:hover, .button.primaryAction:hover { - border-color:#3a822e; - color:#fff; - color:eefcec; - text-decoration:none; - background: #809f43; - - /*CSS3 properties*/ - filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#ff9bb36c', endColorstr='#ff809f43'); - background: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(110, 127, 69, 1.0)), rgba((106, 123, 66, 1.0))); - background: -moz-linear-gradient(top, rgba(155, 179, 108, 1.0), rgba(128, 159, 67, 1.0)); - -} -input[type="submit"]:active, input[type="reset"]:active, input[type="button"]:active, button:active, .buton:active, .button.primaryAction:active { - text-decoration:none; - background:#6a7b42; - border:1px solid #487328; - color:#fff; - - /*CSS3 properties*/ - text-shadow: rgba(0,0,0,.5) 0px 0px 1px; - filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#ff6e7f45', endColorstr='#ff6a7b42'); - background: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(110, 127, 69, 1.0)), rgba((106, 123, 66, 1.0))); - background: -moz-linear-gradient(top, rgba(110, 127, 69, 1.0), rgba(106, 123, 66, 1.0)); -} -input[type="submit"]:focus::-moz-focus-inner, button:focus::-moz-focus-inner, .button:focus::-moz-focus-inner { - border: 1px dotted transparent; -} - - - .clearboth { clear:both; } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Gallery.cshtml b/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Gallery.cshtml index 40f882e1e..e859dc012 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Gallery.cshtml +++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Gallery.cshtml @@ -17,7 +17,7 @@ @{ var uploadAction = Url.Action("AddFromClient", "Admin", new { area = "Orchard.Media" }); } -
+