lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

RTL fixes for Media Lib, and upgrading color box to 1.5.13

Browse Source
This commit is contained in:
Nicholas Mayne 2014-08-27 23:46:11 +01:00
parent c7c9f8e233
commit 8087e46c12
11 changed files with 481 additions and 381 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Orchard.Web/Modules/Orchard.ImageEditor/Styles/image-editor.css
View File

@ -54,4 +54,12 @@
display: inline-block;
width: 200px;
margin-top: 10px;
}
/* RTL */
.dir-rtl .filter {
float: right;
margin-right: inherit;
margin-left: 20px;
}

7
src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/menu.clientstorage-mediaproviders.css
View File

@ -9,3 +9,10 @@
color: black;
padding-right: 5px;
}
/* RTL */
.dir-rtl .navicon-my-computer:before {
padding-right: inherit;
padding-left: 5px;
}

8
src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/menu.oembed-mediaproviders.css
View File

@ -9,3 +9,11 @@
color: black;
padding-right: 5px;
}
/* RTL */
.dir-rtl .navicon-media-url:before {
padding-right: inherit;
padding-left: 5px;
}

7
src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/menu.websearch-mediaproviders.css
View File

@ -9,3 +9,10 @@
color: black;
padding-right: 5px;
}
/* RTL */
.dir-rtl .navicon-web-search:before {
padding-right: inherit;
padding-left: 5px;
}

2
src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/orchard-medialibrary-admin.css
View File

@ -463,7 +463,7 @@ padding-right: 16px;
.dir-rtl #media-library-import .import-provider {
padding-left: inherit;
padding-right: 5px;
padding-right: 25px;
}
.dir-rtl #media-library-main-selection li {

6
src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj
View File

@ -260,6 +260,8 @@
<Content Include="Scripts\jquery-1.11.1.min.js" />
<Content Include="Scripts\jquery-migrate-1.2.1.js" />
<Content Include="Scripts\jquery-migrate-1.2.1.min.js" />
<Content Include="Scripts\jquery.colorbox-min.js" />
<Content Include="Scripts\jquery.colorbox.js" />
<Content Include="Scripts\jquery.plugin.js" />
<Content Include="Scripts\jquery.plugin.min.js" />
<Content Include="Scripts\timeentry\jquery.timeentry-ar.js" />
@ -301,10 +303,6 @@
<Content Include="Scripts\jquery-ui-timepicker-addon.js" />
<Content Include="Scripts\jquery-ui.js" />
<Content Include="Scripts\jquery-ui.min.js" />
<Content Include="Scripts\jquery.colorbox.min.js">
<DependentUpon>jquery.colorbox.js</DependentUpon>
</Content>
<Content Include="Scripts\jquery.colorbox.js" />
<Content Include="Scripts\jquery.fileupload.js" />
<Content Include="Scripts\jquery.fileupload.min.js">
<DependentUpon>jquery.fileupload.js</DependentUpon>

4
src/Orchard.Web/Modules/Orchard.jQuery/ResourceManifest.cs
View File

@ -85,8 +85,8 @@ namespace Orchard.jQuery {
manifest.DefineScript("jQueryFileUpload").SetUrl("jquery.fileupload.min.js", "jquery.fileupload.js").SetVersion("5.41.0").SetDependencies("jQueryIFrameTransport").SetDependencies("jQueryUI_Widget");
// jquer Color Box
manifest.DefineScript("jQueryColorBox").SetUrl("jquery.colorbox.min.js", "jquery.colorbox.js").SetVersion("1.4.10").SetDependencies("jQuery");
manifest.DefineStyle("jQueryColorBox").SetUrl("colorbox.css").SetVersion("1.4.10");
manifest.DefineScript("jQueryColorBox").SetUrl("jquery.colorbox-min.js", "jquery.colorbox.js").SetVersion("1.5.13").SetDependencies("jQuery");
manifest.DefineStyle("jQueryColorBox").SetUrl("colorbox.css").SetVersion("1.5.13");
}
}
}

7
src/Orchard.Web/Modules/Orchard.jQuery/Scripts/jquery.colorbox-min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

804
src/Orchard.Web/Modules/Orchard.jQuery/Scripts/jquery.colorbox.js
View File

File diff suppressed because it is too large Load Diff

6
src/Orchard.Web/Modules/Orchard.jQuery/Scripts/jquery.colorbox.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
src/Orchard.Web/Modules/Orchard.jQuery/Styles/colorbox.css
View File

@ -3,6 +3,7 @@
The following CSS is consistent between example themes and should not be altered.
*/
#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;}
#cboxWrapper {max-width:none;}
#cboxOverlay{position:fixed; width:100%; height:100%;}
#cboxMiddleLeft, #cboxBottomLeft{clear:left;}
#cboxContent{position:relative;}
@ -11,7 +12,7 @@
#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;}
#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}
.cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none; -ms-interpolation-mode:bicubic;}
.cboxIframe{width:100%; height:100%; display:block; border:0;}
.cboxIframe{width:100%; height:100%; display:block; border:0; padding:0; margin:0;}
#colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box; -moz-box-sizing:content-box; -webkit-box-sizing:content-box;}
/*