Skip to content

Commit 43d1e00

Browse files
peteboerepeteboere
committed
Merge branch 'test'
2 parents da4b97b + ed61165 commit 43d1e00

19 files changed

+530
-142
lines changed

‎Aliases.ini

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,29 @@
9898
box-sizing[] = -moz-box-sizing
9999

100100
; Columns
101+
columns[] = -webkit-columns
102+
columns[] = -moz-columns
101103
column-count[] = -webkit-column-count
102104
column-count[] = -moz-column-count
105+
column-fill[] = -webkit-column-fill
106+
column-fill[] = -moz-column-fill
103107
column-gap[] = -webkit-column-gap
104108
column-gap[] = -moz-column-gap
109+
column-rule[] = -webkit-column-rule
110+
column-rule[] = -moz-column-rule
111+
column-rule-style[] = -webkit-column-rule-style
112+
column-rule-style[] = -moz-column-rule-style
113+
column-rule-width[] = -webkit-column-rule-width
114+
column-rule-width[] = -moz-column-rule-width
115+
column-rule-style[] = -webkit-column-rule-style
116+
column-rule-style[] = -moz-column-rule-style
117+
column-rule-color[] = -webkit-column-rule-color
118+
column-rule-color[] = -moz-column-rule-color
119+
column-span[] = -webkit-column-span
120+
column-span[] = -moz-column-span
121+
column-width[] = -webkit-column-width
122+
column-width[] = -moz-column-width
123+
105124

106125
; Border-image
107126
border-image[] = -webkit-border-image
@@ -138,9 +157,15 @@
138157
; User select (non standard)
139158
user-select[] = -webkit-user-select
140159
user-select[] = -moz-user-select
160+
user-select[] = -ms-user-select
141161
user-select[] = -o-user-select
142162
user-select[] = user-select
143163

164+
; Tab size
165+
tab-size[] = -webkit-tab-size
166+
tab-size[] = -moz-tab-size
167+
tab-size[] = -o-tab-size
168+
144169

145170
;----------------------------------------------------------------------------
146171
;-- Value aliases
@@ -177,6 +202,7 @@
177202
repeating-radial-gradient[] = -o-repeating-radial-gradient
178203

179204
; Calc
205+
calc[] = -webkit-calc
180206
calc[] = -moz-calc
181207

182208

‎CHANGELOG

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
1.4
2+
-----
3+
Added initial-keyword plugin (shim for the CSS3 keyword)
4+
Added inline method (Issue #18)
5+
Added ability to escape declarations from aliasing or plugins by prefixing with tilde
6+
Added procedural style public API to mirror the static class API
7+
Deprecated @variables syntax for @define. @variables still supported
8+
Adjusted color functions to accept a space delimiter (as well as comma) in the arguments list
9+
Surpressed some benign PHP warning messages
10+
Some internal cleaning up
11+
Disabled IE6 min-height plugin by default
12+
13+
114
1.3.6
215
-----
316
Improved color functions

‎CssCrush.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* CSS Crush
55
* Extensible CSS preprocessor
66
*
7-
* @version 1.3.6
7+
* @version 1.4
88
* @license http://www.opensource.org/licenses/mit-license.php (MIT)
99
* @copyright Copyright 2010-2011 Pete Boere
1010
*
@@ -21,6 +21,7 @@
2121
*
2222
*/
2323

24+
require_once 'lib/Util.php';
2425
require_once 'lib/Core.php';
2526
CssCrush::init( dirname( __FILE__ ) );
2627

‎Plugins.ini

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
;----------------------------------------------------------------
44

55
; min-height shim for IE < 7
6-
plugins[] = ie-min-height.php
6+
; plugins[] = ie-min-height.php
77

88
; inline-block shim for IE < 8
99
plugins[] = ie-inline-block.php
@@ -27,4 +27,7 @@ plugins[] = hsl-to-hex.php
2727
plugins[] = double-colon.php
2828

2929
; Non-standard composite pseudo classes
30-
plugins[] = hocus-pocus.php
30+
plugins[] = hocus-pocus.php
31+
32+
; CSS3 'initial' keyword shim
33+
plugins[] = initial.php

0 commit comments

Comments
 (0)