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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
fa98280b
Commit
fa98280b
authored
Jun 05, 2019
by
Annabel Dunstone Gray
Committed by
Kushal Pandya
Jun 10, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix border radius of collapse discussion btn
Turn avatar-counter into a mixin with optional border-radius
parent
a2867862
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
9 deletions
+13
-9
app/assets/stylesheets/components/avatar.scss
app/assets/stylesheets/components/avatar.scss
+1
-8
app/assets/stylesheets/framework/mixins.scss
app/assets/stylesheets/framework/mixins.scss
+11
-0
app/assets/stylesheets/pages/diff.scss
app/assets/stylesheets/pages/diff.scss
+1
-1
No files found.
app/assets/stylesheets/components/avatar.scss
View file @
fa98280b
...
@@ -191,12 +191,5 @@ $identicon-backgrounds: $identicon-red, $identicon-purple, $identicon-indigo, $i
...
@@ -191,12 +191,5 @@ $identicon-backgrounds: $identicon-red, $identicon-purple, $identicon-indigo, $i
}
}
.avatar-counter
{
.avatar-counter
{
background-color
:
$gray-darkest
;
@include
avatar-counter
();
color
:
$white-light
;
border
:
1px
solid
$gray-normal
;
border-radius
:
1em
;
font-family
:
$regular-font
;
font-size
:
9px
;
line-height
:
16px
;
text-align
:
center
;
}
}
app/assets/stylesheets/framework/mixins.scss
View file @
fa98280b
...
@@ -396,3 +396,14 @@
...
@@ -396,3 +396,14 @@
width
:
$gl-font-size
*
$code-line-height
*
0
.9
;
width
:
$gl-font-size
*
$code-line-height
*
0
.9
;
height
:
$gl-font-size
*
$code-line-height
*
0
.9
;
height
:
$gl-font-size
*
$code-line-height
*
0
.9
;
}
}
@mixin
avatar-counter
(
$border-radius
:
1em
)
{
background-color
:
$gray-darkest
;
color
:
$white-light
;
border
:
1px
solid
$gray-normal
;
border-radius
:
$border-radius
;
font-family
:
$regular-font
;
font-size
:
9px
;
line-height
:
16px
;
text-align
:
center
;
}
app/assets/stylesheets/pages/diff.scss
View file @
fa98280b
...
@@ -676,7 +676,7 @@ table.code {
...
@@ -676,7 +676,7 @@ table.code {
.diff-comments-more-count
,
.diff-comments-more-count
,
.diff-notes-collapse
{
.diff-notes-collapse
{
@
extend
.avatar-counter
;
@
include
avatar-counter
(
50%
)
;
}
}
.diff-notes-collapse
{
.diff-notes-collapse
{
...
...
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