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
0d555545
Commit
0d555545
authored
Apr 13, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[skip ci] fix overzealous .badge-pill renames from scss migration script
parent
43de46e2
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
43 additions
and
43 deletions
+43
-43
app/assets/stylesheets/framework/files.scss
app/assets/stylesheets/framework/files.scss
+1
-1
app/assets/stylesheets/framework/forms.scss
app/assets/stylesheets/framework/forms.scss
+1
-1
app/assets/stylesheets/framework/lists.scss
app/assets/stylesheets/framework/lists.scss
+1
-1
app/assets/stylesheets/framework/wells.scss
app/assets/stylesheets/framework/wells.scss
+1
-1
app/assets/stylesheets/pages/boards.scss
app/assets/stylesheets/pages/boards.scss
+3
-3
app/assets/stylesheets/pages/environments.scss
app/assets/stylesheets/pages/environments.scss
+6
-6
app/assets/stylesheets/pages/labels.scss
app/assets/stylesheets/pages/labels.scss
+17
-17
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+2
-2
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+5
-5
app/assets/stylesheets/pages/profile.scss
app/assets/stylesheets/pages/profile.scss
+1
-1
app/assets/stylesheets/pages/settings.scss
app/assets/stylesheets/pages/settings.scss
+2
-2
app/assets/stylesheets/pages/settings_ci_cd.scss
app/assets/stylesheets/pages/settings_ci_cd.scss
+1
-1
app/views/admin/users/_user.html.haml
app/views/admin/users/_user.html.haml
+1
-1
app/views/projects/pages_domains/show.html.haml
app/views/projects/pages_domains/show.html.haml
+1
-1
No files found.
app/assets/stylesheets/framework/files.scss
View file @
0d555545
...
...
@@ -396,7 +396,7 @@ span.idiff {
margin-right
:
1
.5em
;
}
.
badge.badge-pil
l-lfs
{
.
labe
l-lfs
{
color
:
$common-gray-light
;
border
:
1px
solid
$common-gray-light
;
}
app/assets/stylesheets/framework/forms.scss
View file @
0d555545
...
...
@@ -31,7 +31,7 @@ label {
margin
:
0
;
}
&
.
badge.badge-pil
l-light
{
&
.
labe
l-light
{
font-weight
:
$gl-font-weight-bold
;
}
}
...
...
app/assets/stylesheets/framework/lists.scss
View file @
0d555545
...
...
@@ -228,7 +228,7 @@ ul.content-list {
}
}
.badge
.badge-pill-default
{
.badge
-secondary
{
color
:
$gl-text-color-secondary
;
}
...
...
app/assets/stylesheets/framework/wells.scss
View file @
0d555545
...
...
@@ -58,7 +58,7 @@
}
}
.
badge.badge-pill.badge.badge-pil
l-gray
{
.
labe
l-gray
{
background-color
:
$well-expand-item
;
}
...
...
app/assets/stylesheets/pages/boards.scss
View file @
0d555545
...
...
@@ -244,7 +244,7 @@
margin-bottom
:
8px
;
}
.
badge.badge-pil
l-color
{
.
labe
l-color
{
position
:
relative
;
top
:
2px
;
display
:
inline-block
;
...
...
@@ -297,7 +297,7 @@
}
}
.badge
.badge-pill
{
.badge
{
border
:
0
;
outline
:
0
;
}
...
...
@@ -399,7 +399,7 @@
.card-footer
{
margin
:
0
0
5px
;
.badge
.badge-pill
{
.badge
{
margin-top
:
5px
;
margin-right
:
6px
;
}
...
...
app/assets/stylesheets/pages/environments.scss
View file @
0d555545
...
...
@@ -145,8 +145,8 @@
.x-axis
path
,
.y-axis
path
,
.
badge.badge-pil
l-x-axis-line
,
.
badge.badge-pil
l-y-axis-line
{
.
labe
l-x-axis-line
,
.
labe
l-y-axis-line
{
fill
:
none
;
stroke-width
:
1
;
shape-rendering
:
crispEdges
;
...
...
@@ -157,8 +157,8 @@
stroke
:
$stat-graph-axis-fill
;
}
.
badge.badge-pil
l-x-axis-line
,
.
badge.badge-pil
l-y-axis-line
{
.
labe
l-x-axis-line
,
.
labe
l-y-axis-line
{
stroke
:
$border-color
;
}
...
...
@@ -357,7 +357,7 @@
font-weight
:
$gl-font-weight-bold
;
}
.
badge.badge-pil
l-axis-text
{
.
labe
l-axis-text
{
fill
:
$black
;
font-weight
:
$gl-font-weight-normal
;
font-size
:
10px
;
...
...
@@ -402,7 +402,7 @@
}
@include
media-breakpoint-down
(
sm
)
{
.
badge.badge-pil
l-axis-text
,
.
labe
l-axis-text
,
.text-metric-usage
,
.legend-axis-text
{
font-size
:
8px
;
...
...
app/assets/stylesheets/pages/labels.scss
View file @
0d555545
...
...
@@ -57,8 +57,8 @@
border-bottom-left-radius
:
$border-radius-base
;
}
.
badge.badge-pil
l-row
{
.
badge.badge-pil
l-name
{
.
labe
l-row
{
.
labe
l-name
{
display
:
inline-block
;
margin-bottom
:
10px
;
...
...
@@ -68,14 +68,14 @@
margin-bottom
:
0
;
}
.badge
.badge-pill
{
.badge
{
overflow
:
hidden
;
text-overflow
:
ellipsis
;
max-width
:
100%
;
}
}
.
badge.badge-pil
l-type
{
.
labe
l-type
{
display
:
block
;
margin-bottom
:
10px
;
margin-left
:
50px
;
...
...
@@ -89,7 +89,7 @@
}
}
.
badge.badge-pil
l-description
{
.
labe
l-description
{
display
:
block
;
margin-bottom
:
10px
;
...
...
@@ -110,7 +110,7 @@
}
}
.badge
.badge-pill
{
.badge
{
padding
:
4px
$grid-size
;
font-size
:
$label-font-size
;
position
:
relative
;
...
...
@@ -234,7 +234,7 @@
font-size
:
0
;
padding
:
12px
16px
;
.
badge.badge-pil
l-row
{
.
labe
l-row
{
margin-top
:
4px
;
margin-bottom
:
4px
;
...
...
@@ -243,7 +243,7 @@
}
}
.
badge.badge-pil
l-remove
{
.
labe
l-remove
{
border-left
:
1px
solid
$label-remove-border
;
z-index
:
3
;
border-radius
:
$label-border-radius
;
...
...
@@ -270,11 +270,11 @@
}
}
.
badge.badge-pil
l-options-toggle
{
.
labe
l-options-toggle
{
width
:
100%
;
}
.
badge.badge-pil
l-subscription
{
.
labe
l-subscription
{
vertical-align
:
middle
;
.dropdown-group-label
a
{
...
...
@@ -282,39 +282,39 @@
}
}
.
badge.badge-pil
l-subscribe-button
{
.
labe
l-subscribe-button
{
@media
(
min-width
:
map-get
(
$grid-breakpoints
,
md
))
{
min-width
:
105px
;
margin-left
:
$gl-padding
;
}
.
badge.badge-pil
l-subscribe-button-icon
{
.
labe
l-subscribe-button-icon
{
&
[
disabled
]
{
opacity
:
0
.5
;
pointer-events
:
none
;
}
}
.
badge.badge-pil
l-subscribe-button-loading
{
.
labe
l-subscribe-button-loading
{
display
:
none
;
}
&
.disabled
{
.
badge.badge-pil
l-subscribe-button-icon
{
.
labe
l-subscribe-button-icon
{
display
:
none
;
}
.
badge.badge-pil
l-subscribe-button-loading
{
.
labe
l-subscribe-button-loading
{
display
:
block
;
}
}
}
.
badge.badge-pil
l-link
{
.
labe
l-link
{
display
:
inline-flex
;
vertical-align
:
top
;
.
badge.badge-pil
l
{
.
labe
l
{
vertical-align
:
inherit
;
font-size
:
$label-font-size
;
}
...
...
app/assets/stylesheets/pages/merge_requests.scss
View file @
0d555545
...
...
@@ -174,7 +174,7 @@
text-transform
:
capitalize
;
}
.
badge.badge-pil
l-branch
{
.
labe
l-branch
{
@extend
.ref-name
;
color
:
$gl-text-color
;
...
...
@@ -182,7 +182,7 @@
overflow
:
hidden
;
word-break
:
break-all
;
&
.
badge.badge-pil
l-truncated
{
&
.
labe
l-truncated
{
position
:
relative
;
display
:
inline-block
;
width
:
250px
;
...
...
app/assets/stylesheets/pages/pipelines.scss
View file @
0d555545
...
...
@@ -18,7 +18,7 @@
.ci-table
{
.badge
.badge-pill
{
.badge
{
margin-bottom
:
3px
;
}
...
...
@@ -151,14 +151,14 @@
color
:
$gl-link-color
;
}
.badge
.badge-pill
{
.badge
{
margin-right
:
4px
;
}
.
badge.badge-pil
l-container
{
.
labe
l-container
{
font-size
:
0
;
.badge
.badge-pill
{
.badge
{
margin-top
:
5px
;
}
}
...
...
@@ -220,7 +220,7 @@
box-shadow
:
none
;
}
.pipeline-tags
.
badge.badge-pil
l-container
{
.pipeline-tags
.
labe
l-container
{
white-space
:
normal
;
}
}
...
...
app/assets/stylesheets/pages/profile.scss
View file @
0d555545
...
...
@@ -405,7 +405,7 @@ table.u2f-registrations {
margin-right
:
$gl-padding
/
4
;
}
.
badge.badge-pil
l-verification-status
{
.
labe
l-verification-status
{
border-width
:
1px
;
border-style
:
solid
;
...
...
app/assets/stylesheets/pages/settings.scss
View file @
0d555545
...
...
@@ -103,7 +103,7 @@
margin-top
:
0
;
}
.
badge.badge-pil
l-light
{
.
labe
l-light
{
margin-bottom
:
0
;
}
}
...
...
@@ -209,7 +209,7 @@
line-height
:
12px
;
}
.card-heading
.
badge.badge-pil
l-count
{
.card-heading
.
labe
l-count
{
color
:
$white-light
;
background
:
$common-gray-dark
;
}
...
...
app/assets/stylesheets/pages/settings_ci_cd.scss
View file @
0d555545
.triggers-container
{
.
badge.badge-pil
l-container
{
.
labe
l-container
{
display
:
inline-block
;
margin-left
:
10px
;
}
...
...
app/views/admin/users/_user.html.haml
View file @
0d555545
...
...
@@ -9,7 +9,7 @@
-
if
user
.
admin?
%span
.badge.badge-success
Admin
-
if
user
.
external?
%span
.badge.
label-default
External
%span
.badge.
badge-secondary
External
-
if
user
==
current_user
%span
It's you!
.row-second-line.str-truncated-100
...
...
app/views/projects/pages_domains/show.html.haml
View file @
0d555545
...
...
@@ -44,7 +44,7 @@
=
form_tag
verify_project_pages_domain_path
(
@project
,
@domain
)
do
.status-badge
-
text
,
status
=
@domain
.
unverified?
?
[
_
(
'Unverified'
),
'badge-danger'
]
:
[
_
(
'Verified'
),
'badge-success'
]
.
label
{
class:
status
}
.
badge
{
class:
status
}
=
text
%button
.btn.has-tooltip
{
type:
"submit"
,
data:
{
container:
'body'
},
title:
_
(
"Retry verification"
)
}
=
sprite_icon
(
'redo'
)
...
...
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