Skip to content

Commit 298210d

Browse files
tbrehmtbrehm
committed
Fixed: FS#940 - Interface is squished in Google Chrome
1 parent c5e0954 commit 298210d

File tree

2 files changed

+117
-127
lines changed

2 files changed

+117
-127
lines changed

‎interface/web/themes/default/css/screen/basemod.css‎

Lines changed: 117 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -1,119 +1,117 @@
1-
@charset "UTF-8";
2-
/**
3-
* "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework
4-
*
5-
* (en) Screen layout for YAML - ISPConfig 3: default theme
6-
* (de) Bildschirmlayout fr YAML - ISPConfig 3: default theme
7-
*
8-
* @copyright Copyright 2005-2008, Dirk Jesse
9-
* @license CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/),
10-
* YAML-C (http://www.yaml.de/en/license/license-conditions.html)
11-
* @link http://www.yaml.de
12-
* @package yaml
13-
* @version 3.0.6
14-
* @revision $Revision: 202 $
15-
* @lastmodified $Date: 2008-06-07 14:29:18 +0200 (Sa, 07 Jun 2008) $
16-
*/
17-
18-
@media screen, projection
19-
{
20-
/*------------------------------------------------------------------------------------------------------*/
21-
22-
/**
23-
* (en) Formatting YAML's basic layout elements
24-
* (de) Gestaltung des YAML Basis-Layouts
25-
*/
26-
27-
/* (en) Marginal areas & page background */
28-
/* (de) Randbereiche & Seitenhintergrund */
29-
body { background: #EEEEEE url("../../images/screen_bg.png") repeat-x top left fixed; padding: 10px 0; }
30-
31-
/* (en) Centering layout in old IE-versions */
32-
/* (de) Zentrierung des Layouts in alten IE-versionen */
33-
body { text-align: center; }
34-
#page_margins { text-align:left; margin: 0 auto; }
35-
36-
/* (en) Layout: width, background, borders */
37-
/* (de) Layout: Breite, Hintergrund, Rahmen */
38-
/*WARNING: ADded a overrode for this setting in main.tpl with javascript to target non chrome browsers,
39-
This has to be changed too in case that page_margins get changed. Reason: Chrome does not support the
40-
display: table; attribute correctly*/
41-
#page_margins { min-width: 980px; max-width: 80%; background: #fff;}
42-
#page{ padding: 10px; }
43-
44-
/* (en) Designing main layout elements */
45-
/* (de) Gestaltung der Hauptelemente des Layouts */
46-
#header {
47-
color: #faf0e6;
48-
padding: 15px 2em 1em 20px;
49-
background: #9a9a9a url(../../images/header_bg.png) repeat-x top left;
50-
}
51-
52-
/* (en) Text Alignment for #topnav content */
53-
/* (de) Textausrichtung für #topnav Inhalte */
54-
#topnav { text-align: left; }
55-
56-
/* (en) Absolute positioning only within #header */
57-
/* (de) Absolute Positionierung erfolgt nur innerhalb von #header */
58-
#header #topnav {
59-
position: absolute;
60-
top: 0px;
61-
left: 0px;
62-
}
63-
64-
/* (en) Text Alignment for #topnav content */
65-
/* (de) Textausrichtung für #topnav Inhalte */
66-
#topsubnav { text-align: right; }
67-
68-
/* (en) Absolute positioning only within #header */
69-
/* (de) Absolute Positionierung erfolgt nur innerhalb von #header */
70-
#header #topsubnav {
71-
position:absolute;
72-
top: 10px;
73-
right: 10px;
74-
}
75-
76-
/* (en) adjustment of main navigation */
77-
/* (de) Anpassung der Hauptnavigation */
78-
#nav ul { margin-left: 200px; }
79-
#nav_main { background: #9a9a9a repeat-x top left; }
80-
81-
#main { background: #fff;padding:10px 0; }
82-
83-
#footer {
84-
color:#666;
85-
background: #f9f9f9;
86-
padding: 10px 20px;
87-
border-top: 5px #efefef solid;
88-
font-size: 0.8em;
89-
text-align: center;
90-
}
91-
92-
/*------------------------------------------------------------------------------------------------------*/
93-
94-
/**
95-
* (en) Formatting content container
96-
* (de) Formatierung der Inhalts-Container
97-
*
98-
* |-------------------------------|
99-
* | #header |
100-
* |-------------------------------|
101-
* | #col1 | #col3 | #col2 |
102-
* | 25% | flexible | 25% |
103-
* |-------------------------------|
104-
* | #footer |
105-
* |-------------------------------|
106-
*/
107-
108-
109-
#col1 { width: 25%; }
110-
#col1_content { padding: 10px 10px 10px 20px; }
111-
112-
#col2 { width: 25%; }
113-
#col2_content { padding: 10px 20px 10px 10px; }
114-
115-
#col3 { margin: 0 25%; }
116-
#col3_content { padding: 10px; }
117-
118-
/*------------------------------------------------------------------------------------------------------*/
119-
}
1+
@charset "UTF-8";
2+
/**
3+
* "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework
4+
*
5+
* (en) Screen layout for YAML - ISPConfig 3: default theme
6+
* (de) Bildschirmlayout fr YAML - ISPConfig 3: default theme
7+
*
8+
* @copyright Copyright 2005-2008, Dirk Jesse
9+
* @license CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/),
10+
* YAML-C (http://www.yaml.de/en/license/license-conditions.html)
11+
* @link http://www.yaml.de
12+
* @package yaml
13+
* @version 3.0.6
14+
* @revision $Revision: 202 $
15+
* @lastmodified $Date: 2008-06-07 14:29:18 +0200 (Sa, 07 Jun 2008) $
16+
*/
17+
18+
@media screen, projection
19+
{
20+
/*------------------------------------------------------------------------------------------------------*/
21+
22+
/**
23+
* (en) Formatting YAML's basic layout elements
24+
* (de) Gestaltung des YAML Basis-Layouts
25+
*/
26+
27+
/* (en) Marginal areas & page background */
28+
/* (de) Randbereiche & Seitenhintergrund */
29+
body { background: #EEEEEE url("../../images/screen_bg.png") repeat-x top left fixed; padding: 10px 0; }
30+
31+
/* (en) Centering layout in old IE-versions */
32+
/* (de) Zentrierung des Layouts in alten IE-versionen */
33+
body { text-align: center; }
34+
#page_margins { text-align:left; margin: 0 auto; }
35+
36+
/* (en) Layout: width, background, borders */
37+
/* (de) Layout: Breite, Hintergrund, Rahmen */
38+
/*#page_margins { min-width: 980px; max-width: 80%; background: #fff;}*/
39+
#page_margins { min-width: 980px; max-width: 80%; background: #fff; display: inline-block;}
40+
#page{ padding: 10px; }
41+
42+
/* (en) Designing main layout elements */
43+
/* (de) Gestaltung der Hauptelemente des Layouts */
44+
#header {
45+
color: #faf0e6;
46+
padding: 15px 2em 1em 20px;
47+
background: #9a9a9a url(../../images/header_bg.png) repeat-x top left;
48+
}
49+
50+
/* (en) Text Alignment for #topnav content */
51+
/* (de) Textausrichtung für #topnav Inhalte */
52+
#topnav { text-align: left; }
53+
54+
/* (en) Absolute positioning only within #header */
55+
/* (de) Absolute Positionierung erfolgt nur innerhalb von #header */
56+
#header #topnav {
57+
position: absolute;
58+
top: 0px;
59+
left: 0px;
60+
}
61+
62+
/* (en) Text Alignment for #topnav content */
63+
/* (de) Textausrichtung für #topnav Inhalte */
64+
#topsubnav { text-align: right; }
65+
66+
/* (en) Absolute positioning only within #header */
67+
/* (de) Absolute Positionierung erfolgt nur innerhalb von #header */
68+
#header #topsubnav {
69+
position:absolute;
70+
top: 10px;
71+
right: 10px;
72+
}
73+
74+
/* (en) adjustment of main navigation */
75+
/* (de) Anpassung der Hauptnavigation */
76+
#nav ul { margin-left: 200px; }
77+
#nav_main { background: #9a9a9a repeat-x top left; }
78+
79+
#main { background: #fff;padding:10px 0; }
80+
81+
#footer {
82+
color:#666;
83+
background: #f9f9f9;
84+
padding: 10px 20px;
85+
border-top: 5px #efefef solid;
86+
font-size: 0.8em;
87+
text-align: center;
88+
}
89+
90+
/*------------------------------------------------------------------------------------------------------*/
91+
92+
/**
93+
* (en) Formatting content container
94+
* (de) Formatierung der Inhalts-Container
95+
*
96+
* |-------------------------------|
97+
* | #header |
98+
* |-------------------------------|
99+
* | #col1 | #col3 | #col2 |
100+
* | 25% | flexible | 25% |
101+
* |-------------------------------|
102+
* | #footer |
103+
* |-------------------------------|
104+
*/
105+
106+
107+
#col1 { width: 25%; }
108+
#col1_content { padding: 10px 10px 10px 20px; }
109+
110+
#col2 { width: 25%; }
111+
#col2_content { padding: 10px 20px 10px 10px; }
112+
113+
#col3 { margin: 0 25%; }
114+
#col3_content { padding: 10px; }
115+
116+
/*------------------------------------------------------------------------------------------------------*/
117+
}

‎interface/web/themes/default/templates/main.tpl.htm‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,6 @@
5858
<script type="text/javascript" src="js/scrigo.js.php"></script>
5959
<script type="text/javascript" src="js/uni-form/jquery.js"></script>
6060
<script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
61-
<script language="JavaScript" type="text/javascript">
62-
var is_chrome = navigator.userAgent.toLowerCase().indexOf('chrome') > -1;
63-
if(!is_chrome) {
64-
var style = document.createElement('style');
65-
style.innerHTML = '#page_margins { min-width: 980px; max-width: 80%; background: #fff; display: table;}';
66-
document.getElementsByTagName("head")[0].appendChild(style);
67-
}
68-
</script>
6961
</head>
7062
<body onload="loadInitContent()">
7163
<div id="page_margins">

0 commit comments

Comments
 (0)