Skip to content

Commit 1fcce60

Browse files
committed
Merge pull request #21 from jazzzz/master
Fix some remaining errors in the the less-stylus conversion
2 parents fca1fe9 + 770d352 commit 1fcce60

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

stylus/forms.styl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ select:focus:invalid {
422422
.input-append,
423423
.input-prepend {
424424
display: inline-block;
425-
margin-bottom: $baseLineHeight / 2;
425+
margin-bottom: ($baseLineHeight / 2);
426426
vertical-align: middle;
427427
font-size: 0; // white space collapse hack
428428
white-space: nowrap; // Prevent span and input from separating

stylus/mixins.styl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ gradientBar(primaryColor, secondaryColor, textColor = #fff, textShadow = 0 -1px
397397
text-shadow: textShadow;
398398
gradient-vertical(primaryColor, secondaryColor);
399399
border-color: secondaryColor secondaryColor darken(secondaryColor, 15%);
400-
border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
400+
border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fade-in(rgba(0,0,0,.1), 15%);
401401
}
402402

403403
// Gradients

stylus/navbar.styl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -341,8 +341,8 @@
341341
// Caret should match text color on hover/focus
342342
.navbar .nav li.dropdown > a:hover .caret,
343343
.navbar .nav li.dropdown > a:focus .caret {
344-
border-top-color: @navbarLinkColorHover;
345-
border-bottom-color: @navbarLinkColorHover;
344+
border-top-color: $navbarLinkColorHover;
345+
border-bottom-color: $navbarLinkColorHover;
346346
}
347347

348348
// Remove background color from open dropdown
@@ -451,8 +451,8 @@
451451
}
452452
.nav li.dropdown > a:hover .caret,
453453
.nav li.dropdown > a:focus .caret {
454-
border-top-color: @navbarInverseLinkColorActive;
455-
border-bottom-color: @navbarInverseLinkColorActive;
454+
border-top-color: $navbarInverseLinkColorActive;
455+
border-bottom-color: $navbarInverseLinkColorActive;
456456
}
457457
.nav li.dropdown > .dropdown-toggle .caret {
458458
border-top-color: $navbarInverseLinkColor;

stylus/tables.styl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ table {
5151

5252
// Nesting
5353
.table {
54-
background-color: @bodyBackground;
54+
background-color: $bodyBackground;
5555
}
5656
}
5757

0 commit comments

Comments
 (0)