Skip to content
GitLab
Explore
Projects
Groups
Snippets
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
a439bc16
Commit
a439bc16
authored
9 years ago
by
Mark Otto
Browse files
Options
Download
Plain Diff
Merge pull request #18752 from twbs/v4-docs-scsslint
v4: Docs Sass linting
parents
09c39429
1364caf0
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
Gruntfile.js
+8
-3
Gruntfile.js
docs/assets/scss/_ads.scss
+1
-5
docs/assets/scss/_ads.scss
docs/assets/scss/_anchor.scss
+1
-3
docs/assets/scss/_anchor.scss
docs/assets/scss/_buttons.scss
+1
-1
docs/assets/scss/_buttons.scss
docs/assets/scss/_component-examples.scss
+4
-16
docs/assets/scss/_component-examples.scss
docs/assets/scss/_content.scss
+3
-1
docs/assets/scss/_content.scss
docs/assets/scss/_footer.scss
+1
-1
docs/assets/scss/_footer.scss
docs/assets/scss/_masthead.scss
+2
-4
docs/assets/scss/_masthead.scss
docs/assets/scss/_sidebar.scss
+1
-1
docs/assets/scss/_sidebar.scss
docs/assets/scss/_skiplink.scss
+2
-0
docs/assets/scss/_skiplink.scss
docs/assets/scss/_syntax.scss
+55
-55
docs/assets/scss/_syntax.scss
docs/assets/scss/_team.scss
+1
-1
docs/assets/scss/_team.scss
with
80 additions
and
91 deletions
+80
-91
Gruntfile.js
+
8
-
3
View file @
a439bc16
...
@@ -213,7 +213,12 @@ module.exports = function (grunt) {
...
@@ -213,7 +213,12 @@ module.exports = function (grunt) {
config
:
'
scss/.scss-lint.yml
'
,
config
:
'
scss/.scss-lint.yml
'
,
reporterOutput
:
null
reporterOutput
:
null
},
},
src
:
[
'
scss/*.scss
'
,
'
!scss/_normalize.scss
'
]
core
:
{
src
:
[
'
scss/*.scss
'
,
'
!scss/_normalize.scss
'
]
},
docs
:
{
src
:
[
'
docs/assets/scss/*.scss
'
,
'
!scss/_normalize.scss
'
,
'
!docs/assets/scss/docs.scss
'
]
}
},
},
postcss
:
{
postcss
:
{
...
@@ -462,7 +467,7 @@ module.exports = function (grunt) {
...
@@ -462,7 +467,7 @@ module.exports = function (grunt) {
// JS distribution task.
// JS distribution task.
grunt
.
registerTask
(
'
dist-js
'
,
[
'
babel:dev
'
,
'
concat
'
,
'
lineremover
'
,
'
babel:dist
'
,
'
stamp
'
,
'
uglify:core
'
,
'
commonjs
'
]);
grunt
.
registerTask
(
'
dist-js
'
,
[
'
babel:dev
'
,
'
concat
'
,
'
lineremover
'
,
'
babel:dist
'
,
'
stamp
'
,
'
uglify:core
'
,
'
commonjs
'
]);
grunt
.
registerTask
(
'
test-scss
'
,
[
'
scsslint
'
]);
grunt
.
registerTask
(
'
test-scss
'
,
[
'
scsslint
:core
'
]);
// CSS distribution task.
// CSS distribution task.
// Supported Compilers: sass (Ruby) and libsass.
// Supported Compilers: sass (Ruby) and libsass.
...
@@ -491,7 +496,7 @@ module.exports = function (grunt) {
...
@@ -491,7 +496,7 @@ module.exports = function (grunt) {
});
});
// Docs task.
// Docs task.
grunt
.
registerTask
(
'
docs-css
'
,
[
'
postcss:docs
'
,
'
postcss:examples
'
,
'
csscomb:docs
'
,
'
csscomb:examples
'
,
'
cssmin:docs
'
]);
grunt
.
registerTask
(
'
docs-css
'
,
[
'
scsslint:docs
'
,
'
postcss:docs
'
,
'
postcss:examples
'
,
'
csscomb:docs
'
,
'
csscomb:examples
'
,
'
cssmin:docs
'
]);
grunt
.
registerTask
(
'
docs-js
'
,
[
'
uglify:docsJs
'
]);
grunt
.
registerTask
(
'
docs-js
'
,
[
'
uglify:docsJs
'
]);
grunt
.
registerTask
(
'
lint-docs-js
'
,
[
'
jscs:assets
'
]);
grunt
.
registerTask
(
'
lint-docs-js
'
,
[
'
jscs:assets
'
]);
grunt
.
registerTask
(
'
docs
'
,
[
'
docs-css
'
,
'
docs-js
'
,
'
lint-docs-js
'
,
'
clean:docs
'
,
'
copy:docs
'
]);
grunt
.
registerTask
(
'
docs
'
,
[
'
docs-css
'
,
'
docs-js
'
,
'
lint-docs-js
'
,
'
clean:docs
'
,
'
copy:docs
'
]);
...
...
This diff is collapsed.
Click to expand it.
docs/assets/scss/_ads.scss
+
1
-
5
View file @
a439bc16
...
@@ -8,8 +8,8 @@
...
@@ -8,8 +8,8 @@
padding
:
1
.25rem
!
important
;
padding
:
1
.25rem
!
important
;
margin
:
2rem
(
$grid-gutter-width
*
-1
)
-2rem
!
important
;
margin
:
2rem
(
$grid-gutter-width
*
-1
)
-2rem
!
important
;
overflow
:
hidden
;
// clearfix
overflow
:
hidden
;
// clearfix
font-size
:
.8rem
!
important
;
font-family
:
inherit
!
important
;
font-family
:
inherit
!
important
;
font-size
:
.8rem
!
important
;
line-height
:
1rem
!
important
;
line-height
:
1rem
!
important
;
color
:
$bd-purple-light
!
important
;
color
:
$bd-purple-light
!
important
;
text-align
:
left
;
text-align
:
left
;
...
@@ -49,10 +49,6 @@
...
@@ -49,10 +49,6 @@
}
}
}
}
.carbonad
#azcarbon
>
img
{
display
:
none
;
// hide what I assume are tracking images
}
@include
media-breakpoint-up
(
sm
)
{
@include
media-breakpoint-up
(
sm
)
{
.carbonad
{
.carbonad
{
width
:
330px
!
important
;
width
:
330px
!
important
;
...
...
This diff is collapsed.
Click to expand it.
docs/assets/scss/_anchor.scss
+
1
-
3
View file @
a439bc16
...
@@ -10,9 +10,7 @@
...
@@ -10,9 +10,7 @@
*
:hover
>
.anchorjs-link
{
*
:hover
>
.anchorjs-link
{
opacity
:
.75
;
opacity
:
.75
;
-webkit-transition
:
color
.16s
linear
;
transition
:
color
.16s
linear
;
-o-transition
:
color
.16s
linear
;
transition
:
color
.16s
linear
;
}
}
*
:hover
>
.anchorjs-link
:hover
,
*
:hover
>
.anchorjs-link
:hover
,
...
...
This diff is collapsed.
Click to expand it.
docs/assets/scss/_buttons.scss
+
1
-
1
View file @
a439bc16
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
&
:focus
,
&
:focus
,
&
:active
{
&
:active
{
color
:
#fff
;
color
:
#fff
;
background-color
:
$bd-purple-bright
;
background-color
:
$bd-purple-bright
;
border-color
:
$bd-purple-bright
;
border-color
:
$bd-purple-bright
;
}
}
}
}
This diff is collapsed.
Click to expand it.
docs/assets/scss/_component-examples.scss
+
4
-
16
View file @
a439bc16
...
@@ -23,8 +23,8 @@
...
@@ -23,8 +23,8 @@
.bd-example-container
{
.bd-example-container
{
min-width
:
16rem
;
min-width
:
16rem
;
max-width
:
25rem
;
max-width
:
25rem
;
margin-left
:
auto
;
margin-right
:
auto
;
margin-right
:
auto
;
margin-left
:
auto
;
}
}
.bd-example-container-header
{
.bd-example-container-header
{
...
@@ -67,10 +67,10 @@
...
@@ -67,10 +67,10 @@
@include
clearfix
();
@include
clearfix
();
@include
media-breakpoint-up
(
sm
)
{
@include
media-breakpoint-up
(
sm
)
{
margin-left
:
0
;
padding
:
1
.5rem
;
margin-right
:
0
;
margin-right
:
0
;
margin-bottom
:
0
;
margin-bottom
:
0
;
padding
:
1
.5rem
;
margin-left
:
0
;
border-width
:
.2rem
;
border-width
:
.2rem
;
}
}
...
@@ -177,7 +177,7 @@
...
@@ -177,7 +177,7 @@
}
}
// Navbars
// Navbars
.bd-example
{
.bd-example
{
.navbar-fixed-top
{
.navbar-fixed-top
{
position
:
static
;
position
:
static
;
margin
:
-1rem
-1rem
1rem
;
margin
:
-1rem
-1rem
1rem
;
...
@@ -334,15 +334,3 @@
...
@@ -334,15 +334,3 @@
font-size
:
inherit
;
font-size
:
inherit
;
color
:
$gray-dark
;
// Effectively the base text color
color
:
$gray-dark
;
// Effectively the base text color
}
}
// Pseudo focus
//
// Custom `:focus` state for showing how it looks in the docs.
#focusedInput
{
border-color
:
$input-border-focus
;
outline
:
0
;
outline
:
thin
dotted
\
9
;
// IE9
box-shadow
:
0
0
.5rem
$input-box-shadow-focus
;
}
This diff is collapsed.
Click to expand it.
docs/assets/scss/_content.scss
+
3
-
1
View file @
a439bc16
// scss-lint:disable IdSelector
//
//
// Automatically style Markdown-based tables like a Bootstrap `.table`.
// Automatically style Markdown-based tables like a Bootstrap `.table`.
//
//
...
@@ -7,8 +9,8 @@
...
@@ -7,8 +9,8 @@
display
:
block
;
display
:
block
;
width
:
100%
;
width
:
100%
;
max-width
:
100%
;
max-width
:
100%
;
overflow-y
:
auto
;
margin-bottom
:
$spacer
;
margin-bottom
:
$spacer
;
overflow-y
:
auto
;
// Cells
// Cells
>
thead
,
>
thead
,
...
...
This diff is collapsed.
Click to expand it.
docs/assets/scss/_footer.scss
+
1
-
1
View file @
a439bc16
...
@@ -6,8 +6,8 @@
...
@@ -6,8 +6,8 @@
padding
:
4rem
0
;
padding
:
4rem
0
;
margin-top
:
4rem
;
margin-top
:
4rem
;
font-size
:
85%
;
font-size
:
85%
;
background-color
:
#f7f7f7
;
text-align
:
center
;
text-align
:
center
;
background-color
:
#f7f7f7
;
a
{
a
{
font-weight
:
500
;
font-weight
:
500
;
...
...
This diff is collapsed.
Click to expand it.
docs/assets/scss/_masthead.scss
+
2
-
4
View file @
a439bc16
...
@@ -3,9 +3,7 @@
...
@@ -3,9 +3,7 @@
padding
:
3rem
(
$grid-gutter-width
/
2
)
2rem
;
padding
:
3rem
(
$grid-gutter-width
/
2
)
2rem
;
color
:
$bd-purple-light
;
color
:
$bd-purple-light
;
text-align
:
center
;
text-align
:
center
;
background-image
:
-webkit-linear-gradient
(
135deg
,
darken
(
$bd-purple
,
20%
)
,
$bd-purple
,
lighten
(
saturate
(
$bd-purple
,
5%
)
,
15%
));
background-image
:
linear-gradient
(
135deg
,
darken
(
$bd-purple
,
20%
)
,
$bd-purple
,
lighten
(
saturate
(
$bd-purple
,
5%
)
,
15%
));
background-image
:
linear-gradient
(
135deg
,
darken
(
$bd-purple
,
20%
)
,
$bd-purple
,
lighten
(
saturate
(
$bd-purple
,
5%
)
,
15%
));
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'
#{
ie-hex-str
(
darken
(
$bd-purple
,
20%
))
}
'
,
endColorstr
=
'
#{
ie-hex-str
(
lighten
(
saturate
(
$bd-purple
,
5%
)
,
15%
))
}
'
,
gradientType
=
'1'
);
/* For IE9 */
.bd-booticon
{
.bd-booticon
{
margin
:
0
auto
2rem
;
margin
:
0
auto
2rem
;
...
@@ -19,9 +17,9 @@
...
@@ -19,9 +17,9 @@
}
}
.lead
{
.lead
{
margin-left
:
auto
;
margin-right
:
auto
;
margin-right
:
auto
;
margin-bottom
:
2rem
;
margin-bottom
:
2rem
;
margin-left
:
auto
;
font-size
:
1
.25rem
;
font-size
:
1
.25rem
;
color
:
#fff
;
color
:
#fff
;
}
}
...
...
This diff is collapsed.
Click to expand it.
docs/assets/scss/_sidebar.scss
+
1
-
1
View file @
a439bc16
...
@@ -36,8 +36,8 @@
...
@@ -36,8 +36,8 @@
}
}
.dropdown-item
{
.dropdown-item
{
padding-left
:
.75rem
;
padding-right
:
.75rem
;
padding-right
:
.75rem
;
padding-left
:
.75rem
;
&
:first-child
{
margin-top
:
.25rem
;
}
&
:first-child
{
margin-top
:
.25rem
;
}
&
:last-child
{
margin-bottom
:
.25rem
;
}
&
:last-child
{
margin-bottom
:
.25rem
;
}
...
...
This diff is collapsed.
Click to expand it.
docs/assets/scss/_skiplink.scss
+
2
-
0
View file @
a439bc16
// scss-lint:disable IdSelector
#skippy
{
#skippy
{
display
:
block
;
display
:
block
;
padding
:
1em
;
padding
:
1em
;
...
...
This diff is collapsed.
Click to expand it.
docs/assets/scss/_syntax.scss
+
55
-
55
View file @
a439bc16
.hll
{
background-color
:
#ff
ffc
c
}
.hll
{
background-color
:
#ffc
;
}
.c
{
color
:
#999
;
}
.c
{
color
:
#999
;
}
.err
{
color
:
#
AA00
00
;
background-color
:
#
FFAAAA
}
.err
{
color
:
#
a
00
;
background-color
:
#
faa
;
}
.k
{
color
:
#0
0669
9
;
}
.k
{
color
:
#0
6
9
;
}
.o
{
color
:
#555
555
}
.o
{
color
:
#555
;
}
.cm
{
color
:
#999
;
}
.cm
{
color
:
#999
;
}
.cp
{
color
:
#0
09
99
9
}
.cp
{
color
:
#099
;
}
.c1
{
color
:
#999
;
}
.c1
{
color
:
#999
;
}
.cs
{
color
:
#999
;
}
.cs
{
color
:
#999
;
}
.gd
{
background-color
:
#
FFCCCC
;
border
:
1px
solid
#
CC0
00
0
}
.gd
{
background-color
:
#
fcc
;
border
:
1px
solid
#
c
00
;
}
.ge
{
font-style
:
italic
}
.ge
{
font-style
:
italic
;
}
.gr
{
color
:
#
FF0
00
0
}
.gr
{
color
:
#
f
00
;
}
.gh
{
color
:
#0
0330
0
;
}
.gh
{
color
:
#0
3
0
;
}
.gi
{
background-color
:
#
CCFFCC
;
border
:
1px
solid
#0
0CC00
}
.gi
{
background-color
:
#
cfc
;
border
:
1px
solid
#0
c0
;
}
.go
{
color
:
#
AAAAAA
}
.go
{
color
:
#
aaa
;
}
.gp
{
color
:
#00
009
9
;
}
.gp
{
color
:
#009
;
}
.gu
{
color
:
#0
0330
0
;
}
.gu
{
color
:
#0
3
0
;
}
.gt
{
color
:
#9
9CC66
}
.gt
{
color
:
#9
c6
;
}
.kc
{
color
:
#0
0669
9
;
}
.kc
{
color
:
#0
6
9
;
}
.kd
{
color
:
#0
0669
9
;
}
.kd
{
color
:
#0
6
9
;
}
.kn
{
color
:
#0
0669
9
;
}
.kn
{
color
:
#0
6
9
;
}
.kp
{
color
:
#0
06
69
9
}
.kp
{
color
:
#069
;
}
.kr
{
color
:
#0
0669
9
;
}
.kr
{
color
:
#0
6
9
;
}
.kt
{
color
:
#0
0778
8
;
}
.kt
{
color
:
#0
7
8
;
}
.m
{
color
:
#
FF6
60
0
}
.m
{
color
:
#
f
60
;
}
.s
{
color
:
#d44950
}
.s
{
color
:
#d44950
;
}
.na
{
color
:
#4f9fcf
}
.na
{
color
:
#4f9fcf
;
}
.nb
{
color
:
#3
36
66
6
}
.nb
{
color
:
#366
;
}
.nc
{
color
:
#0
0AA8
8
;
}
.nc
{
color
:
#0
a
8
;
}
.no
{
color
:
#3
36
60
0
}
.no
{
color
:
#360
;
}
.nd
{
color
:
#99
99FF
}
.nd
{
color
:
#99
f
;
}
.ni
{
color
:
#999
999
;
}
.ni
{
color
:
#999
;
}
.ne
{
color
:
#
CC00
00
;
}
.ne
{
color
:
#
c
00
;
}
.nf
{
color
:
#
CC00FF
}
.nf
{
color
:
#
c0f
;
}
.nl
{
color
:
#99
99FF
}
.nl
{
color
:
#99
f
;
}
.nn
{
color
:
#0
0CCFF
;
}
.nn
{
color
:
#0
cf
;
}
.nt
{
color
:
#2f6f9f
;
}
.nt
{
color
:
#2f6f9f
;
}
.nv
{
color
:
#0
03
33
3
}
.nv
{
color
:
#033
;
}
.ow
{
color
:
#000
000
;
}
.ow
{
color
:
#000
;
}
.w
{
color
:
#bbb
bbb
}
.w
{
color
:
#bbb
;
}
.mf
{
color
:
#
FF6
60
0
}
.mf
{
color
:
#
f
60
;
}
.mh
{
color
:
#
FF6
60
0
}
.mh
{
color
:
#
f
60
;
}
.mi
{
color
:
#
FF6
60
0
}
.mi
{
color
:
#
f
60
;
}
.mo
{
color
:
#
FF6
60
0
}
.mo
{
color
:
#
f
60
;
}
.sb
{
color
:
#
CC3
30
0
}
.sb
{
color
:
#
c
30
;
}
.sc
{
color
:
#
CC3
30
0
}
.sc
{
color
:
#
c
30
;
}
.sd
{
color
:
#CC3300
;
font-style
:
italic
}
.sd
{
font-style
:
italic
;
color
:
#c30
;
}
.s2
{
color
:
#
CC3
30
0
}
.s2
{
color
:
#
c
30
;
}
.se
{
color
:
#
CC330
0
;
}
.se
{
color
:
#
c3
0
;
}
.sh
{
color
:
#
CC3
30
0
}
.sh
{
color
:
#
c
30
;
}
.si
{
color
:
#
AA0
00
0
}
.si
{
color
:
#
a
00
;
}
.sx
{
color
:
#
CC3
30
0
}
.sx
{
color
:
#
c
30
;
}
.sr
{
color
:
#3
3AAAA
}
.sr
{
color
:
#3
aa
;
}
.s1
{
color
:
#
CC3
30
0
}
.s1
{
color
:
#
c
30
;
}
.ss
{
color
:
#
FFCC33
}
.ss
{
color
:
#
fc3
;
}
.bp
{
color
:
#3
36
66
6
}
.bp
{
color
:
#366
;
}
.vc
{
color
:
#0
03
33
3
}
.vc
{
color
:
#033
;
}
.vg
{
color
:
#0
03
33
3
}
.vg
{
color
:
#033
;
}
.vi
{
color
:
#0
03
33
3
}
.vi
{
color
:
#033
;
}
.il
{
color
:
#
FF6
60
0
}
.il
{
color
:
#
f
60
;
}
.css
.o
,
.css
.o
,
.css
.o
+
.nt
,
.css
.o
+
.nt
,
...
...
This diff is collapsed.
Click to expand it.
docs/assets/scss/_team.scss
+
1
-
1
View file @
a439bc16
...
@@ -12,11 +12,11 @@
...
@@ -12,11 +12,11 @@
}
}
.github-btn
{
.github-btn
{
border
:
none
;
float
:
right
;
float
:
right
;
width
:
180px
;
width
:
180px
;
height
:
1
.25rem
;
height
:
1
.25rem
;
margin-top
:
.25rem
;
margin-top
:
.25rem
;
border
:
0
;
}
}
img
{
img
{
...
...
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
Menu
Explore
Projects
Groups
Snippets