github/less.js
1
1
Fork 0
mirror of https://github.com/less/less.js.git synced 2026-02-06 04:55:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge errors/problems and change format to ++

Browse Source
This commit is contained in:
Luke Page
2012-10-28 16:53:29 +00:00
parent 815ca4a818
commit ecc9b0606b
11 changed files with 213 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/css/extend-clearfix.css
View File

@@ -1,7 +1,11 @@
.clearfix, .foo, .bar {
.clearfix,
.foo,
.bar {
*zoom: 1;
}
.clearfix:after, .foo:after, .bar:after {
.clearfix:after,
.foo:after,
.bar:after {
content: '';
display: block;
clear: both;

8
test/css/extend-nest.css
View File

@@ -1,8 +1,12 @@
.sidebar, .sidebar2, .type1 .sidebar3 {
.sidebar,
.sidebar2,
.type1 .sidebar3 {
width: 300px;
background: red;
}
.sidebar .box, .sidebar2 .box, .type1 .sidebar3 .box {
.sidebar .box,
.sidebar2 .box,
.type1 .sidebar3 .box {
background: #FFF;
border: 1px solid #000;
margin: 10px 0;

9
test/css/extend.css
View File

@@ -1,12 +1,15 @@
.error, .badError {
.error,
.badError {
border: 1px #f00;
background: #fdd;
}
.error.intrusion, .badError.intrusion {
.error.intrusion,
.badError.intrusion {
font-size: 1.3em;
font-weight: bold;
}
.intrusion .error, .intrusion .badError {
.intrusion .error,
.intrusion .badError {
display: none;
}
.badError {