Skip to content

contrast() now accepts percentage threshold #523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

contrast() now accepts percentage threshold #523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdcd77b
contrast() now accepts percentage threshold
atkaye Dec 21, 2013
7f180db
Add threshold as percentage colour tests
atkaye Dec 21, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions lessc.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1242,12 +1242,18 @@ protected function lib_contrast($args) {
$darkColor = array('color', 0, 0, 0);
$lightColor = array('color', 255, 255, 255);
$threshold = 0.43;

if ( $args[0] == 'list' ) {
$inputColor = ( isset($args[2][0]) ) ? $this->assertColor($args[2][0]) : $lightColor;
$darkColor = ( isset($args[2][1]) ) ? $this->assertColor($args[2][1]) : $darkColor;
$lightColor = ( isset($args[2][2]) ) ? $this->assertColor($args[2][2]) : $lightColor;
$threshold = ( isset($args[2][3]) ) ? $this->assertNumber($args[2][3]) : $threshold;

if( isset($args[2][3]) ) {
if( isset($args[2][3][2]) && $args[2][3][2] == '%' ) {
$args[2][3][1] /= 100;
unset($args[2][3][2]);
}
$threshold = $this->assertNumber($args[2][3]);
}
}
else {
$inputColor = $this->assertColor($args);
Expand Down
3 changes: 3 additions & 0 deletions tests/inputs/colors.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@ fade {
.contrast {
color1: contrast(#000, red, blue);
color2: contrast(#fff, red, blue);
color3: contrast(#333, #000, #fff); // Default threshold
color4: contrast(#333, #000, #fff, 0.1); // Threshold weighted towards dark colour
color5: contrast(#333, #000, #fff, 10%); // Threshold weighted as percentage
}

.percent {
Expand Down
3 changes: 3 additions & 0 deletions tests/outputs/colors.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ fade {
.contrast {
color1: #ff0000;
color2: #0000ff;
color3: #ffffff;
color4: #000000;
color5: #000000;
}
.percent {
per: 50%;
Expand Down