DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add more upstream patches

Browse Source
This commit is contained in:
Victor Dubiniuk 2013-11-26 00:14:49 +03:00
parent 8a337ebfad
commit 2bab561b41
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/patches/dojoStylesPill.patch Normal file
View File

@ -0,0 +1,14 @@
diff --git a/css/3rdparty/webodf/dojo-app.css b/css/3rdparty/webodf/dojo-app.css
index a30426b..ee1c0f3 100644
--- a/css/3rdparty/webodf/dojo-app.css
+++ b/css/3rdparty/webodf/dojo-app.css
@@ -6,7 +6,7 @@
* It is highly, highly recommended that you develop your CSS using Stylus: http://learnboost.github.com/stylus/.
*/
-@import '../../../js/3rdparty/resources/dojo/resources/dojo.css';
+/* @import '../../../js/3rdparty/resources/dojo/resources/dojo.css'; */
@import '../../../js/3rdparty/resources/dijit/themes/claro/claro.css';
@import '../../../js/3rdparty/resources/dojox/layout/resources/ExpandoPane.css';
@import '../../../js/3rdparty/resources/dojox/widget/ColorPicker/ColorPicker.css';

10
src/patches/keepBodyStyle.patch Normal file
View File

@ -0,0 +1,10 @@
diff --git a/css/3rdparty/webodf/editor.css b/css/3rdparty/webodf/editor.css
index 42f64a1..23f86ee 100644
--- a/css/3rdparty/webodf/editor.css
+++ b/css/3rdparty/webodf/editor.css
@@ -1,4 +1,4 @@
-html, body, #mainContainer {
+body.claro, #mainContainer {
width: 100%;
height: 100%;
margin: 0;

2
src/updateWebODF.sh
View File

@ -36,3 +36,5 @@ cp "$WEBODF_BUILDDIR"/programs/editor/editor.css ./css/3rdparty/webodf
patch -p1 -i src/patches/fontsCssPath.patch
patch -p1 -i src/patches/hideCaretAvatar.patch
patch -p1 -i src/patches/MemberListView-OCavatar.patch
patch -p1 -i src/patches/keepBodyStyle.patch
patch -p1 -i src/patches/dojoStylesPill.patch