2 files changed, 7 insertions, 0 deletions
diff --git a/css/basic.css b/css/basic.css
index 2ad21b6ca..793f5cca0 100755
--- a/css/basic.css
+++ b/css/basic.css
@@ -168,6 +168,9 @@ img {
     background-color: transparent;
     font-style: italic;
 }
+img, object {
+    max-width: 100%;
+}
 
 hr {
     border-top: solid __border__;
diff --git a/css/design.css b/css/design.css
index f798b03cc..f75df1140 100755
--- a/css/design.css
+++ b/css/design.css
@@ -358,6 +358,8 @@
 #dokuwiki__aside .pad {
     line-height: 1.2;
     font-size: 0.875em;
+    overflow: hidden;
+    word-wrap: break-word;
 }
 
 /* make sidebar more condensed */
@@ -419,6 +421,8 @@
     border-radius: 2px;
     padding: 2em;
     margin-bottom: .5em;
+    overflow: hidden;
+    word-wrap: break-word;
 }
 
 .dokuwiki .docInfo {