Merge remote-tracking branch 'origin/v311-fixes'

thexerteproject · Jul 21, 2022 · ad08a73 · ad08a73
2 parents fed4131 + 849c76b
commit ad08a73
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/modules/xerte/parent_templates/Nottingham/common_html5/css/themeStyles.css b/modules/xerte/parent_templates/Nottingham/common_html5/css/themeStyles.css
@@ -26,6 +26,7 @@ body {
 
 #x_mainHolder {
 	border:		1px solid #010101;
+	box-sizing: border-box;
 }
 
 #x_headerBlock {

diff --git a/modules/xerte/parent_templates/Nottingham/common_html5/js/xenith.js b/modules/xerte/parent_templates/Nottingham/common_html5/js/xenith.js
@@ -3334,8 +3334,7 @@ function x_setFillWindow(updatePage) {
     }
 
     $x_mainHolder.css({
-        // The right border is cut off when embedding if setting to 100%
-		"width"     :"99.8%",
+		"width"     :"100%",
         "height"    :"100%"
     });