Skip to content

Commit 17f80bf

Browse files
committed
Making padding an optional parameter.
1 parent 16ce761 commit 17f80bf

File tree

3 files changed

+27
-25
lines changed

3 files changed

+27
-25
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ And then import the mixins to your base SASS/SCSS file:
2727
Mixin
2828
============
2929

30-
#### borderbox($width [$height], $padding, [$border]);
30+
#### borderbox($width [$height], [$padding], [$border]);
3131

3232
Sets box-sizing-compliant values, as well as legacy values for < IE 8
3333

compass-borderbox.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Gem::Specification.new do |s|
22
# Release Specific Information
3-
s.version = "0.1.1.0"
3+
s.version = "0.1.2.0"
44
s.date = "2011-04-11"
55

66
# Gem Details

stylesheets/box-sizing/_border-box.scss

+25-23
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// }
1313
$global-border-box: false !default;
1414

15-
@mixin borderbox($dimensions, $padding, $border: false) {
15+
@mixin borderbox($dimensions, $padding: false, $border: false) {
1616
@if not $global-border-box {
1717
@include box-sizing(border-box);
1818
}
@@ -25,6 +25,29 @@ $global-border-box: false !default;
2525
$height: nth($dimensions, 2);
2626
}
2727

28+
// Extract padding values
29+
$padding-length: length($padding);
30+
$padding-y: 0;
31+
$padding-x: 0;
32+
33+
@if $padding {
34+
padding: $padding;
35+
36+
@if $padding-length == 4 {
37+
$padding-y: nth($padding, 1) + nth($padding, 3);
38+
$padding-x: nth($padding, 2) + nth($padding, 4);
39+
} @else if $padding-length == 3 {
40+
$padding-y: nth($padding, 1) + nth($padding, 3);
41+
$padding-x: nth($padding, 2) * 2;
42+
} @else if $padding-length == 2 {
43+
$padding-y: nth($padding, 1) * 2;
44+
$padding-x: nth($padding, 2) * 2;
45+
} @else if $padding-length == 1 {
46+
$padding-y: $padding * 2;
47+
$padding-x: $padding * 2;
48+
}
49+
}
50+
2851
// Extract border values
2952
$use-border-shorthand: false;
3053
$border-width: false;
@@ -40,32 +63,11 @@ $global-border-box: false !default;
4063
$use-border-shorthand: true;
4164
}
4265
}
43-
44-
// Extract padding values
45-
padding: $padding;
46-
47-
$padding-length: length($padding);
48-
$padding-y: 0;
49-
$padding-x: 0;
50-
66+
5167
$border-length: length($border-width);
5268
$border-y: 0;
5369
$border-x: 0;
5470

55-
@if $padding-length == 4 {
56-
$padding-y: nth($padding, 1) + nth($padding, 3);
57-
$padding-x: nth($padding, 2) + nth($padding, 4);
58-
} @else if $padding-length == 3 {
59-
$padding-y: nth($padding, 1) + nth($padding, 3);
60-
$padding-x: nth($padding, 2) * 2;
61-
} @else if $padding-length == 2 {
62-
$padding-y: nth($padding, 1) * 2;
63-
$padding-x: nth($padding, 2) * 2;
64-
} @else if $padding-length == 1 {
65-
$padding-y: $padding * 2;
66-
$padding-x: $padding * 2;
67-
}
68-
6971
@if $border {
7072
@if $use-border-shorthand {
7173
border: $border;

0 commit comments

Comments
 (0)