Add more upstream patches

src/patches/dojoStylesPill.patch

@@ -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';
+

src/patches/keepBodyStyle.patch

@@ -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;

src/updateWebODF.sh

@@ -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