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
6220c595
Commit
6220c595
authored
Feb 08, 2018
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply new default and inline label design
parent
bb2478c2
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
8 deletions
+15
-8
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+1
-0
app/assets/stylesheets/pages/events.scss
app/assets/stylesheets/pages/events.scss
+0
-1
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+1
-2
app/assets/stylesheets/pages/labels.scss
app/assets/stylesheets/pages/labels.scss
+8
-4
app/assets/stylesheets/pages/todos.scss
app/assets/stylesheets/pages/todos.scss
+0
-1
changelogs/unreleased/fix-change-event-body-label-font-size.yml
...logs/unreleased/fix-change-event-body-label-font-size.yml
+5
-0
No files found.
app/assets/stylesheets/framework/variables.scss
View file @
6220c595
...
@@ -558,6 +558,7 @@ $jq-ui-default-color: #777;
...
@@ -558,6 +558,7 @@ $jq-ui-default-color: #777;
/*
/*
* Label
* Label
*/
*/
$label-font-size
:
12px
;
$label-padding
:
7px
;
$label-padding
:
7px
;
$label-padding-modal
:
10px
;
$label-padding-modal
:
10px
;
$label-gray-bg
:
#f8fafc
;
$label-gray-bg
:
#f8fafc
;
...
...
app/assets/stylesheets/pages/events.scss
View file @
6220c595
...
@@ -72,7 +72,6 @@
...
@@ -72,7 +72,6 @@
.label
{
.label
{
color
:
$gl-text-color
;
color
:
$gl-text-color
;
font-size
:
inherit
;
}
}
iframe
.twitter-share-button
{
iframe
.twitter-share-button
{
...
...
app/assets/stylesheets/pages/issuable.scss
View file @
6220c595
...
@@ -102,12 +102,11 @@
...
@@ -102,12 +102,11 @@
.issuable-show-labels
{
.issuable-show-labels
{
a
{
a
{
margin-right
:
5px
;
margin-bottom
:
5px
;
margin-bottom
:
5px
;
display
:
inline-block
;
display
:
inline-block
;
.color-label
{
.color-label
{
padding
:
6px
10px
;
padding
:
4px
$grid-size
;
border-radius
:
$label-border-radius
;
border-radius
:
$label-border-radius
;
}
}
...
...
app/assets/stylesheets/pages/labels.scss
View file @
6220c595
...
@@ -105,13 +105,16 @@
...
@@ -105,13 +105,16 @@
}
}
.label
{
.label
{
padding
:
8px
12px
;
padding
:
4px
$grid-size
;
font-size
:
14px
;
font-size
:
$label-font-size
;
position
:
relative
;
top
:
(
$grid-size
/
2
);
}
}
}
}
.color-label
{
.color-label
{
padding
:
3px
$label-padding
;
padding
:
0
$grid-size
;
line-height
:
16px
;
border-radius
:
$label-border-radius
;
border-radius
:
$label-border-radius
;
}
}
...
@@ -302,10 +305,11 @@
...
@@ -302,10 +305,11 @@
}
}
.label-link
{
.label-link
{
display
:
inline-
block
;
display
:
inline-
flex
;
vertical-align
:
top
;
vertical-align
:
top
;
.label
{
.label
{
vertical-align
:
inherit
;
vertical-align
:
inherit
;
font-size
:
$label-font-size
;
}
}
}
}
app/assets/stylesheets/pages/todos.scss
View file @
6220c595
...
@@ -128,7 +128,6 @@
...
@@ -128,7 +128,6 @@
.label
{
.label
{
color
:
$gl-text-color
;
color
:
$gl-text-color
;
font-size
:
inherit
;
}
}
p
{
p
{
...
...
changelogs/unreleased/fix-change-event-body-label-font-size.yml
0 → 100644
View file @
6220c595
---
title
:
Apply new default and inline label design
merge_request
:
16956
author
:
George Tsiolis
type
:
changed
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