From b5c9637c92864d81b4d7557f8e3b729de259a58a Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 25 Mar 2016 15:31:19 +0100 Subject: Make sure CI status icons have same color across all app Signed-off-by: Dmitriy Zaporozhets --- app/assets/stylesheets/pages/status.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/pages/status.scss b/app/assets/stylesheets/pages/status.scss index 6f777d11641..aed898b34af 100644 --- a/app/assets/stylesheets/pages/status.scss +++ b/app/assets/stylesheets/pages/status.scss @@ -37,18 +37,18 @@ } .ci-status-icon-success { - @extend .cgreen; + color: $gl-text-green !important; } .ci-status-icon-failed { - @extend .cred; + color: $gl-text-red !important; } .ci-status-icon-running, .ci-status-icon-pending { - // These are standard text color + color: $gl-text-orange !important; } .ci-status-icon-canceled, .ci-status-icon-disabled, .ci-status-icon-not-found, .ci-status-icon-skipped { - @extend .cgray; + color: $gl-gray !important; } -- cgit v1.2.1 From 1853d715438e5015a94ed398dbf37ad73d7b38ed Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 25 Mar 2016 15:40:51 +0100 Subject: Fix link colors by using content-list for commits Signed-off-by: Dmitriy Zaporozhets --- app/assets/stylesheets/pages/commits.scss | 4 ++++ app/views/projects/commits/_commit_list.html.haml | 4 ++-- app/views/projects/commits/_commits.html.haml | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss index 33b3c7558ed..5e91496679a 100644 --- a/app/assets/stylesheets/pages/commits.scss +++ b/app/assets/stylesheets/pages/commits.scss @@ -99,6 +99,10 @@ li.commit { color: $gl-gray; } + .avatar { + margin-right: 8px; + } + .committed_ago { display: inline-block; } diff --git a/app/views/projects/commits/_commit_list.html.haml b/app/views/projects/commits/_commit_list.html.haml index bac9e244d36..46e4de40042 100644 --- a/app/views/projects/commits/_commit_list.html.haml +++ b/app/views/projects/commits/_commit_list.html.haml @@ -5,10 +5,10 @@ .panel-heading Commits (#{@commits.count}) - if hidden > 0 - %ul.well-list + %ul.content-list - commits.each do |commit| = render "projects/commits/inline_commit", commit: commit, project: @project %li.warning-row.unstyled #{number_with_delimiter(hidden)} additional commits have been omitted to prevent performance issues. - else - %ul.well-list= render commits, project: @project + %ul.content-list= render commits, project: @project diff --git a/app/views/projects/commits/_commits.html.haml b/app/views/projects/commits/_commits.html.haml index a7e3c2478c2..64e8da9201d 100644 --- a/app/views/projects/commits/_commits.html.haml +++ b/app/views/projects/commits/_commits.html.haml @@ -12,7 +12,7 @@ .light = pluralize(commits.count, 'commit') .col-md-10.col-sm-12 - %ul.bordered-list + %ul.content-list = render commits, project: project %hr.lists-separator -- cgit v1.2.1 From 02b585e9248e28272c3a9620a0d4218e2420ff11 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 25 Mar 2016 15:48:00 +0100 Subject: Repository breadcrumbs and file header links should be dark Signed-off-by: Dmitriy Zaporozhets --- app/assets/stylesheets/framework/files.scss | 4 ++++ app/assets/stylesheets/pages/projects.scss | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss index 646e2610831..ad0e88cda86 100644 --- a/app/assets/stylesheets/framework/files.scss +++ b/app/assets/stylesheets/framework/files.scss @@ -50,6 +50,10 @@ } } + a { + color: $gl-dark-link-color; + } + .left-options { margin-top: -3px; } diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index c68bd673a67..71bde1174ee 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -229,6 +229,10 @@ padding: 0 3px; color: #999; } + + a { + color: $gl-dark-link-color; + } } .last-push-widget { -- cgit v1.2.1 From 80c3cbfb1d0ba86db5602de211358240b5e165ee Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 25 Mar 2016 15:55:08 +0100 Subject: Make sure ci status colors are same and respected on most pages Signed-off-by: Dmitriy Zaporozhets --- app/assets/stylesheets/pages/status.scss | 92 +++++++++++++++++--------------- 1 file changed, 48 insertions(+), 44 deletions(-) diff --git a/app/assets/stylesheets/pages/status.scss b/app/assets/stylesheets/pages/status.scss index aed898b34af..1a697f81652 100644 --- a/app/assets/stylesheets/pages/status.scss +++ b/app/assets/stylesheets/pages/status.scss @@ -1,54 +1,58 @@ -.ci-status { - padding: 2px 7px; - margin-right: 5px; - border: 1px solid #eee; - white-space: nowrap; - @include border-radius(4px); +body .content { + .ci-status { + padding: 2px 7px; + margin-right: 5px; + border: 1px solid #eee; + white-space: nowrap; + @include border-radius(4px); - &:hover { - text-decoration: none; - } + &:hover { + text-decoration: none; + } - &.ci-failed { - color: $gl-danger; - border-color: $gl-danger; - } + &.ci-failed { + color: $gl-danger; + border-color: $gl-danger; + } - &.ci-success { - color: $gl-success; - border-color: $gl-success; - } + &.ci-success { + color: $gl-success; + border-color: $gl-success; + } - &.ci-info { - color: $gl-info; - border-color: $gl-info; - } + &.ci-info { + color: $gl-info; + border-color: $gl-info; + } - &.ci-disabled { - color: $gl-gray; - border-color: $gl-gray; + &.ci-canceled, + &.ci-skipped, + &.ci-disabled { + color: $gl-gray; + border-color: $gl-gray; + } + + &.ci-pending, + &.ci-running { + color: $gl-warning; + border-color: $gl-warning; + } } - &.ci-pending, - &.ci-running { + .ci-status-icon-success { + color: $gl-success; + } + .ci-status-icon-failed { + color: $gl-danger; + } + .ci-status-icon-running, + .ci-status-icon-pending { color: $gl-warning; - border-color: $gl-warning; } -} - -.ci-status-icon-success { - color: $gl-text-green !important; -} -.ci-status-icon-failed { - color: $gl-text-red !important; -} -.ci-status-icon-running, -.ci-status-icon-pending { - color: $gl-text-orange !important; -} -.ci-status-icon-canceled, -.ci-status-icon-disabled, -.ci-status-icon-not-found, -.ci-status-icon-skipped { - color: $gl-gray !important; + .ci-status-icon-canceled, + .ci-status-icon-disabled, + .ci-status-icon-not-found, + .ci-status-icon-skipped { + color: $gl-gray; + } } -- cgit v1.2.1 From d903465c256068ae3b11d46f9d7633666a244235 Mon Sep 17 00:00:00 2001 From: Jacob Schatz Date: Fri, 25 Mar 2016 13:16:10 -0400 Subject: Using class for specificity instead of tag. --- app/assets/stylesheets/pages/status.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/pages/status.scss b/app/assets/stylesheets/pages/status.scss index 1a697f81652..5e5e38a0ba6 100644 --- a/app/assets/stylesheets/pages/status.scss +++ b/app/assets/stylesheets/pages/status.scss @@ -1,4 +1,4 @@ -body .content { +.container-fluid .content { .ci-status { padding: 2px 7px; margin-right: 5px; -- cgit v1.2.1