Skip to content

Commit dd6c56d

Browse files
acebalacebal
committed
Now working everything, without margin collapsing, even on resize (unless in Opera, where it worked before having to put the computed height of elements to 'auto' for computing their heights).
1 parent 85d8650 commit dd6c56d

25 files changed

Lines changed: 503 additions & 263 deletions

tests/css/almcss-debug.css renamed to css/almcss-debug.css

File renamed without changes.

‎examples/columns-000.html‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8" />
5+
<title>ALMCSS3 Examples - Equal Width Columns</title>
6+
<link rel="stylesheet" href="css/columns-base.css" type="text/css" />
7+
<style>
8+
9+
#container {
10+
grid: "aaa"
11+
"bcd";
12+
background: #FF4242;
13+
}
14+
15+
h1 { flow: a; }
16+
17+
#one { flow: b; }
18+
#two { flow: c; }
19+
#three { flow: d; }
20+
21+
#container::slot(a) {
22+
background: rgb(81, 81, 81);
23+
color: #eee;
24+
}
25+
26+
#container::slot(b) {
27+
background:rgb(0, 180, 255);
28+
color: white;
29+
}
30+
31+
#container::slot(c) {
32+
background: rgb(255, 255, 255);
33+
color: rgb(81, 81, 81);
34+
}
35+
36+
#container::slot(d) {
37+
background: rgb(238, 238, 238);
38+
color: #101101;
39+
}
40+
41+
#one, #two, #three, h1 {
42+
padding: 30px;
43+
}
44+
45+
h1, h2 { line-height: 1; }
46+
h1 { font-size: 3em }
47+
48+
</style>
49+
<script type="text/javascript" src="../js/almcss3/almcss.js"></script>
50+
</head>
51+
<body>
52+
<div id="container">
53+
<h1>Columns</h1>
54+
<div id='one'>
55+
<h2>One</h2>
56+
</div>
57+
<div id='two'>
58+
<h2>Two</h2>
59+
</div>
60+
<div id='three'>
61+
<h2>Three</h2>
62+
</div>
63+
</div>
64+
</body>
65+
</html>

‎examples/columns.html‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎examples/css/columns-base.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ body {
77

88
/* Colors */
99

10+
/*
11+
1012
h1 {
1113
background: rgb(81, 81, 81);
1214
color: white;
@@ -27,6 +29,8 @@ h1 {
2729
color: #101101;
2830
}
2931
32+
*/
33+
3034
/* Typography */
3135

3236
h1 {

‎examples/index.html‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8" />
5+
<title>ALMCSS3 - Examples</title>
6+
<link rel="stylesheet" href="css/base.css" type="text/css" />
7+
</head>
8+
<body>
9+
10+
<h1>ALMCSS3 Tests</h1>
11+
12+
<ul class="toc">
13+
<li>
14+
<a href="columns-000.html">columns-000.html</a>
15+
</li>
16+
</ul>
17+
18+
</body>
19+
</html>

‎js/almcss3/almcss.js‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ var ALMCSS = function() {
1111

1212
var SCRIPT_NAME = 'almcss.js';
1313

14+
15+
var isResize = function() {
16+
return isResize;
17+
};
18+
1419
if (!Object.create) {
1520
Object.create = function(o) {
1621
var F = function() {};
@@ -151,6 +156,8 @@ var ALMCSS = function() {
151156
logger.info('All done!');
152157
logger.groupEnd();
153158

159+
ALMCSS.Config.isResize = true;
160+
154161
};
155162

156163
// Events
@@ -243,7 +250,7 @@ var ALMCSS = function() {
243250
return {
244251
AlmcssError: AlmcssError,
245252
include: module.include,
246-
loadModules: loadModules
253+
loadModules: loadModules,
247254
};
248255

249256
}();

0 commit comments

Comments
 (0)