Move WebODF js/css code to 3rdparty

pull/1/head
Victor Dubiniuk 11 years ago
parent 86268cdccd
commit 89fdf22265

@ -6,7 +6,7 @@
* It is highly, highly recommended that you develop your CSS using Stylus: http://learnboost.github.com/stylus/. * It is highly, highly recommended that you develop your CSS using Stylus: http://learnboost.github.com/stylus/.
*/ */
@import '../resources/dojo/resources/dojo.css'; @import '../../../js/3rdparty/resources/dojo/resources/dojo.css';
@import '../resources/dijit/themes/claro/claro.css'; @import '../../../js/3rdparty/resources/dijit/themes/claro/claro.css';
@import '../resources/dojox/layout/resources/ExpandoPane.css'; @import '../../../js/3rdparty/resources/dojox/layout/resources/ExpandoPane.css';
@import '../resources/dojox/widget/ColorPicker/ColorPicker.css'; @import '../../../js/3rdparty/resources/dojox/widget/ColorPicker/ColorPicker.css';

@ -1,126 +1,126 @@
@font-face { @font-face {
font-family: "Gentium Basic"; font-family: "Gentium Basic";
src: url("../resources/fonts/GenBasR.ttf") format("truetype"); src: url("./fonts/GenBasR.ttf") format("truetype");
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: "Gentium Basic"; font-family: "Gentium Basic";
src: url("../resources/fonts/GenBasB.ttf") format("truetype"); src: url("./fonts/GenBasB.ttf") format("truetype");
font-weight: bold; font-weight: bold;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: "Gentium Basic"; font-family: "Gentium Basic";
src: url("../resources/fonts/GenBasI.ttf") format("truetype"); src: url("./fonts/GenBasI.ttf") format("truetype");
font-weight: normal; font-weight: normal;
font-style: italic; font-style: italic;
} }
@font-face { @font-face {
font-family: "Gentium Basic"; font-family: "Gentium Basic";
src: url("../resources/fonts/GenBasBI.ttf") format("truetype"); src: url("./fonts/GenBasBI.ttf") format("truetype");
font-weight: bold; font-weight: bold;
font-style: italic; font-style: italic;
} }
@font-face { @font-face {
font-family: "Liberation Mono"; font-family: "Liberation Mono";
src: url("../resources/fonts/LiberationMono-Regular.ttf") format("truetype"); src: url("./fonts/LiberationMono-Regular.ttf") format("truetype");
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: "Liberation Mono"; font-family: "Liberation Mono";
src: url("../resources/fonts/LiberationMono-Bold.ttf") format("truetype"); src: url("./fonts/LiberationMono-Bold.ttf") format("truetype");
font-weight: bold; font-weight: bold;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: "Liberation Mono"; font-family: "Liberation Mono";
src: url("../resources/fonts/LiberationMono-Italic.ttf") format("truetype"); src: url("./fonts/LiberationMono-Italic.ttf") format("truetype");
font-weight: normal; font-weight: normal;
font-style: italic; font-style: italic;
} }
@font-face { @font-face {
font-family: "Liberation Mono"; font-family: "Liberation Mono";
src: url("../resources/fonts/LiberationMono-BoldItalic.ttf") format("truetype"); src: url("./fonts/LiberationMono-BoldItalic.ttf") format("truetype");
font-weight: bold; font-weight: bold;
font-style: italic; font-style: italic;
} }
@font-face { @font-face {
font-family: "Liberation Sans"; font-family: "Liberation Sans";
src: url("../resources/fonts/LiberationSans-Regular.ttf") format("truetype"); src: url("./fonts/LiberationSans-Regular.ttf") format("truetype");
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: "Liberation Sans"; font-family: "Liberation Sans";
src: url("../resources/fonts/LiberationSans-Bold.ttf") format("truetype"); src: url("./fonts/LiberationSans-Bold.ttf") format("truetype");
font-weight: bold; font-weight: bold;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: "Liberation Sans"; font-family: "Liberation Sans";
src: url("../resources/fonts/LiberationSans-Italic.ttf") format("truetype"); src: url("./fonts/LiberationSans-Italic.ttf") format("truetype");
font-weight: normal; font-weight: normal;
font-style: italic; font-style: italic;
} }
@font-face { @font-face {
font-family: "Liberation Sans"; font-family: "Liberation Sans";
src: url("../resources/fonts/LiberationSans-BoldItalic.ttf") format("truetype"); src: url("./fonts/LiberationSans-BoldItalic.ttf") format("truetype");
font-weight: bold; font-weight: bold;
font-style: italic; font-style: italic;
} }
@font-face { @font-face {
font-family: "Liberation Serif"; font-family: "Liberation Serif";
src: url("../resources/fonts/LiberationSerif-Regular.ttf") format("truetype"); src: url("./fonts/LiberationSerif-Regular.ttf") format("truetype");
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: "Liberation Serif"; font-family: "Liberation Serif";
src: url("../resources/fonts/LiberationSerif-Bold.ttf") format("truetype"); src: url("./fonts/LiberationSerif-Bold.ttf") format("truetype");
font-weight: bold; font-weight: bold;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: "Liberation Serif"; font-family: "Liberation Serif";
src: url("../resources/fonts/LiberationSerif-Italic.ttf") format("truetype"); src: url("./fonts/LiberationSerif-Italic.ttf") format("truetype");
font-weight: normal; font-weight: normal;
font-style: italic; font-style: italic;
} }
@font-face { @font-face {
font-family: "Liberation Serif"; font-family: "Liberation Serif";
src: url("../resources/fonts/LiberationSerif-BoldItalic.ttf") format("truetype"); src: url("./fonts/LiberationSerif-BoldItalic.ttf") format("truetype");
font-weight: bold; font-weight: bold;
font-style: italic; font-style: italic;
} }
@font-face { @font-face {
font-family: "Linux Biolinum G"; font-family: "Linux Biolinum G";
src: url("../resources/fonts/LinBiolinum_R_G.ttf") format("truetype"); src: url("./fonts/LinBiolinum_R_G.ttf") format("truetype");
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: "Linux Biolinum G"; font-family: "Linux Biolinum G";
src: url("../resources/fonts/LinBiolinum_RB_G.ttf") format("truetype"); src: url("./fonts/LinBiolinum_RB_G.ttf") format("truetype");
font-weight: bold; font-weight: bold;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: "Linux Biolinum G"; font-family: "Linux Biolinum G";
src: url("../resources/fonts/LinBiolinum_RI_G.ttf") format("truetype"); src: url("./fonts/LinBiolinum_RI_G.ttf") format("truetype");
font-weight: normal; font-weight: normal;
font-style: italic; font-style: italic;
} }
@font-face { @font-face {
font-family: "Lohit Devanagari"; font-family: "Lohit Devanagari";
src: url("../resources/fonts/Lohit-Devanagari.ttf") format("truetype"); src: url("./fonts/Lohit-Devanagari.ttf") format("truetype");
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: "WenQuanYi Micro Hei"; font-family: "WenQuanYi Micro Hei";
src: url("../resources/fonts/wqy-microhei.ttc") format("truetype"); src: url("./fonts/wqy-microhei.ttc") format("truetype");
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }

@ -29,8 +29,8 @@ namespace OCA\Documents;
\OCP\App::setActiveNavigationEntry( 'documents_index' ); \OCP\App::setActiveNavigationEntry( 'documents_index' );
\OCP\Util::addStyle( 'documents', 'style' ); \OCP\Util::addStyle( 'documents', 'style' );
\OCP\Util::addStyle( 'documents', 'dojo-app' ); \OCP\Util::addStyle( 'documents', '3rdparty/webodf/dojo-app');
\OCP\Util::addStyle( 'documents', 'editor' ); \OCP\Util::addStyle( 'documents', '3rdparty/webodf/editor' );
\OCP\Util::addScript('documents', 'documents'); \OCP\Util::addScript('documents', 'documents');
\OCP\Util::addScript('files', 'file-upload'); \OCP\Util::addScript('files', 'file-upload');

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

Before

Width:  |  Height:  |  Size: 282 B

After

Width:  |  Height:  |  Size: 282 B

Before

Width:  |  Height:  |  Size: 808 B

After

Width:  |  Height:  |  Size: 808 B

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save