Commit eb55ac7d authored by Luke Bennett's avatar Luke Bennett Committed by Annabel Dunstone Gray

Added final changes from handover

parent 65e482e7
...@@ -17,8 +17,10 @@ $white-normal: #ededed; ...@@ -17,8 +17,10 @@ $white-normal: #ededed;
$white-dark: #ececec; $white-dark: #ececec;
$gray-light: #fafafa; $gray-light: #fafafa;
$gray-lighter: #f9f9f9;
$gray-normal: #f5f5f5; $gray-normal: #f5f5f5;
$gray-dark: #ededed; $gray-dark: #ededed;
$gray-darker: #eee;
$gray-darkest: #c9c9c9; $gray-darkest: #c9c9c9;
$green-light: #38ae67; $green-light: #38ae67;
...@@ -33,6 +35,8 @@ $blue-medium-light: #3498cb; ...@@ -33,6 +35,8 @@ $blue-medium-light: #3498cb;
$blue-medium: #2f8ebf; $blue-medium: #2f8ebf;
$blue-medium-dark: #2d86b4; $blue-medium-dark: #2d86b4;
$blue-light-transparent: rgba(44, 159, 216, 0.05);
$orange-light: #fc8a51; $orange-light: #fc8a51;
$orange-normal: #e75e40; $orange-normal: #e75e40;
$orange-dark: #ce5237; $orange-dark: #ce5237;
...@@ -91,6 +95,7 @@ $table-text-gray: #8f8f8f; ...@@ -91,6 +95,7 @@ $table-text-gray: #8f8f8f;
$gl-font-size: 15px; $gl-font-size: 15px;
$gl-title-color: #333; $gl-title-color: #333;
$gl-text-color: #5c5c5c; $gl-text-color: #5c5c5c;
$gl-text-color-light: #8c8c8c;
$gl-text-green: #4a2; $gl-text-green: #4a2;
$gl-text-red: #d12f19; $gl-text-red: #d12f19;
$gl-text-orange: #d90; $gl-text-orange: #d90;
......
...@@ -342,11 +342,18 @@ ...@@ -342,11 +342,18 @@
.build { .build {
border: 1px solid $border-color; border: 1px solid $border-color;
position: relative; position: relative;
padding: 8px 10px; padding: 7px 10px 8px;
border-radius: 30px; border-radius: 30px;
width: 186px; width: 186px;
margin-bottom: 10px; margin-bottom: 10px;
&:hover {
background-color: $gray-lighter;
.dropdown-menu-toggle {
background-color: transparent;
}
}
&.playable { &.playable {
background-color: $gray-light; background-color: $gray-light;
...@@ -366,7 +373,6 @@ ...@@ -366,7 +373,6 @@
width: 164px; width: 164px;
.ci-status-icon { .ci-status-icon {
svg { svg {
height: 20px; height: 20px;
width: 20px; width: 20px;
...@@ -385,41 +391,40 @@ ...@@ -385,41 +391,40 @@
} }
a { a {
color: $layout-link-gray; color: $gl-text-color-light;
text-decoration: none; text-decoration: none;
&:hover {
.ci-status-text {
text-decoration: underline;
}
}
} }
.dropdown-menu-toggle { .dropdown-menu-toggle {
border: none; border: none;
width: auto; width: auto;
padding: 0; padding: 0;
color: $layout-link-gray; color: $gl-text-color-light;
.ci-status-text { .ci-status-text {
width: 112px; max-width: 112px;
width: auto;
} }
} }
.grouped-pipeline-dropdown { .grouped-pipeline-dropdown {
padding: 8px 0; padding: 8px 0;
width: 168px; width: 186px;
left: auto; left: auto;
right: -180px; right: -197px;
top: -9px; top: -9px;
max-height: 245px; max-height: 245px;
overflow-y: scroll; overflow-y: scroll;
a { a {
padding: 7px 8px; color: $gl-text-color;
padding: 7px 8px 8px;
margin: 0 8px; margin: 0 8px;
&:hover { &:hover {
background-color: $blue-light-transparent;
border-radius: 3px;
.ci-status-text { .ci-status-text {
text-decoration: none; text-decoration: none;
} }
...@@ -465,9 +470,10 @@ ...@@ -465,9 +470,10 @@
} }
.badge { .badge {
background-color: $gray-dark; background-color: $gray-darker;
color: $layout-link-gray; color: $gl-text-color-light;
font-weight: normal; font-weight: normal;
margin-left: $btn-xs-side-margin;
} }
} }
......
...@@ -10,5 +10,5 @@ ...@@ -10,5 +10,5 @@
- else - else
%li.build %li.build
.curve .curve
.build-content .dropdown.inline.build-content{ type: 'button', data: { toggle: 'dropdown' } }
= render "projects/commit/pipeline_status_group", name: group_name, subject: grouped_statuses = render "projects/commit/pipeline_status_group", name: group_name, subject: grouped_statuses
- group_status = CommitStatus.where(id: subject).status - group_status = CommitStatus.where(id: subject).status
%span.ci-status-icon %span.ci-status-icon
= render_status_with_link('build', group_status) = render_status_with_link('build', group_status)
.dropdown.inline %button.dropdown-menu-toggle
%button.dropdown-menu-toggle{ type: 'button', data: { toggle: 'dropdown' } }
%span.ci-status-text %span.ci-status-text
= name = name
%span.badge= subject.size %span.badge= subject.size
%ul.dropdown-menu.grouped-pipeline-dropdown %ul.dropdown-menu.grouped-pipeline-dropdown
.arrow .arrow
- subject.each do |status| - subject.each do |status|
= render "projects/#{status.to_partial_path}_pipeline", subject: status = render "projects/#{status.to_partial_path}_pipeline", subject: status
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment