From 298210db8334de5ee2a099ebb46bdb299f29108d Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 19 Jan 2010 06:27:15 -0500
Subject: [PATCH] Fixed: FS#940 - Interface is squished in Google Chrome
---
interface/web/themes/default/templates/main.tpl.htm | 8 -
interface/web/themes/default/css/screen/basemod.css | 236 +++++++++++++++++++++++-----------------------
2 files changed, 117 insertions(+), 127 deletions(-)
diff --git a/interface/web/themes/default/css/screen/basemod.css b/interface/web/themes/default/css/screen/basemod.css
index b4270f9..7bf7f39 100644
--- a/interface/web/themes/default/css/screen/basemod.css
+++ b/interface/web/themes/default/css/screen/basemod.css
@@ -1,119 +1,117 @@
-@charset "UTF-8";
-/**
- * "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework
- *
- * (en) Screen layout for YAML - ISPConfig 3: default theme
- * (de) Bildschirmlayout fr YAML - ISPConfig 3: default theme
- *
- * @copyright Copyright 2005-2008, Dirk Jesse
- * @license CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/),
- * YAML-C (http://www.yaml.de/en/license/license-conditions.html)
- * @link http://www.yaml.de
- * @package yaml
- * @version 3.0.6
- * @revision $Revision: 202 $
- * @lastmodified $Date: 2008-06-07 14:29:18 +0200 (Sa, 07 Jun 2008) $
- */
-
-@media screen, projection
-{
- /*------------------------------------------------------------------------------------------------------*/
-
- /**
- * (en) Formatting YAML's basic layout elements
- * (de) Gestaltung des YAML Basis-Layouts
- */
-
- /* (en) Marginal areas & page background */
- /* (de) Randbereiche & Seitenhintergrund */
- body { background: #EEEEEE url("../../images/screen_bg.png") repeat-x top left fixed; padding: 10px 0; }
-
- /* (en) Centering layout in old IE-versions */
- /* (de) Zentrierung des Layouts in alten IE-versionen */
- body { text-align: center; }
- #page_margins { text-align:left; margin: 0 auto; }
-
- /* (en) Layout: width, background, borders */
- /* (de) Layout: Breite, Hintergrund, Rahmen */
- /*WARNING: ADded a overrode for this setting in main.tpl with javascript to target non chrome browsers,
- This has to be changed too in case that page_margins get changed. Reason: Chrome does not support the
- display: table; attribute correctly*/
- #page_margins { min-width: 980px; max-width: 80%; background: #fff;}
- #page{ padding: 10px; }
-
- /* (en) Designing main layout elements */
- /* (de) Gestaltung der Hauptelemente des Layouts */
- #header {
- color: #faf0e6;
- padding: 15px 2em 1em 20px;
- background: #9a9a9a url(../../images/header_bg.png) repeat-x top left;
- }
-
- /* (en) Text Alignment for #topnav content */
- /* (de) Textausrichtung für #topnav Inhalte */
- #topnav { text-align: left; }
-
- /* (en) Absolute positioning only within #header */
- /* (de) Absolute Positionierung erfolgt nur innerhalb von #header */
- #header #topnav {
- position: absolute;
- top: 0px;
- left: 0px;
- }
-
- /* (en) Text Alignment for #topnav content */
- /* (de) Textausrichtung für #topnav Inhalte */
- #topsubnav { text-align: right; }
-
- /* (en) Absolute positioning only within #header */
- /* (de) Absolute Positionierung erfolgt nur innerhalb von #header */
- #header #topsubnav {
- position:absolute;
- top: 10px;
- right: 10px;
- }
-
- /* (en) adjustment of main navigation */
- /* (de) Anpassung der Hauptnavigation */
- #nav ul { margin-left: 200px; }
- #nav_main { background: #9a9a9a repeat-x top left; }
-
- #main { background: #fff;padding:10px 0; }
-
- #footer {
- color:#666;
- background: #f9f9f9;
- padding: 10px 20px;
- border-top: 5px #efefef solid;
- font-size: 0.8em;
- text-align: center;
- }
-
- /*------------------------------------------------------------------------------------------------------*/
-
- /**
- * (en) Formatting content container
- * (de) Formatierung der Inhalts-Container
- *
- * |-------------------------------|
- * | #header |
- * |-------------------------------|
- * | #col1 | #col3 | #col2 |
- * | 25% | flexible | 25% |
- * |-------------------------------|
- * | #footer |
- * |-------------------------------|
- */
-
-
- #col1 { width: 25%; }
- #col1_content { padding: 10px 10px 10px 20px; }
-
- #col2 { width: 25%; }
- #col2_content { padding: 10px 20px 10px 10px; }
-
- #col3 { margin: 0 25%; }
- #col3_content { padding: 10px; }
-
- /*------------------------------------------------------------------------------------------------------*/
-}
+@charset "UTF-8";
+/**
+ * "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework
+ *
+ * (en) Screen layout for YAML - ISPConfig 3: default theme
+ * (de) Bildschirmlayout fr YAML - ISPConfig 3: default theme
+ *
+ * @copyright Copyright 2005-2008, Dirk Jesse
+ * @license CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/),
+ * YAML-C (http://www.yaml.de/en/license/license-conditions.html)
+ * @link http://www.yaml.de
+ * @package yaml
+ * @version 3.0.6
+ * @revision $Revision: 202 $
+ * @lastmodified $Date: 2008-06-07 14:29:18 +0200 (Sa, 07 Jun 2008) $
+ */
+
+@media screen, projection
+{
+ /*------------------------------------------------------------------------------------------------------*/
+
+ /**
+ * (en) Formatting YAML's basic layout elements
+ * (de) Gestaltung des YAML Basis-Layouts
+ */
+
+ /* (en) Marginal areas & page background */
+ /* (de) Randbereiche & Seitenhintergrund */
+ body { background: #EEEEEE url("../../images/screen_bg.png") repeat-x top left fixed; padding: 10px 0; }
+
+ /* (en) Centering layout in old IE-versions */
+ /* (de) Zentrierung des Layouts in alten IE-versionen */
+ body { text-align: center; }
+ #page_margins { text-align:left; margin: 0 auto; }
+
+ /* (en) Layout: width, background, borders */
+ /* (de) Layout: Breite, Hintergrund, Rahmen */
+ /*#page_margins { min-width: 980px; max-width: 80%; background: #fff;}*/
+ #page_margins { min-width: 980px; max-width: 80%; background: #fff; display: inline-block;}
+ #page{ padding: 10px; }
+
+ /* (en) Designing main layout elements */
+ /* (de) Gestaltung der Hauptelemente des Layouts */
+ #header {
+ color: #faf0e6;
+ padding: 15px 2em 1em 20px;
+ background: #9a9a9a url(../../images/header_bg.png) repeat-x top left;
+ }
+
+ /* (en) Text Alignment for #topnav content */
+ /* (de) Textausrichtung für #topnav Inhalte */
+ #topnav { text-align: left; }
+
+ /* (en) Absolute positioning only within #header */
+ /* (de) Absolute Positionierung erfolgt nur innerhalb von #header */
+ #header #topnav {
+ position: absolute;
+ top: 0px;
+ left: 0px;
+ }
+
+ /* (en) Text Alignment for #topnav content */
+ /* (de) Textausrichtung für #topnav Inhalte */
+ #topsubnav { text-align: right; }
+
+ /* (en) Absolute positioning only within #header */
+ /* (de) Absolute Positionierung erfolgt nur innerhalb von #header */
+ #header #topsubnav {
+ position:absolute;
+ top: 10px;
+ right: 10px;
+ }
+
+ /* (en) adjustment of main navigation */
+ /* (de) Anpassung der Hauptnavigation */
+ #nav ul { margin-left: 200px; }
+ #nav_main { background: #9a9a9a repeat-x top left; }
+
+ #main { background: #fff;padding:10px 0; }
+
+ #footer {
+ color:#666;
+ background: #f9f9f9;
+ padding: 10px 20px;
+ border-top: 5px #efefef solid;
+ font-size: 0.8em;
+ text-align: center;
+ }
+
+ /*------------------------------------------------------------------------------------------------------*/
+
+ /**
+ * (en) Formatting content container
+ * (de) Formatierung der Inhalts-Container
+ *
+ * |-------------------------------|
+ * | #header |
+ * |-------------------------------|
+ * | #col1 | #col3 | #col2 |
+ * | 25% | flexible | 25% |
+ * |-------------------------------|
+ * | #footer |
+ * |-------------------------------|
+ */
+
+
+ #col1 { width: 25%; }
+ #col1_content { padding: 10px 10px 10px 20px; }
+
+ #col2 { width: 25%; }
+ #col2_content { padding: 10px 20px 10px 10px; }
+
+ #col3 { margin: 0 25%; }
+ #col3_content { padding: 10px; }
+
+ /*------------------------------------------------------------------------------------------------------*/
+}
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index d7aad2f..c32923d 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -58,14 +58,6 @@
<script type="text/javascript" src="js/scrigo.js.php"></script>
<script type="text/javascript" src="js/uni-form/jquery.js"></script>
<script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
- <script language="JavaScript" type="text/javascript">
- var is_chrome = navigator.userAgent.toLowerCase().indexOf('chrome') > -1;
- if(!is_chrome) {
- var style = document.createElement('style');
- style.innerHTML = '#page_margins { min-width: 980px; max-width: 80%; background: #fff; display: table;}';
- document.getElementsByTagName("head")[0].appendChild(style);
- }
- </script>
</head>
<body onload="loadInitContent()">
<div id="page_margins">
--
Gitblit v1.9.1