Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
10e76d77
Commit
10e76d77
authored
8 years ago
by
Nico Van den Winckel
Browse files
Options
Download
Email Patches
Plain Diff
Fixed some linting issues
parent
95f37e4c
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
scss/mixins/_border-radius.scss
+3
-3
scss/mixins/_border-radius.scss
scss/mixins/_clearfix.scss
+1
-1
scss/mixins/_clearfix.scss
scss/mixins/_forms.scss
+1
-1
scss/mixins/_forms.scss
scss/mixins/_hover.scss
+4
-7
scss/mixins/_hover.scss
scss/mixins/_reset-text.scss
+2
-0
scss/mixins/_reset-text.scss
scss/mixins/_text-truncate.scss
+1
-1
scss/mixins/_text-truncate.scss
with
12 additions
and
13 deletions
+12
-13
scss/mixins/_border-radius.scss
+
3
-
3
View file @
10e76d77
...
@@ -8,15 +8,15 @@
...
@@ -8,15 +8,15 @@
@mixin
border-top-radius
(
$radius
)
{
@mixin
border-top-radius
(
$radius
)
{
@if
$enable-rounded
{
@if
$enable-rounded
{
border-top-right-radius
:
$radius
;
border-top-left-radius
:
$radius
;
border-top-left-radius
:
$radius
;
border-top-right-radius
:
$radius
;
}
}
}
}
@mixin
border-right-radius
(
$radius
)
{
@mixin
border-right-radius
(
$radius
)
{
@if
$enable-rounded
{
@if
$enable-rounded
{
border-bottom-right-radius
:
$radius
;
border-top-right-radius
:
$radius
;
border-top-right-radius
:
$radius
;
border-bottom-right-radius
:
$radius
;
}
}
}
}
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
@mixin
border-left-radius
(
$radius
)
{
@mixin
border-left-radius
(
$radius
)
{
@if
$enable-rounded
{
@if
$enable-rounded
{
border-bottom-left-radius
:
$radius
;
border-top-left-radius
:
$radius
;
border-top-left-radius
:
$radius
;
border-bottom-left-radius
:
$radius
;
}
}
}
}
This diff is collapsed.
Click to expand it.
scss/mixins/_clearfix.scss
+
1
-
1
View file @
10e76d77
@mixin
clearfix
()
{
@mixin
clearfix
()
{
&
::after
{
&
::after
{
display
:
block
;
display
:
block
;
content
:
""
;
clear
:
both
;
clear
:
both
;
content
:
""
;
}
}
}
}
This diff is collapsed.
Click to expand it.
scss/mixins/_forms.scss
+
1
-
1
View file @
10e76d77
...
@@ -27,8 +27,8 @@
...
@@ -27,8 +27,8 @@
// Set validation states also for addons
// Set validation states also for addons
.input-group-addon
{
.input-group-addon
{
color
:
$color
;
color
:
$color
;
border-color
:
$color
;
background-color
:
lighten
(
$color
,
40%
);
background-color
:
lighten
(
$color
,
40%
);
border-color
:
$color
;
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
scss/mixins/_hover.scss
+
4
-
7
View file @
10e76d77
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
// }
// }
// }
// }
// @else {
// @else {
&
:hover
{
@content
}
&
:hover
{
@content
}
// }
// }
}
}
...
@@ -16,8 +16,7 @@
...
@@ -16,8 +16,7 @@
@if
$enable-hover-media-query
{
@if
$enable-hover-media-query
{
&
:focus
{
@content
}
&
:focus
{
@content
}
@include
hover
{
@content
}
@include
hover
{
@content
}
}
}
@else
{
@else
{
&
:focus
,
&
:focus
,
&
:hover
{
&
:hover
{
@content
@content
...
@@ -32,8 +31,7 @@
...
@@ -32,8 +31,7 @@
@content
@content
}
}
@include
hover
{
@content
}
@include
hover
{
@content
}
}
}
@else
{
@else
{
&
,
&
,
&
:focus
,
&
:focus
,
&
:hover
{
&
:hover
{
...
@@ -49,8 +47,7 @@
...
@@ -49,8 +47,7 @@
@content
@content
}
}
@include
hover
{
@content
}
@include
hover
{
@content
}
}
}
@else
{
@else
{
&
:focus
,
&
:focus
,
&
:active
,
&
:active
,
&
:hover
{
&
:hover
{
...
...
This diff is collapsed.
Click to expand it.
scss/mixins/_reset-text.scss
+
2
-
0
View file @
10e76d77
...
@@ -7,7 +7,9 @@
...
@@ -7,7 +7,9 @@
line-break
:
auto
;
line-break
:
auto
;
line-height
:
$line-height-base
;
line-height
:
$line-height-base
;
text-align
:
left
;
// Fallback for where `start` is not supported
text-align
:
left
;
// Fallback for where `start` is not supported
// scss-lint:disable DuplicateProperty
text-align
:
start
;
text-align
:
start
;
// scss-lint:enable DuplicateProperty
text-decoration
:
none
;
text-decoration
:
none
;
text-shadow
:
none
;
text-shadow
:
none
;
text-transform
:
none
;
text-transform
:
none
;
...
...
This diff is collapsed.
Click to expand it.
scss/mixins/_text-truncate.scss
+
1
-
1
View file @
10e76d77
...
@@ -5,4 +5,4 @@
...
@@ -5,4 +5,4 @@
overflow
:
hidden
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
text-overflow
:
ellipsis
;
white-space
:
nowrap
;
white-space
:
nowrap
;
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment