diff options
author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-11-21 16:11:01 -0500 |
---|---|---|
committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-11-21 16:11:01 -0500 |
commit | b3700f96013d06cbe48e0fbf1aa89f91fd9fa35d (patch) | |
tree | 13a7f855c4146023e21578644190fcb19b76cec4 | |
parent | 796596812faa96465d89b7616510d7b5de58c8c9 (diff) | |
download | gitlab-ce-b3700f96013d06cbe48e0fbf1aa89f91fd9fa35d.tar.gz |
Fix CSS declaration
3 files changed, 8 insertions, 8 deletions
diff --git a/app/assets/javascripts/cycle_analytics/components/stage_staging_component.js.es6 b/app/assets/javascripts/cycle_analytics/components/stage_staging_component.js.es6 index 58a7f3a1f54..b30c3a31010 100644 --- a/app/assets/javascripts/cycle_analytics/components/stage_staging_component.js.es6 +++ b/app/assets/javascripts/cycle_analytics/components/stage_staging_component.js.es6 @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ ((global) => { global.cycleAnalytics = global.cycleAnalytics || {}; - debugger; + global.cycleAnalytics.StageStagingComponent = Vue.extend({ props: { items: Array, diff --git a/app/assets/stylesheets/pages/cycle_analytics.scss b/app/assets/stylesheets/pages/cycle_analytics.scss index cb1294b8201..8541d41bb1e 100644 --- a/app/assets/stylesheets/pages/cycle_analytics.scss +++ b/app/assets/stylesheets/pages/cycle_analytics.scss @@ -211,9 +211,9 @@ .stage-nav-item { display: block; line-height: 65px; - border-top: solid 1px transparent; - border-bottom: solid 1px transparent; - border-right: solid 1px $border-color; + border-top: 1px solid transparent; + border-bottom: 1px solid transparent; + border-right: 1px solid $border-color; background-color: $gray-light; &.active { @@ -236,7 +236,7 @@ border-bottom: none; } - > div { + .stage-nav-item-cell { float: left; &.stage-name { @@ -286,7 +286,7 @@ list-style-type: none; padding: 0 0 $gl-padding; margin: 0 $gl-padding $gl-padding; - border-bottom: solid 1px $gray-darker; + border-bottom: 1px solid $gray-darker; @include clearfix; &:last-child { diff --git a/app/views/projects/cycle_analytics/show.html.haml b/app/views/projects/cycle_analytics/show.html.haml index ce1393267eb..580371ac000 100644 --- a/app/views/projects/cycle_analytics/show.html.haml +++ b/app/views/projects/cycle_analytics/show.html.haml @@ -66,9 +66,9 @@ %nav.stage-nav %ul %li.stage-nav-item{ ':class' => '{ active: stage.active }', '@click' => 'selectStage(stage)', "v-for" => "stage in state.stages" } - .stage-name + .stage-nav-item-cell.stage-name {{ stage.title }} - .stage-median + .stage-nav-item-cell.stage-median %template{ "v-if" => "stage.isUserAllowed" } %span{ "v-if" => "stage.value" } {{ stage.value }} |