Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2018-04-13 23:03:53 +0300
committerClement Ho <ClemMakesApps@gmail.com>2018-04-13 23:03:53 +0300
commit0d55554590e4653ed114a69b4b9cd71688b9e8a5 (patch)
treef9eddc1adc264941ede27f7509c4576db2bfde02
parent43de46e28aa023a71ba0dd0c61795773baaf4cc6 (diff)
[skip ci] fix overzealous .badge-pill renames from scss migration script
-rw-r--r--app/assets/stylesheets/framework/files.scss2
-rw-r--r--app/assets/stylesheets/framework/forms.scss2
-rw-r--r--app/assets/stylesheets/framework/lists.scss2
-rw-r--r--app/assets/stylesheets/framework/wells.scss2
-rw-r--r--app/assets/stylesheets/pages/boards.scss6
-rw-r--r--app/assets/stylesheets/pages/environments.scss12
-rw-r--r--app/assets/stylesheets/pages/labels.scss34
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss4
-rw-r--r--app/assets/stylesheets/pages/pipelines.scss10
-rw-r--r--app/assets/stylesheets/pages/profile.scss2
-rw-r--r--app/assets/stylesheets/pages/settings.scss4
-rw-r--r--app/assets/stylesheets/pages/settings_ci_cd.scss2
-rw-r--r--app/views/admin/users/_user.html.haml2
-rw-r--r--app/views/projects/pages_domains/show.html.haml2
14 files changed, 43 insertions, 43 deletions
diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss
index 49d90275f53..f77ec4b6a2c 100644
--- a/app/assets/stylesheets/framework/files.scss
+++ b/app/assets/stylesheets/framework/files.scss
@@ -396,7 +396,7 @@ span.idiff {
margin-right: 1.5em;
}
-.badge.badge-pill-lfs {
+.label-lfs {
color: $common-gray-light;
border: 1px solid $common-gray-light;
}
diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss
index e46374530b5..afd7ee02dae 100644
--- a/app/assets/stylesheets/framework/forms.scss
+++ b/app/assets/stylesheets/framework/forms.scss
@@ -31,7 +31,7 @@ label {
margin: 0;
}
- &.badge.badge-pill-light {
+ &.label-light {
font-weight: $gl-font-weight-bold;
}
}
diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss
index 41ac7990083..f6f2f35159a 100644
--- a/app/assets/stylesheets/framework/lists.scss
+++ b/app/assets/stylesheets/framework/lists.scss
@@ -228,7 +228,7 @@ ul.content-list {
}
}
- .badge.badge-pill-default {
+ .badge-secondary {
color: $gl-text-color-secondary;
}
diff --git a/app/assets/stylesheets/framework/wells.scss b/app/assets/stylesheets/framework/wells.scss
index 92fe3009a16..75a42263c7b 100644
--- a/app/assets/stylesheets/framework/wells.scss
+++ b/app/assets/stylesheets/framework/wells.scss
@@ -58,7 +58,7 @@
}
}
- .badge.badge-pill.badge.badge-pill-gray {
+ .label-gray {
background-color: $well-expand-item;
}
diff --git a/app/assets/stylesheets/pages/boards.scss b/app/assets/stylesheets/pages/boards.scss
index c164576e7bc..2407ef28cc9 100644
--- a/app/assets/stylesheets/pages/boards.scss
+++ b/app/assets/stylesheets/pages/boards.scss
@@ -244,7 +244,7 @@
margin-bottom: 8px;
}
- .badge.badge-pill-color {
+ .label-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;
}
diff --git a/app/assets/stylesheets/pages/environments.scss b/app/assets/stylesheets/pages/environments.scss
index 8f175720562..030948ca57a 100644
--- a/app/assets/stylesheets/pages/environments.scss
+++ b/app/assets/stylesheets/pages/environments.scss
@@ -145,8 +145,8 @@
.x-axis path,
.y-axis path,
-.badge.badge-pill-x-axis-line,
-.badge.badge-pill-y-axis-line {
+.label-x-axis-line,
+.label-y-axis-line {
fill: none;
stroke-width: 1;
shape-rendering: crispEdges;
@@ -157,8 +157,8 @@
stroke: $stat-graph-axis-fill;
}
-.badge.badge-pill-x-axis-line,
-.badge.badge-pill-y-axis-line {
+.label-x-axis-line,
+.label-y-axis-line {
stroke: $border-color;
}
@@ -357,7 +357,7 @@
font-weight: $gl-font-weight-bold;
}
- .badge.badge-pill-axis-text {
+ .label-axis-text {
fill: $black;
font-weight: $gl-font-weight-normal;
font-size: 10px;
@@ -402,7 +402,7 @@
}
@include media-breakpoint-down(sm) {
- .badge.badge-pill-axis-text,
+ .label-axis-text,
.text-metric-usage,
.legend-axis-text {
font-size: 8px;
diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss
index d524db62d68..350da9d221e 100644
--- a/app/assets/stylesheets/pages/labels.scss
+++ b/app/assets/stylesheets/pages/labels.scss
@@ -57,8 +57,8 @@
border-bottom-left-radius: $border-radius-base;
}
-.badge.badge-pill-row {
- .badge.badge-pill-name {
+.label-row {
+ .label-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-pill-type {
+ .label-type {
display: block;
margin-bottom: 10px;
margin-left: 50px;
@@ -89,7 +89,7 @@
}
}
- .badge.badge-pill-description {
+ .label-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-pill-row {
+ .label-row {
margin-top: 4px;
margin-bottom: 4px;
@@ -243,7 +243,7 @@
}
}
- .badge.badge-pill-remove {
+ .label-remove {
border-left: 1px solid $label-remove-border;
z-index: 3;
border-radius: $label-border-radius;
@@ -270,11 +270,11 @@
}
}
-.badge.badge-pill-options-toggle {
+.label-options-toggle {
width: 100%;
}
-.badge.badge-pill-subscription {
+.label-subscription {
vertical-align: middle;
.dropdown-group-label a {
@@ -282,39 +282,39 @@
}
}
-.badge.badge-pill-subscribe-button {
+.label-subscribe-button {
@media(min-width: map-get($grid-breakpoints, md)) {
min-width: 105px;
margin-left: $gl-padding;
}
- .badge.badge-pill-subscribe-button-icon {
+ .label-subscribe-button-icon {
&[disabled] {
opacity: 0.5;
pointer-events: none;
}
}
- .badge.badge-pill-subscribe-button-loading {
+ .label-subscribe-button-loading {
display: none;
}
&.disabled {
- .badge.badge-pill-subscribe-button-icon {
+ .label-subscribe-button-icon {
display: none;
}
- .badge.badge-pill-subscribe-button-loading {
+ .label-subscribe-button-loading {
display: block;
}
}
}
-.badge.badge-pill-link {
+.label-link {
display: inline-flex;
vertical-align: top;
- .badge.badge-pill {
+ .label {
vertical-align: inherit;
font-size: $label-font-size;
}
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index d4c89f2cf18..c2b8769131e 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -174,7 +174,7 @@
text-transform: capitalize;
}
- .badge.badge-pill-branch {
+ .label-branch {
@extend .ref-name;
color: $gl-text-color;
@@ -182,7 +182,7 @@
overflow: hidden;
word-break: break-all;
- &.badge.badge-pill-truncated {
+ &.label-truncated {
position: relative;
display: inline-block;
width: 250px;
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index bea1ec4d006..eafc3eccef7 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -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-pill-container {
+ .label-container {
font-size: 0;
- .badge.badge-pill {
+ .badge {
margin-top: 5px;
}
}
@@ -220,7 +220,7 @@
box-shadow: none;
}
- .pipeline-tags .badge.badge-pill-container {
+ .pipeline-tags .label-container {
white-space: normal;
}
}
diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss
index ca201730928..06078f1d12e 100644
--- a/app/assets/stylesheets/pages/profile.scss
+++ b/app/assets/stylesheets/pages/profile.scss
@@ -405,7 +405,7 @@ table.u2f-registrations {
margin-right: $gl-padding / 4;
}
- .badge.badge-pill-verification-status {
+ .label-verification-status {
border-width: 1px;
border-style: solid;
diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss
index 212fe0f6dcc..03a33390c98 100644
--- a/app/assets/stylesheets/pages/settings.scss
+++ b/app/assets/stylesheets/pages/settings.scss
@@ -103,7 +103,7 @@
margin-top: 0;
}
- .badge.badge-pill-light {
+ .label-light {
margin-bottom: 0;
}
}
@@ -209,7 +209,7 @@
line-height: 12px;
}
- .card-heading .badge.badge-pill-count {
+ .card-heading .label-count {
color: $white-light;
background: $common-gray-dark;
}
diff --git a/app/assets/stylesheets/pages/settings_ci_cd.scss b/app/assets/stylesheets/pages/settings_ci_cd.scss
index 1bbd6884ee0..a355e2dee24 100644
--- a/app/assets/stylesheets/pages/settings_ci_cd.scss
+++ b/app/assets/stylesheets/pages/settings_ci_cd.scss
@@ -1,5 +1,5 @@
.triggers-container {
- .badge.badge-pill-container {
+ .label-container {
display: inline-block;
margin-left: 10px;
}
diff --git a/app/views/admin/users/_user.html.haml b/app/views/admin/users/_user.html.haml
index 046be66c0f2..28156e8b6f8 100644
--- a/app/views/admin/users/_user.html.haml
+++ b/app/views/admin/users/_user.html.haml
@@ -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
diff --git a/app/views/projects/pages_domains/show.html.haml b/app/views/projects/pages_domains/show.html.haml
index 821cf33fdf4..5b00132410e 100644
--- a/app/views/projects/pages_domains/show.html.haml
+++ b/app/views/projects/pages_domains/show.html.haml
@@ -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')