Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
03d17358
Commit
03d17358
authored
Apr 09, 2019
by
Filipa Lacerda
Committed by
Phil Hughes
Apr 09, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds a vendors folder for third party CSS
Does not run stylelint for the vendors folder
parent
0bda6cc1
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
101 additions
and
92 deletions
+101
-92
app/assets/stylesheets/application.scss
app/assets/stylesheets/application.scss
+3
-0
app/assets/stylesheets/framework/markdown_area.scss
app/assets/stylesheets/framework/markdown_area.scss
+0
-91
app/assets/stylesheets/vendors/atwho.scss
app/assets/stylesheets/vendors/atwho.scss
+92
-0
changelogs/unreleased/59708-vendor-css.yml
changelogs/unreleased/59708-vendor-css.yml
+5
-0
package.json
package.json
+1
-1
No files found.
app/assets/stylesheets/application.scss
View file @
03d17358
...
...
@@ -28,6 +28,9 @@
// Component specific styles, will be moved to gitlab-ui
@import
"components/**/*"
;
// Vendors specific styles
@import
"vendors/**/*"
;
// Styles for JS behaviors.
@import
"behaviors"
;
...
...
app/assets/stylesheets/framework/markdown_area.scss
View file @
03d17358
...
...
@@ -163,88 +163,6 @@
}
}
.atwho-view
{
overflow-y
:
auto
;
overflow-x
:
hidden
;
.name
,
small
.aliases
,
small
.params
{
float
:
left
;
}
small
.aliases
,
small
.params
{
padding
:
2px
5px
;
}
small
.description
{
float
:
right
;
padding
:
3px
5px
;
}
.avatar-inline
{
margin-bottom
:
0
;
}
.has-warning
{
.name
,
.description
{
color
:
$orange-700
;
}
}
.cur
{
.avatar
{
@include
disable-all-animation
;
border
:
1px
solid
$white-light
;
}
}
ul
>
li
{
@include
clearfix
;
white-space
:
nowrap
;
}
// TODO: fallback to global style
.atwho-view-ul
{
padding
:
8px
1px
;
li
{
padding
:
8px
16px
;
border
:
0
;
&
.cur
{
background-color
:
$gray-darker
;
color
:
$gl-text-color
;
small
{
color
:
inherit
;
}
&
.has-warning
{
color
:
$orange-700
;
background-color
:
$orange-100
;
}
}
div
.avatar
{
display
:
inline-flex
;
justify-content
:
center
;
align-items
:
center
;
.center
{
line-height
:
14px
;
}
}
strong
{
color
:
$gl-text-color
;
}
}
}
}
.md-suggestion-diff
{
display
:
table
!
important
;
border
:
1px
solid
$border-color
!
important
;
...
...
@@ -269,15 +187,6 @@
}
@include
media-breakpoint-down
(
xs
)
{
.atwho-view-ul
{
width
:
350px
;
}
.atwho-view
ul
li
{
overflow
:
hidden
;
text-overflow
:
ellipsis
;
}
.referenced-users
{
margin-right
:
0
;
}
...
...
app/assets/stylesheets/vendors/atwho.scss
0 → 100644
View file @
03d17358
.atwho-view
{
overflow-y
:
auto
;
overflow-x
:
hidden
;
.name
,
small
.aliases
,
small
.params
{
float
:
left
;
}
small
.aliases
,
small
.params
{
padding
:
2px
5px
;
}
small
.description
{
float
:
right
;
padding
:
3px
5px
;
}
.avatar-inline
{
margin-bottom
:
0
;
}
.has-warning
{
.name
,
.description
{
color
:
$orange-700
;
}
}
.cur
{
.avatar
{
@include
disable-all-animation
;
border
:
1px
solid
$white-light
;
}
}
ul
>
li
{
@include
clearfix
;
white-space
:
nowrap
;
}
// TODO: fallback to global style
.atwho-view-ul
{
padding
:
8px
1px
;
li
{
padding
:
8px
16px
;
border
:
0
;
&
.cur
{
background-color
:
$gray-darker
;
color
:
$gl-text-color
;
small
{
color
:
inherit
;
}
&
.has-warning
{
color
:
$orange-700
;
background-color
:
$orange-100
;
}
}
div
.avatar
{
display
:
inline-flex
;
justify-content
:
center
;
align-items
:
center
;
.center
{
line-height
:
14px
;
}
}
strong
{
color
:
$gl-text-color
;
}
}
}
}
@include
media-breakpoint-down
(
xs
)
{
.atwho-view-ul
{
width
:
350px
;
}
.atwho-view
ul
li
{
overflow
:
hidden
;
text-overflow
:
ellipsis
;
}
}
changelogs/unreleased/59708-vendor-css.yml
0 → 100644
View file @
03d17358
---
title
:
Creates a vendors folder for external CSS
merge_request
:
author
:
type
:
other
package.json
View file @
03d17358
...
...
@@ -17,7 +17,7 @@
"prettier-staged-save"
:
"node ./scripts/frontend/prettier.js save"
,
"prettier-all"
:
"node ./scripts/frontend/prettier.js check-all"
,
"prettier-all-save"
:
"node ./scripts/frontend/prettier.js save-all"
,
"stylelint"
:
"node node_modules/stylelint/bin/stylelint.js app/assets/stylesheets/**/*.* ee/app/assets/stylesheets/**/*.* --custom-formatter node_modules/stylelint-error-string-formatter"
,
"stylelint"
:
"node node_modules/stylelint/bin/stylelint.js app/assets/stylesheets/**/*.* ee/app/assets/stylesheets/**/*.*
!**/vendors/**
--custom-formatter node_modules/stylelint-error-string-formatter"
,
"stylelint-file"
:
"node node_modules/stylelint/bin/stylelint.js"
,
"stylelint-create-utility-map"
:
"node scripts/frontend/stylelint/stylelint-utility-map.js"
,
"test"
:
"yarn jest && yarn karma"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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