From dc12474561ada5263cdb079229987a384485b71b Mon Sep 17 00:00:00 2001 From: dd32 Date: Sun, 15 May 2011 08:54:32 +0000 Subject: [PATCH] svn:eol-stle:native (CRLF for licenses) for new files git-svn-id: http://svn.automattic.com/wordpress/trunk@17933 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/js/swfupload/license.txt | 62 +- .../plugins/wpdialogs/js/wpdialog.dev.js | 46 +- .../plugins/wpfullscreen/css/content.css | 574 +++++++++--------- 3 files changed, 341 insertions(+), 341 deletions(-) diff --git a/wp-includes/js/swfupload/license.txt b/wp-includes/js/swfupload/license.txt index 8252ca9e24..72962690e8 100644 --- a/wp-includes/js/swfupload/license.txt +++ b/wp-includes/js/swfupload/license.txt @@ -1,32 +1,32 @@ -/** - * SWFUpload: http://www.swfupload.org, http://swfupload.googlecode.com - * - * mmSWFUpload 1.0: Flash upload dialog - http://profandesign.se/swfupload/, http://www.vinterwebb.se/ - * - * SWFUpload is (c) 2006-2007 Lars Huring, Olov Nilzén and Mammon Media and is released under the MIT License: - * http://www.opensource.org/licenses/mit-license.php - * - * SWFUpload 2 is (c) 2007-2008 Jake Roberts and is released under the MIT License: - * http://www.opensource.org/licenses/mit-license.php - * - */ - -The MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +/** + * SWFUpload: http://www.swfupload.org, http://swfupload.googlecode.com + * + * mmSWFUpload 1.0: Flash upload dialog - http://profandesign.se/swfupload/, http://www.vinterwebb.se/ + * + * SWFUpload is (c) 2006-2007 Lars Huring, Olov Nilzén and Mammon Media and is released under the MIT License: + * http://www.opensource.org/licenses/mit-license.php + * + * SWFUpload 2 is (c) 2007-2008 Jake Roberts and is released under the MIT License: + * http://www.opensource.org/licenses/mit-license.php + * + */ + +The MIT License + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/wp-includes/js/tinymce/plugins/wpdialogs/js/wpdialog.dev.js b/wp-includes/js/tinymce/plugins/wpdialogs/js/wpdialog.dev.js index 620213fe85..9e8f9b0316 100644 --- a/wp-includes/js/tinymce/plugins/wpdialogs/js/wpdialog.dev.js +++ b/wp-includes/js/tinymce/plugins/wpdialogs/js/wpdialog.dev.js @@ -1,23 +1,23 @@ -(function($){ - $.widget("wp.wpdialog", $.ui.dialog, { - open: function() { - var ed; - - // Initialize tinyMCEPopup if it exists and is the editor is active. - if ( tinyMCEPopup && typeof tinyMCE != 'undefined' && ( ed = tinyMCE.activeEditor ) && !ed.isHidden() ) { - tinyMCEPopup.init(); - } - - // Add beforeOpen event. - if ( this._isOpen || false === this._trigger('beforeOpen') ) { - return; - } - - // Open the dialog. - $.ui.dialog.prototype.open.apply( this, arguments ); - // WebKit leaves focus in the TinyMCE editor unless we shift focus. - this.element.focus(); - this._trigger('refresh'); - } - }); -})(jQuery); +(function($){ + $.widget("wp.wpdialog", $.ui.dialog, { + open: function() { + var ed; + + // Initialize tinyMCEPopup if it exists and is the editor is active. + if ( tinyMCEPopup && typeof tinyMCE != 'undefined' && ( ed = tinyMCE.activeEditor ) && !ed.isHidden() ) { + tinyMCEPopup.init(); + } + + // Add beforeOpen event. + if ( this._isOpen || false === this._trigger('beforeOpen') ) { + return; + } + + // Open the dialog. + $.ui.dialog.prototype.open.apply( this, arguments ); + // WebKit leaves focus in the TinyMCE editor unless we shift focus. + this.element.focus(); + this._trigger('refresh'); + } + }); +})(jQuery); diff --git a/wp-includes/js/tinymce/plugins/wpfullscreen/css/content.css b/wp-includes/js/tinymce/plugins/wpfullscreen/css/content.css index 21de2b737c..fa1bb8c0df 100644 --- a/wp-includes/js/tinymce/plugins/wpfullscreen/css/content.css +++ b/wp-includes/js/tinymce/plugins/wpfullscreen/css/content.css @@ -1,287 +1,287 @@ -/* -Distraction Free Writing mode TinyMCE Styles -*/ - -html, body.mceContentBody { - background: transparent !important; - width: auto !important; - max-width: none !important; - margin: 0; - padding: 0; -} - -* { - color: #444; - font-family: Georgia, "Bitstream Charter", serif; - line-height: 1.5; -} -p, -dl, -td, -th, -ul, -ol, -blockquote { - font-size: 16px; -} -tr th, -thead th, -label, -tr th, -thead th { - font-family: "Helvetica Neue", Arial, Helvetica, "Nimbus Sans L", sans-serif; -} -pre, -code, -code var { - font-family: Monaco, Consolas, "Andale Mono", "DejaVu Sans Mono", monospace; -} -body, input, textarea { - font-size: 12px; - line-height: 18px; -} -hr { - background-color: #e7e7e7; - border: 0; - clear: both; - height: 1px; - margin-bottom: 18px; -} -/* Text elements */ -p { - margin-bottom: 18px; -} -ul { - list-style: square; - margin: 0 0 18px 1.5em; -} -ol { - list-style: decimal; - margin: 0 0 18px 1.5em; -} -ul ul, -ol ol, -ul ol, -ol ul { - margin-bottom: 0; -} -dl { - margin: 0 0 24px 0; -} -dt { - font-weight: bold; -} -dd { - margin-bottom: 18px; -} -strong { - color: #000; - font-weight: bold; -} -cite, -em, -i { - border: none; - font-style: italic; -} -big { - font-size: 131.25%; -} -ins { - background: #ffc; - border: none; - color: #333; -} -del { - text-decoration: line-through; - color: #555; -} -blockquote { - font-style: italic; - padding: 0 3em; -} -blockquote cite, -blockquote em, -blockquote i { - font-style: normal; -} -pre { - background: #f7f7f7; - color: #222; - line-height: 18px; - margin-bottom: 18px; - padding: 1.5em; -} -abbr, -acronym { - border-bottom: 1px dotted #666; - cursor: help; -} -ins { - text-decoration: none; -} -sup, -sub { - font-size: 10px; - height: 0; - line-height: 1; - position: relative; - vertical-align: baseline; -} -sup { - bottom: 1ex; -} -sub { - top: .5ex; -} -a:link { - color: #06c; -} -a:visited { - color: #743399; -} -a:active, -a:hover { - color: #ff4b33; -} -p, -ul, -ol, -dd, -pre, -hr { - margin-bottom: 24px; -} -ul ul, -ol ol, -ul ol, -ol ul { - margin-bottom: 0; -} -pre, -kbd, -tt, -var { - font-size: 15px; - line-height: 21px; -} -code { - font-size: 13px; -} -strong, -b, -dt, -th { - color: #000; -} -h1, -h2, -h3, -h4, -h5, -h6 { - color: #000; - font-weight: normal; - line-height: 1.5em; - margin: 0 0 20px 0; -} -h1 { - font-size: 2.4em; -} -h2 { - font-size: 1.8em; -} -h3 { - font-size: 1.4em; -} -h4 { - font-size: 1.2em; -} -h5 { - font-size: 1em; -} -h6 { - font-size: 0.9em; -} -table { - border: 1px solid #e7e7e7 !important; - border-collapse: collapse; - border-spacing: 0; - margin: 0 -1px 24px 0; - text-align: left; - width: 100%; -} -tr th, -thead th { - border: none !important; - color: #888; - font-size: 12px; - font-weight: bold; - line-height: 18px; - padding: 9px 24px; -} -tr td { - border: none !important; - border-top: 1px solid #e7e7e7 !important; - padding: 6px 24px; -} -img { - margin: 0; -} -img.size-auto, -img.size-large, -img.size-full, -img.size-medium { - max-width: 100%; - height: auto; -} -.alignleft, -img.alignleft { - display: inline; - float: left; - margin-right: 24px; - margin-top: 4px; -} -.alignright, -img.alignright { - display: inline; - float: right; - margin-left: 24px; - margin-top: 4px; -} -.aligncenter, -img.aligncenter { - clear: both; - display: block; - margin-left: auto; - margin-right: auto; -} -img.alignleft, -img.alignright, -img.aligncenter { - margin-bottom: 12px; -} -.wp-caption { - background: #f1f1f1; - border: none; - -khtml-border-radius: 0; - -moz-border-radius: 0; - -webkit-border-radius: 0; - border-radius: 0; - color: #888; - font-size: 12px; - line-height: 18px; - margin-bottom: 20px; - max-width: 632px !important; /* prevent too-wide images from breaking layout */ - padding: 4px; - text-align: center; -} -.wp-caption img { - margin: 5px; -} -.wp-caption p.wp-caption-text { - margin: 0 0 4px; -} -.wp-smiley { - margin: 0; -} +/* +Distraction Free Writing mode TinyMCE Styles +*/ + +html, body.mceContentBody { + background: transparent !important; + width: auto !important; + max-width: none !important; + margin: 0; + padding: 0; +} + +* { + color: #444; + font-family: Georgia, "Bitstream Charter", serif; + line-height: 1.5; +} +p, +dl, +td, +th, +ul, +ol, +blockquote { + font-size: 16px; +} +tr th, +thead th, +label, +tr th, +thead th { + font-family: "Helvetica Neue", Arial, Helvetica, "Nimbus Sans L", sans-serif; +} +pre, +code, +code var { + font-family: Monaco, Consolas, "Andale Mono", "DejaVu Sans Mono", monospace; +} +body, input, textarea { + font-size: 12px; + line-height: 18px; +} +hr { + background-color: #e7e7e7; + border: 0; + clear: both; + height: 1px; + margin-bottom: 18px; +} +/* Text elements */ +p { + margin-bottom: 18px; +} +ul { + list-style: square; + margin: 0 0 18px 1.5em; +} +ol { + list-style: decimal; + margin: 0 0 18px 1.5em; +} +ul ul, +ol ol, +ul ol, +ol ul { + margin-bottom: 0; +} +dl { + margin: 0 0 24px 0; +} +dt { + font-weight: bold; +} +dd { + margin-bottom: 18px; +} +strong { + color: #000; + font-weight: bold; +} +cite, +em, +i { + border: none; + font-style: italic; +} +big { + font-size: 131.25%; +} +ins { + background: #ffc; + border: none; + color: #333; +} +del { + text-decoration: line-through; + color: #555; +} +blockquote { + font-style: italic; + padding: 0 3em; +} +blockquote cite, +blockquote em, +blockquote i { + font-style: normal; +} +pre { + background: #f7f7f7; + color: #222; + line-height: 18px; + margin-bottom: 18px; + padding: 1.5em; +} +abbr, +acronym { + border-bottom: 1px dotted #666; + cursor: help; +} +ins { + text-decoration: none; +} +sup, +sub { + font-size: 10px; + height: 0; + line-height: 1; + position: relative; + vertical-align: baseline; +} +sup { + bottom: 1ex; +} +sub { + top: .5ex; +} +a:link { + color: #06c; +} +a:visited { + color: #743399; +} +a:active, +a:hover { + color: #ff4b33; +} +p, +ul, +ol, +dd, +pre, +hr { + margin-bottom: 24px; +} +ul ul, +ol ol, +ul ol, +ol ul { + margin-bottom: 0; +} +pre, +kbd, +tt, +var { + font-size: 15px; + line-height: 21px; +} +code { + font-size: 13px; +} +strong, +b, +dt, +th { + color: #000; +} +h1, +h2, +h3, +h4, +h5, +h6 { + color: #000; + font-weight: normal; + line-height: 1.5em; + margin: 0 0 20px 0; +} +h1 { + font-size: 2.4em; +} +h2 { + font-size: 1.8em; +} +h3 { + font-size: 1.4em; +} +h4 { + font-size: 1.2em; +} +h5 { + font-size: 1em; +} +h6 { + font-size: 0.9em; +} +table { + border: 1px solid #e7e7e7 !important; + border-collapse: collapse; + border-spacing: 0; + margin: 0 -1px 24px 0; + text-align: left; + width: 100%; +} +tr th, +thead th { + border: none !important; + color: #888; + font-size: 12px; + font-weight: bold; + line-height: 18px; + padding: 9px 24px; +} +tr td { + border: none !important; + border-top: 1px solid #e7e7e7 !important; + padding: 6px 24px; +} +img { + margin: 0; +} +img.size-auto, +img.size-large, +img.size-full, +img.size-medium { + max-width: 100%; + height: auto; +} +.alignleft, +img.alignleft { + display: inline; + float: left; + margin-right: 24px; + margin-top: 4px; +} +.alignright, +img.alignright { + display: inline; + float: right; + margin-left: 24px; + margin-top: 4px; +} +.aligncenter, +img.aligncenter { + clear: both; + display: block; + margin-left: auto; + margin-right: auto; +} +img.alignleft, +img.alignright, +img.aligncenter { + margin-bottom: 12px; +} +.wp-caption { + background: #f1f1f1; + border: none; + -khtml-border-radius: 0; + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; + color: #888; + font-size: 12px; + line-height: 18px; + margin-bottom: 20px; + max-width: 632px !important; /* prevent too-wide images from breaking layout */ + padding: 4px; + text-align: center; +} +.wp-caption img { + margin: 5px; +} +.wp-caption p.wp-caption-text { + margin: 0 0 4px; +} +.wp-smiley { + margin: 0; +}