lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Andre Rodrigues
2011-03-30 11:18:26 -07:00
parent 86edc22139 1c93ef7631
commit 8c30a7d77e
5 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CREDITS.txt
View File

@@ -5,7 +5,7 @@ Copyright 2009-2011 Outercurve Foundation
This product includes software developed at
The Outercurve Foundation (http://www.outercurve.org/).
Orchard includes or is derivative of works distributed under the licenses listed below. The full text for most of the licenses listed below can be found in the LICENSE.txt file accompanying each work. The original copyright notices have been preserved within the respective files and or packages. Please refer to the specific files and/or packages for more detailed information about the authors, copyright notices, and licenses.
Orchard includes works distributed under the licenses listed below. The full text for most of the licenses listed below can be found in the LICENSE.txt file accompanying each work. The original copyright notices have been preserved within the respective files and or packages. Please refer to the specific files and/or packages for more detailed information about the authors, copyright notices, and licenses.
Akismet.Net
-----
@@ -170,7 +170,7 @@ SharpZipLib
-----
Website: http://www.icsharpcode.net/OpenSource/SharpZipLib/Default.aspx
Copyright: Copyright (c) 2000-2009 IC#Code
License: Modified GPL: http://www.icsharpcode.net/OpenSource/SharpZipLib/Default.aspx
License: GPLv2 with Classpath Exception: http://www.icsharpcode.net/OpenSource/SharpZipLib/Default.aspx
SpecFlow
-----

4
LICENSE.txt
View File

@@ -1,9 +1,9 @@
Copyright (c) 2009 CodePlex Foundation
Copyright (c) 2009 Outercurve Foundation
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
Neither the name of CodePlex Foundation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
Neither the name of Outercurve Foundation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

8
src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/mediapicker.css
View File

@@ -42,9 +42,9 @@ body {
overflow-x:hidden;
}
input[disabled], input[disabled="disabled"], input.disabled {
color: White
}
/*input[disabled], input[disabled="disabled"], input.disabled {
color: #fff;
}*/
.media-largepreview
{
@@ -107,7 +107,7 @@ table.items td.media-thumbnail
form { margin: 0; padding: 0; }
legend { font-weight: normal; border:none; }
fieldset { padding:0; margin: 0; border: 0px solid #dbdbdb; }
#orchardmediapicker label { font-weight:normal; display:block; padding: 0 0 0 0; margin:10px 0 0 0; }
#orchardmediapicker label { font-weight:normal; display:block; padding: 0 0 0 0; margin:12px 0 2px 0; }
#orchardmediapicker label.forcheckbox { display: inline; margin: 10px 0 0 4px; }
#orchardmediapicker .actions { margin:12px 0 0 0; clear:both; text-align:left; }

1
src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Index.cshtml
View File

@@ -11,6 +11,7 @@
Script.Require("jQueryUI_Tabs").AtHead();
Script.Include("MediaBrowser.js").AtHead();
SetMeta("X-UA-Compatible", "IE=edge,chrome=1");
Style.Include("~/themes/theadmin/styles/site.css");
Style.Include("~/themes/theadmin/styles/ie.css").UseCondition("lte IE 8").SetAttribute("media", "screen, projection");
Style.Include("~/themes/theadmin/styles/ie6.css").UseCondition("lte IE 6").SetAttribute("media", "screen, projection");

28
src/Orchard.Web/Themes/TheAdmin/Styles/site.css
View File

@@ -649,16 +649,6 @@ button.remove:focus::-moz-focus-inner, .remove.button:focus::-moz-focus-inner {
.delete.button {
float:right;
}
.button.disabled, .button.disabled:visited, .button.disabled:hover, .button.disabled:active, .button.disabled:focus {
background:#eee;
border:1px solid #ababab;
color:#ababab;
cursor:default;
text-shadow: none;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}
.button.grey {
color:#5d615d;
background:#f5f5f5;
@@ -674,6 +664,7 @@ button.remove:focus::-moz-focus-inner, .remove.button:focus::-moz-focus-inner {
/*----In ie the first couplet sets the alpha value so 00=transparent and ff=opaque)----*/
filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#fff5f5f5', endColorstr='#ffd9d9d9');
background: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(245, 245, 245, 1.0)), to(rgba(217, 217, 217, 1.0)));
background: -moz-linear-gradient(top, rgba(245, 245, 245, 1.0), rgba(217, 217, 217, 1.0));
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
@@ -711,7 +702,6 @@ button, .button, a.button {
background: -moz-linear-gradient(top, rgba(155, 179, 108, 1.0), rgba(128, 159, 67, 1.0));
/*test - base green in pallet is 155,179,108*/
background: -moz-linear-gradient(top, rgba(166, 192, 116, 1.0), rgba(155, 179, 108, 1.0));
background: -moz-linear-gradient(top, rgba(155, 179, 108, 1.0), rgba(133, 154, 93, 1.0));
-webkit-border-radius: 2px;
@@ -751,6 +741,22 @@ button:active, .buton:active, a.button:active {
button:focus::-moz-focus-inner, .button:focus::-moz-focus-inner {
border: 1px dotted transparent;
}
/*disabled*/
.button.disabled, .button.disabled:visited, .button.disabled:hover, .button.disabled:active, .button.disabled:focus {
background-color:#eee;
border:1px solid #ababab;
color:#ababab;
cursor:default;
filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#ffeeeeee', endColorstr='#ffeeeeee');
background: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(238, 238, 238, 1.0)), to(rgba(238, 238, 238, 1.0)));
background: -moz-linear-gradient(top, rgba(238, 238, 238, 1.0), rgba(238, 238, 238, 1.0));
text-shadow: none;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}
/* and allow all of that button style to be undone and beyond - to look like a link */
button.link {
background:none;