From f139b62c01816fd25228c3740a3a5b379339e74c Mon Sep 17 00:00:00 2001 From: Takuya Noguchi Date: Mon, 28 May 2018 08:00:36 +0900 Subject: Fix CSS for buttons not to be hidden on issues/MR title --- app/assets/stylesheets/pages/detail_page.scss | 3 ++- app/assets/stylesheets/pages/issuable.scss | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/pages/detail_page.scss b/app/assets/stylesheets/pages/detail_page.scss index 7b36bcb3c7d..2e007c52592 100644 --- a/app/assets/stylesheets/pages/detail_page.scss +++ b/app/assets/stylesheets/pages/detail_page.scss @@ -23,7 +23,8 @@ position: relative; line-height: 35px; display: flex; - flex-grow: 1; + flex: 1 1; + min-width: 0; @include media-breakpoint-up(sm) { padding-left: 0; diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 4aea9740735..10a0e076cb4 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -689,6 +689,8 @@ font-size: 14px; line-height: 24px; align-self: center; + overflow: hidden; + text-overflow: ellipsis; } .js-issuable-selector-wrap { -- cgit v1.2.1 From 2d5e47bfc3c6c9a77dbb61694cd65c18f45a11cc Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Tue, 12 Jun 2018 17:05:45 +0100 Subject: Improve commit flow in Web IDE Closes #46122 --- app/assets/stylesheets/pages/repo.scss | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss index 4b8a3db1d06..0b0a435b6f4 100644 --- a/app/assets/stylesheets/pages/repo.scss +++ b/app/assets/stylesheets/pages/repo.scss @@ -557,16 +557,7 @@ } .multi-file-discard-btn { - display: none; margin-top: -2px; - margin-left: auto; - color: $gl-link-color; - } - - &:hover { - .multi-file-discard-btn { - display: flex; - } } } @@ -840,18 +831,14 @@ } .ide-staged-action-btn { - margin-left: auto; - line-height: 22px; + width: 22px; + border: 1px solid $white-dark; } .ide-commit-file-count { min-width: 22px; - margin-left: auto; background-color: $gray-light; - border-radius: $border-radius-default; border: 1px solid $white-dark; - line-height: 20px; - text-align: center; } .ide-commit-radios { -- cgit v1.2.1 From 30ef25452182cb9a956f895595cf0cd4afc51c57 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Wed, 13 Jun 2018 09:44:14 +0100 Subject: fixed hover styling caused by dropdown fixed karma specs added CHANGELOG item --- app/assets/stylesheets/pages/repo.scss | 39 +++++++++++++++------------------- 1 file changed, 17 insertions(+), 22 deletions(-) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss index 0b0a435b6f4..36a514a5055 100644 --- a/app/assets/stylesheets/pages/repo.scss +++ b/app/assets/stylesheets/pages/repo.scss @@ -540,27 +540,12 @@ margin-right: -$grid-size; min-height: 60px; - .multi-file-commit-list-item { - margin-left: 0; - margin-right: 0; - } - &.form-text.text-muted { margin-left: 0; right: 0; } } -.multi-file-commit-list-item { - &.is-active { - background-color: $white-normal; - } - - .multi-file-discard-btn { - margin-top: -2px; - } -} - .multi-file-addition, .multi-file-addition-solid { color: $green-500; @@ -590,7 +575,7 @@ } } -.multi-file-commit-list-item, +.multi-file-commit-list-path, .ide-file-list .file { display: flex; align-items: center; @@ -607,11 +592,9 @@ } .multi-file-commit-list-path { - padding: 0; - background: none; - border: 0; - text-align: left; - width: 100%; + &.is-active { + background-color: $white-normal; + } &:hover, &:focus { @@ -637,6 +620,12 @@ } } +.multi-file-discard-btn { + top: 0; + right: 8px; + bottom: 0; +} + .multi-file-commit-form { position: relative; background-color: $white-light; @@ -832,7 +821,13 @@ .ide-staged-action-btn { width: 22px; - border: 1px solid $white-dark; + margin-left: -1px; + border-top-left-radius: 0; + border-bottom-left-radius: 0; + + > svg { + top: 0; + } } .ide-commit-file-count { -- cgit v1.2.1 From 14412cbe6c50849a8717465c412433a7946592c1 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Wed, 13 Jun 2018 14:09:39 +0100 Subject: fixed ellipsis not showing correctly --- app/assets/stylesheets/pages/repo.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss index 36a514a5055..94c8910fa97 100644 --- a/app/assets/stylesheets/pages/repo.scss +++ b/app/assets/stylesheets/pages/repo.scss @@ -609,7 +609,7 @@ } .multi-file-commit-list-file-path { - @include str-truncated(100%); + @include str-truncated(calc(100% - 30px)); &:hover { text-decoration: underline; -- cgit v1.2.1 From b084dceb7952cf4674c5bcb67935d99319006ee4 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Wed, 13 Jun 2018 16:20:43 +0100 Subject: alignment updates added tooltip to more actions --- app/assets/stylesheets/pages/repo.scss | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss index 94c8910fa97..0a56153203c 100644 --- a/app/assets/stylesheets/pages/repo.scss +++ b/app/assets/stylesheets/pages/repo.scss @@ -621,9 +621,13 @@ } .multi-file-discard-btn { - top: 0; + top: 4px; right: 8px; - bottom: 0; + bottom: 4px; + + svg { + top: 0; + } } .multi-file-commit-form { -- cgit v1.2.1 From 279744f057f3bbe4e4e5c7e59e9b7693c3c88f65 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Thu, 14 Jun 2018 11:23:00 -0700 Subject: Truncate long label names --- app/assets/stylesheets/pages/labels.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss index 73eb399d7bb..79cac7f4ff0 100644 --- a/app/assets/stylesheets/pages/labels.scss +++ b/app/assets/stylesheets/pages/labels.scss @@ -280,7 +280,7 @@ width: 150px; flex-shrink: 0; - .label { + .badge { overflow: hidden; text-overflow: ellipsis; max-width: 100%; -- cgit v1.2.1 From eb10bcaa923cbc02501d4a70e12c90280428a602 Mon Sep 17 00:00:00 2001 From: George Tsiolis Date: Fri, 15 Jun 2018 14:47:37 +0300 Subject: Remove small container width --- app/assets/stylesheets/framework/layout.scss | 4 ---- app/assets/stylesheets/framework/variables.scss | 1 - 2 files changed, 5 deletions(-) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/framework/layout.scss b/app/assets/stylesheets/framework/layout.scss index 55c0bc76f23..52b5f059f20 100644 --- a/app/assets/stylesheets/framework/layout.scss +++ b/app/assets/stylesheets/framework/layout.scss @@ -54,10 +54,6 @@ body { &.limit-container-width { max-width: $limited-layout-width; } - - &.limit-container-width-sm { - max-width: $limited-layout-width-sm; - } } .alert-wrapper { diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 04d2a049f7d..7907c19deb5 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -265,7 +265,6 @@ $header-height: 40px; $ide-statusbar-height: 25px; $fixed-layout-width: 1280px; $limited-layout-width: 990px; -$limited-layout-width-sm: 790px; $container-text-max-width: 540px; $gl-avatar-size: 40px; $error-exclamation-point: $red-500; -- cgit v1.2.1 From 6769ae235fb462803de6bf8916167cea5d61d680 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Fri, 15 Jun 2018 07:23:24 -0700 Subject: Fix odd numbered row bg color in striped table --- app/assets/stylesheets/framework/variables.scss | 1 + 1 file changed, 1 insertion(+) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 04d2a049f7d..3ee992879d1 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -834,3 +834,4 @@ $font-family-sans-serif: $regular_font; $font-family-monospace: $monospace_font; $input-line-height: 20px; $btn-line-height: 20px; +$table-accent-bg: $gray-light; -- cgit v1.2.1 From 52f922a270070f81b687110908c6f5701d8fa00d Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Fri, 15 Jun 2018 13:20:54 -0500 Subject: Fix project select dropdown in group issues and mr empty state --- app/assets/stylesheets/framework/secondary_navigation_elements.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/framework/secondary_navigation_elements.scss b/app/assets/stylesheets/framework/secondary_navigation_elements.scss index 2d9e9e6a67d..9dbb04e5443 100644 --- a/app/assets/stylesheets/framework/secondary_navigation_elements.scss +++ b/app/assets/stylesheets/framework/secondary_navigation_elements.scss @@ -347,7 +347,7 @@ .empty-state .project-item-select-holder.btn-group { float: none; - display: inline-block; + justify-content: center; .btn { // overrides styles applied to plain `.empty-state .btn` -- cgit v1.2.1 From c3aa36d035da3cf5e245eac12aa6c3ffcb27cf98 Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Fri, 15 Jun 2018 18:36:26 +0000 Subject: Remove pointer events in favor of boundary viewport --- app/assets/stylesheets/bootstrap_migration.scss | 5 ----- 1 file changed, 5 deletions(-) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index 5da0e672288..c3ba62805dc 100644 --- a/app/assets/stylesheets/bootstrap_migration.scss +++ b/app/assets/stylesheets/bootstrap_migration.scss @@ -128,11 +128,6 @@ table { border-spacing: 0; } -.tooltip { - // Fix bootstrap4 bug whereby tooltips flicker when they are hovered over their borders - pointer-events: none; -} - .popover { font-size: 14px; } -- cgit v1.2.1 From 4c34e0f3617be3eb597db3bfcd7514456575d8d5 Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Fri, 15 Jun 2018 19:35:27 +0000 Subject: Fix alert colors --- app/assets/stylesheets/bootstrap_migration.scss | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index c3ba62805dc..d92b6f9fe09 100644 --- a/app/assets/stylesheets/bootstrap_migration.scss +++ b/app/assets/stylesheets/bootstrap_migration.scss @@ -259,15 +259,36 @@ pre code { white-space: pre-wrap; } +.alert, +.flash-notice { + border-radius: 0; +} + +.alert-success { + background-color: $green-500; + border-color: $green-500; +} + +.alert-info { + background-color: $blue-500; + border-color: $blue-500; +} + +.alert-warning { + background-color: $orange-500; + border-color: $orange-500; +} + .alert-danger { background-color: $red-500; border-color: $red-500; } +.alert-success, +.alert-info, .alert-warning, .alert-danger, .flash-notice { - border-radius: 0; color: $white-light; h4, -- cgit v1.2.1 From 1983d1a5ffdbf75763eccb122ac4a30b3b822ea7 Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Fri, 15 Jun 2018 15:04:51 -0500 Subject: Fix ci mini graph dropdown alignment and positioning --- app/assets/stylesheets/pages/pipelines.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index 4e1768f556a..52332ac97dd 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -1001,7 +1001,7 @@ button.mini-pipeline-graph-dropdown-toggle { /** * Center dropdown menu in mini graph */ - &.dropdown-menu { + .dropdown &.dropdown-menu { transform: translate(-80%, 0); @media (min-width: map-get($grid-breakpoints, md)) { -- cgit v1.2.1 From 37bd3d44c6c985fc6e2a61488aadd31b01f36eb0 Mon Sep 17 00:00:00 2001 From: Jose Date: Thu, 14 Jun 2018 15:30:40 -0500 Subject: Fix missing underline on focus states for anchor tags --- app/assets/stylesheets/bootstrap_migration.scss | 5 +++++ app/assets/stylesheets/framework/contextual_sidebar.scss | 1 + 2 files changed, 6 insertions(+) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index 5da0e672288..cf952f026f5 100644 --- a/app/assets/stylesheets/bootstrap_migration.scss +++ b/app/assets/stylesheets/bootstrap_migration.scss @@ -89,6 +89,11 @@ a { color: $gl-link-color; } +a:not(.btn):focus, +a:not(.btn):active { + text-decoration: underline; +} + hr { overflow: hidden; } diff --git a/app/assets/stylesheets/framework/contextual_sidebar.scss b/app/assets/stylesheets/framework/contextual_sidebar.scss index 9cbaaa5dc8d..cccd1a6d942 100644 --- a/app/assets/stylesheets/framework/contextual_sidebar.scss +++ b/app/assets/stylesheets/framework/contextual_sidebar.scss @@ -193,6 +193,7 @@ &:focus { background: $link-active-background; color: $gl-text-color; + text-decoration: none; } } -- cgit v1.2.1 From 06f1c4cafbb989a0a4e4379390eb7a24529d4041 Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Fri, 15 Jun 2018 20:38:26 +0000 Subject: Resolve "Misalignment in rows on comparison page" --- app/assets/stylesheets/pages/commits.scss | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss index a4ca82de90e..dc8842212e0 100644 --- a/app/assets/stylesheets/pages/commits.scss +++ b/app/assets/stylesheets/pages/commits.scss @@ -193,6 +193,10 @@ display: inline-flex; } + .ci-status-icon svg { + vertical-align: text-bottom; + } + > .ci-status-link, > .btn, > .commit-sha-group { -- cgit v1.2.1 From 62bd9d34ff6903db1f68596564084383d12ab2cf Mon Sep 17 00:00:00 2001 From: Annabel Gray Date: Fri, 15 Jun 2018 21:30:19 +0000 Subject: Resolve "Wiki git clone holder and dropdown is broken" --- app/assets/stylesheets/pages/projects.scss | 1 - 1 file changed, 1 deletion(-) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 7ac0eaec645..aa83e5bdebc 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -858,7 +858,6 @@ pre.light-well { .git-clone-holder { width: 380px; - height: 28px; .btn-clipboard { border: 1px solid $border-color; -- cgit v1.2.1 From d7faa41fbe7ab53a47e5f0cde07e409f770ac4cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=C3=A4mmerle?= Date: Sat, 16 Jun 2018 00:28:17 +0200 Subject: Harmonize theme preferences previews --- app/assets/stylesheets/framework/variables.scss | 7 ++++--- app/assets/stylesheets/pages/profiles/preferences.scss | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 3ee992879d1..f9e7df20927 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -244,10 +244,11 @@ $tooltip-font-size: 12px; /* * Padding */ -$gl-padding-24: 24px; -$gl-padding: 16px; -$gl-padding-8: 8px; $gl-padding-4: 4px; +$gl-padding-8: 8px; +$gl-padding: 16px; +$gl-padding-24: 24px; +$gl-padding-32: 32px; $gl-col-padding: 15px; $gl-input-padding: 10px; $gl-vert-padding: 6px; diff --git a/app/assets/stylesheets/pages/profiles/preferences.scss b/app/assets/stylesheets/pages/profiles/preferences.scss index babe81cb0f7..a353f301d07 100644 --- a/app/assets/stylesheets/pages/profiles/preferences.scss +++ b/app/assets/stylesheets/pages/profiles/preferences.scss @@ -16,7 +16,7 @@ .application-theme { label { - margin: 0 $gl-padding $gl-padding 0; + margin: 0 $gl-padding-32 $gl-padding 0; text-align: center; } @@ -24,7 +24,7 @@ font-size: 0; height: 48px; border-radius: 4px; - min-width: 135px; + min-width: 112px; margin-bottom: $gl-padding-8; &.ui-indigo { @@ -75,7 +75,8 @@ .syntax-theme { label { - margin-right: 20px; + margin-right: $gl-padding-32; + margin-bottom: $gl-padding; text-align: center; .preview { @@ -84,7 +85,6 @@ img { border-radius: 4px; - max-width: 100%; } } -- cgit v1.2.1 From f4ab8fe3a70749a4d957e75a3984d08b90e7b4cc Mon Sep 17 00:00:00 2001 From: Sam Beckham Date: Mon, 18 Jun 2018 11:38:22 +0000 Subject: Resolve "Creating a deploy token doesn't bring back to the creation page" --- app/assets/stylesheets/bootstrap_migration.scss | 9 +++++++++ app/assets/stylesheets/pages/settings.scss | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index d92b6f9fe09..6017e5554d8 100644 --- a/app/assets/stylesheets/bootstrap_migration.scss +++ b/app/assets/stylesheets/bootstrap_migration.scss @@ -208,6 +208,15 @@ table { &:not(:last-of-type) { border-bottom: 1px solid $well-inner-border; } + + p, + ol, + ul, + .form-group { + &:last-of-type { + margin-bottom: 0; + } + } } .badge.badge-gray { diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss index 4abb145067a..33a974e0176 100644 --- a/app/assets/stylesheets/pages/settings.scss +++ b/app/assets/stylesheets/pages/settings.scss @@ -296,7 +296,8 @@ } .btn-clipboard { - margin-left: 5px; + background-color: $white-light; + border: 1px solid $theme-gray-200; } .deploy-token-help-block { -- cgit v1.2.1 From 568493a22af68f730bdd207ab7dc29a149c3d863 Mon Sep 17 00:00:00 2001 From: Kushal Pandya Date: Mon, 18 Jun 2018 23:52:49 +0530 Subject: Add styles for persistent notice banner --- app/assets/stylesheets/framework/flash.scss | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/framework/flash.scss b/app/assets/stylesheets/framework/flash.scss index 52c3f18a682..a6e324036ae 100644 --- a/app/assets/stylesheets/framework/flash.scss +++ b/app/assets/stylesheets/framework/flash.scss @@ -10,6 +10,20 @@ @extend .alert; background-color: $blue-500; margin: 0; + + &.flash-notice-persistent { + background-color: $blue-100; + color: $gl-text-color; + + a { + color: $gl-link-color; + + &:hover { + color: $gl-link-hover-color; + text-decoration: none; + } + } + } } .flash-warning { -- cgit v1.2.1 From 145288945df6db5f1ffb8abb1bb107796506b651 Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Mon, 18 Jun 2018 21:29:43 +0000 Subject: Resolve "BS4: Labels in issues system notes are misaligned again" --- app/assets/stylesheets/bootstrap_migration.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index 6017e5554d8..0d8e867f41d 100644 --- a/app/assets/stylesheets/bootstrap_migration.scss +++ b/app/assets/stylesheets/bootstrap_migration.scss @@ -173,7 +173,10 @@ table { display: none; } -.badge { +// Add to .label so that old system notes that are saved to the db +// will still receive the correct styling +.badge, +.label { padding: 4px 5px; font-size: 12px; font-style: normal; -- cgit v1.2.1 From dd95bf4304f7d66e282269ca41e008629c0d3b5b Mon Sep 17 00:00:00 2001 From: Jose Date: Mon, 18 Jun 2018 16:48:28 -0500 Subject: Remove top margin from checkboxes in integrations page --- app/assets/stylesheets/pages/settings.scss | 7 ------- 1 file changed, 7 deletions(-) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss index 33a974e0176..2f28031b9c8 100644 --- a/app/assets/stylesheets/pages/settings.scss +++ b/app/assets/stylesheets/pages/settings.scss @@ -127,13 +127,6 @@ color: $gl-danger; } -.service-settings { - input[type="radio"], - input[type="checkbox"] { - margin-top: 10px; - } -} - .integration-settings-form { .card.card-body, .info-well { -- cgit v1.2.1 From 59b91de52de1e2cce416825887ec2f9ca8fe019b Mon Sep 17 00:00:00 2001 From: Jose Date: Mon, 18 Jun 2018 17:26:54 -0500 Subject: Fix cancel automatic merge button height --- app/assets/stylesheets/pages/merge_requests.scss | 1 + 1 file changed, 1 insertion(+) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 99fe4a578be..596d3aa171c 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -46,6 +46,7 @@ .btn { font-size: $gl-font-size; + max-height: 26px; &[disabled] { opacity: 0.3; -- cgit v1.2.1 From f36714908f50d34265b3aacdbab009ed50f54678 Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Tue, 19 Jun 2018 15:20:53 -0500 Subject: Fix diff comment alignment for parallel code additions --- app/assets/stylesheets/pages/notes.scss | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 299eda53140..42c9d563fe1 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -638,6 +638,10 @@ ul.notes { .new & { margin-top: -10px; } + + .parallel .new & { + margin-top: initial; + } } .discussion-body, -- cgit v1.2.1 From 3e3f527991eb53e91a618d6fa806b93617bbc68d Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Tue, 19 Jun 2018 21:22:31 +0000 Subject: Resolve "Branch name status color is not correct anymore" --- app/assets/stylesheets/framework/forms.scss | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss index 03520f42997..2b2e6d69e33 100644 --- a/app/assets/stylesheets/framework/forms.scss +++ b/app/assets/stylesheets/framework/forms.scss @@ -201,6 +201,10 @@ label { } .gl-show-field-errors { + .form-control { + height: 34px; + } + .gl-field-success-outline { border: 1px solid $green-600; -- cgit v1.2.1 From bf377043966e4a6123c672cf450e839040801ee5 Mon Sep 17 00:00:00 2001 From: Simon Knox Date: Wed, 20 Jun 2018 12:33:28 +1000 Subject: fix add diff comment icon position --- app/assets/stylesheets/pages/diff.scss | 1 + app/assets/stylesheets/pages/notes.scss | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index fbc97ec0c95..6dcc0197b2a 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -61,6 +61,7 @@ .diff-line-num { width: 50px; + position: relative; a { transition: none; diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 42c9d563fe1..e04100b5a9e 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -634,14 +634,6 @@ ul.notes { margin-left: -55px; position: absolute; z-index: 10; - - .new & { - margin-top: -10px; - } - - .parallel .new & { - margin-top: initial; - } } .discussion-body, -- cgit v1.2.1 From 00525de03f4035300d38accc222ced32c960db8d Mon Sep 17 00:00:00 2001 From: Simon Knox Date: Wed, 20 Jun 2018 16:39:15 +1000 Subject: fix z-index and vertically center --- app/assets/stylesheets/pages/notes.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index e04100b5a9e..6e44fca7a1b 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -624,15 +624,17 @@ ul.notes { .line_holder .is-over:not(.no-comment-btn) { .add-diff-note { opacity: 1; + z-index: 101; } } .add-diff-note { @include btn-comment-icon; opacity: 0; - margin-top: -2px; margin-left: -55px; position: absolute; + top: 50%; + transform: translateY(-50%); z-index: 10; } -- cgit v1.2.1 From 3df04bd17fe3823dfd178edfce2e4bc1e3c48e24 Mon Sep 17 00:00:00 2001 From: Constance Okoghenun Date: Wed, 20 Jun 2018 07:36:50 +0000 Subject: Updated horizontal ellipsis icon for text-expander --- app/assets/stylesheets/pages/commits.scss | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss index dc8842212e0..49226ae8eac 100644 --- a/app/assets/stylesheets/pages/commits.scss +++ b/app/assets/stylesheets/pages/commits.scss @@ -135,10 +135,10 @@ } .text-expander { - display: inline-block; + display: inline-flex; background: $white-light; color: $gl-text-color-secondary; - padding: 0 4px; + padding: 1px $gl-padding-4; cursor: pointer; border: 1px solid $border-gray-dark; border-radius: $border-radius-default; @@ -180,6 +180,11 @@ .commit-content { padding-right: 10px; white-space: normal; + + .commit-title { + display: flex; + align-items: center; + } } .commit-actions { @@ -253,7 +258,6 @@ .generic_commit_status { a, button { - color: $gl-text-color; vertical-align: baseline; } -- cgit v1.2.1 From 14098af372a7bd1cc3d5a99bcd698120efa36ae5 Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Wed, 20 Jun 2018 14:55:58 +0000 Subject: Revert "Merge branch 'jivl-fix-focused-links-missing-underline' into 'master'" This reverts merge request !19873 --- app/assets/stylesheets/bootstrap_migration.scss | 5 ----- app/assets/stylesheets/framework/contextual_sidebar.scss | 1 - 2 files changed, 6 deletions(-) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index e6303ad4642..0d8e867f41d 100644 --- a/app/assets/stylesheets/bootstrap_migration.scss +++ b/app/assets/stylesheets/bootstrap_migration.scss @@ -89,11 +89,6 @@ a { color: $gl-link-color; } -a:not(.btn):focus, -a:not(.btn):active { - text-decoration: underline; -} - hr { overflow: hidden; } diff --git a/app/assets/stylesheets/framework/contextual_sidebar.scss b/app/assets/stylesheets/framework/contextual_sidebar.scss index cccd1a6d942..9cbaaa5dc8d 100644 --- a/app/assets/stylesheets/framework/contextual_sidebar.scss +++ b/app/assets/stylesheets/framework/contextual_sidebar.scss @@ -193,7 +193,6 @@ &:focus { background: $link-active-background; color: $gl-text-color; - text-decoration: none; } } -- cgit v1.2.1 From 2d0a581f5241fe5d3fb507b39a33fde2ec9a3b48 Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Wed, 20 Jun 2018 10:19:30 -0500 Subject: Fix navigation bar center logo for custom logos --- app/assets/stylesheets/framework/header.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index db59c91e375..2fa71b23314 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -558,7 +558,7 @@ background: $white-light; border-bottom: 1px solid $white-normal; - .center-logo { + .mx-auto { margin: 8px 0; text-align: center; -- cgit v1.2.1 From 3e66795ef1ff1228906239763910b051d8afcc37 Mon Sep 17 00:00:00 2001 From: Felipe Artur Date: Thu, 21 Jun 2018 12:22:40 +0000 Subject: Changes tab VUE refactoring --- app/assets/stylesheets/framework/animations.scss | 9 ++++ app/assets/stylesheets/framework/blocks.scss | 1 + app/assets/stylesheets/highlight/dark.scss | 4 +- app/assets/stylesheets/highlight/monokai.scss | 4 +- .../stylesheets/highlight/solarized_dark.scss | 4 +- .../stylesheets/highlight/solarized_light.scss | 4 +- app/assets/stylesheets/pages/diff.scss | 20 +++++-- app/assets/stylesheets/pages/merge_requests.scss | 4 +- app/assets/stylesheets/pages/note_form.scss | 16 ------ app/assets/stylesheets/pages/notes.scss | 62 +++++++++++++++++++--- 10 files changed, 93 insertions(+), 35 deletions(-) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/framework/animations.scss b/app/assets/stylesheets/framework/animations.scss index 14cd32da9eb..549a8730301 100644 --- a/app/assets/stylesheets/framework/animations.scss +++ b/app/assets/stylesheets/framework/animations.scss @@ -251,3 +251,12 @@ $skeleton-line-widths: ( transform: translateX(468px); } } + +.slide-down-enter-active { + transition: transform 0.2s; +} + +.slide-down-enter, +.slide-down-leave-to { + transform: translateY(-30%); +} diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss index 0de05548c68..1d4828be223 100644 --- a/app/assets/stylesheets/framework/blocks.scss +++ b/app/assets/stylesheets/framework/blocks.scss @@ -13,6 +13,7 @@ &.diff-collapsed { padding: 5px; + line-height: 34px; .click-to-expand { cursor: pointer; diff --git a/app/assets/stylesheets/highlight/dark.scss b/app/assets/stylesheets/highlight/dark.scss index f0ac9b46f91..604f806dc58 100644 --- a/app/assets/stylesheets/highlight/dark.scss +++ b/app/assets/stylesheets/highlight/dark.scss @@ -111,7 +111,9 @@ $dark-il: #de935f; // Diff line .line_holder { - &.match .line_content { + &.match .line_content, + &.old-nonewline .line_content, + &.new-nonewline .line_content { @include dark-diff-match-line; } diff --git a/app/assets/stylesheets/highlight/monokai.scss b/app/assets/stylesheets/highlight/monokai.scss index eba7919ada9..8e2720511da 100644 --- a/app/assets/stylesheets/highlight/monokai.scss +++ b/app/assets/stylesheets/highlight/monokai.scss @@ -111,7 +111,9 @@ $monokai-gi: #a6e22e; // Diff line .line_holder { - &.match .line_content { + &.match .line_content, + &.old-nonewline .line_content, + &.new-nonewline .line_content { @include dark-diff-match-line; } diff --git a/app/assets/stylesheets/highlight/solarized_dark.scss b/app/assets/stylesheets/highlight/solarized_dark.scss index ba53ef0352b..cd1f0f6650f 100644 --- a/app/assets/stylesheets/highlight/solarized_dark.scss +++ b/app/assets/stylesheets/highlight/solarized_dark.scss @@ -115,7 +115,9 @@ $solarized-dark-il: #2aa198; // Diff line .line_holder { - &.match .line_content { + &.match .line_content, + &.old-nonewline .line_content, + &.new-nonewline .line_content { @include dark-diff-match-line; } diff --git a/app/assets/stylesheets/highlight/solarized_light.scss b/app/assets/stylesheets/highlight/solarized_light.scss index e9fccf1b58a..09c3ea36414 100644 --- a/app/assets/stylesheets/highlight/solarized_light.scss +++ b/app/assets/stylesheets/highlight/solarized_light.scss @@ -122,7 +122,9 @@ $solarized-light-il: #2aa198; // Diff line .line_holder { - &.match .line_content { + &.match .line_content, + &.old-nonewline .line_content, + &.new-nonewline .line_content { @include matchLine; } diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index fbc97ec0c95..65add153606 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -24,6 +24,10 @@ color: $gl-text-color; border-radius: 0 0 3px 3px; + .code { + padding: 0; + } + .unfold { cursor: pointer; } @@ -77,6 +81,12 @@ span { white-space: pre-wrap; + + &.context-cell { + display: inline-block; + width: 100%; + height: 100%; + } } .line { @@ -677,21 +687,21 @@ } @include media-breakpoint-up(sm) { - position: -webkit-sticky; - position: sticky; top: 24px; background-color: $white-light; - z-index: 190; &.diff-files-changed-merge-request { - top: 76px; + position: sticky; + top: 90px; + z-index: 190; + margin: $gl-padding 0; + padding: 0; } &.is-stuck { padding-top: 0; padding-bottom: 0; border-bottom: 1px solid $white-dark; - transform: translateY(16px); .diff-stats-additions-deletions-expanded, .inline-parallel-buttons { diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 596d3aa171c..d96ba2107d1 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -600,14 +600,12 @@ position: relative; background: $gray-light; color: $gl-text-color; - z-index: 199; .mr-version-menus-container { - display: -webkit-flex; display: flex; - -webkit-align-items: center; align-items: center; padding: 16px; + z-index: 199; } .content-block { diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index 3849a04db5d..5e5696b1602 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -247,22 +247,6 @@ } .discussion-with-resolve-btn { - display: table; - width: 100%; - border-collapse: separate; - table-layout: auto; - - .btn-group { - display: table-cell; - float: none; - width: 1%; - - &:first-child { - width: 100%; - padding-right: 5px; - } - } - .discussion-actions { display: table; diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 299eda53140..dcc42117861 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -3,9 +3,17 @@ */ @-webkit-keyframes targe3-note { - from { background: $note-targe3-outside; } - 50% { background: $note-targe3-inside; } - to { background: $note-targe3-outside; } + from { + background: $note-targe3-outside; + } + + 50% { + background: $note-targe3-inside; + } + + to { + background: $note-targe3-outside; + } } ul.notes { @@ -33,10 +41,12 @@ ul.notes { .diff-content { overflow: visible; + padding: 0; } } - > li { // .timeline-entry + > li { + // .timeline-entry padding: 0; display: block; position: relative; @@ -153,7 +163,6 @@ ul.notes { } .note-header { - @include notes-media('max', map-get($grid-breakpoints, xs)) { .inline { display: block; @@ -245,7 +254,6 @@ ul.notes { .system-note-commit-list-toggler { color: $gl-link-color; - display: none; padding: 10px 0 0; cursor: pointer; position: relative; @@ -665,7 +673,6 @@ ul.notes { background-color: $white-light; } - a { color: $gl-link-color; } @@ -771,3 +778,44 @@ ul.notes { height: auto; } } + +// Vue refactored diff discussion adjustments +.files { + .diff-discussions { + .note-discussion.timeline-entry { + padding-left: 0; + + &:last-child { + border-bottom: 0; + } + + > .timeline-entry-inner { + padding: 0; + + > .timeline-content { + margin-left: 0; + } + + > .timeline-icon { + display: none; + } + } + + .discussion-body { + padding-top: 0; + + .discussion-wrapper { + border-color: transparent; + } + } + } + } + + .diff-comment-form { + display: block; + } + + .add-diff-note svg { + margin-top: 4px; + } +} -- cgit v1.2.1