diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-18 14:02:45 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-18 14:02:45 +0000 |
commit | 80f61b4035607d7cd87de993b8f5e996bde3481f (patch) | |
tree | 06b12f51e97d87192e3dd0e05edf55143645b894 /app/assets/stylesheets | |
parent | 4ab54c2233e91f60a80e5b6fa2181e6899fdcc3e (diff) | |
download | gitlab-ce-80f61b4035607d7cd87de993b8f5e996bde3481f.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/bootstrap_migration.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/flash.scss | 6 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/highlight.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/mailers/highlighted_diff_email.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/boards.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/commits.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/cycle_analytics.scss | 10 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 4 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 2 |
10 files changed, 18 insertions, 16 deletions
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index 29473da21cc..c9b00e5ff27 100644 --- a/app/assets/stylesheets/bootstrap_migration.scss +++ b/app/assets/stylesheets/bootstrap_migration.scss @@ -342,7 +342,7 @@ input[type=color].form-control { /* Bootstrap 4.1.2 introduced a new default vertical alignment which breaks our icons, so we need to reset the vertical alignment to the default value. See: - - https://gitlab.com/gitlab-org/gitlab-ce/issues/51362 + - https://gitlab.com/gitlab-org/gitlab-foss/issues/51362 */ svg { vertical-align: baseline; diff --git a/app/assets/stylesheets/framework/flash.scss b/app/assets/stylesheets/framework/flash.scss index af05d069f97..7e7b08797b2 100644 --- a/app/assets/stylesheets/framework/flash.scss +++ b/app/assets/stylesheets/framework/flash.scss @@ -131,16 +131,16 @@ $notification-box-shadow-color: rgba(0, 0, 0, 0.25); } } -.with-system-header .flash-container { +.with-system-header .flash-container.sticky { top: $flash-container-top + $system-header-height; } .with-performance-bar { - .flash-container { + .flash-container.sticky { top: $flash-container-top + $performance-bar-height; } - &.with-system-header .flash-container { + &.with-system-header .flash-container.sticky { top: $flash-container-top + $performance-bar-height + $system-header-height; } } diff --git a/app/assets/stylesheets/framework/highlight.scss b/app/assets/stylesheets/framework/highlight.scss index 983bd032da4..58516cbd1a9 100644 --- a/app/assets/stylesheets/framework/highlight.scss +++ b/app/assets/stylesheets/framework/highlight.scss @@ -71,7 +71,7 @@ } // Vertically aligns <table> line numbers (eg. blame view) -// see https://gitlab.com/gitlab-org/gitlab-ce/issues/54048 +// see https://gitlab.com/gitlab-org/gitlab-foss/issues/54048 td.line-numbers { line-height: 1; } diff --git a/app/assets/stylesheets/mailers/highlighted_diff_email.scss b/app/assets/stylesheets/mailers/highlighted_diff_email.scss index 33c114838c2..58c83ac7915 100644 --- a/app/assets/stylesheets/mailers/highlighted_diff_email.scss +++ b/app/assets/stylesheets/mailers/highlighted_diff_email.scss @@ -4,7 +4,7 @@ // avoid all descendant selectors (`table td`). This is because the CSS inlining // we use performs dramatically worse on descendant selectors than the // alternatives. -// <https://gitlab.com/gitlab-org/gitlab-ee/issues/490#note_12283632> +// <https://gitlab.com/gitlab-org/gitlab/issues/490#note_12283632> // // DO NOT ADD ANY DESCENDANT SELECTORS TO THIS FILE. Instead, use (in order of // preference): plain class selectors, type (element name) selectors, or diff --git a/app/assets/stylesheets/pages/boards.scss b/app/assets/stylesheets/pages/boards.scss index 4bf0abccd00..d540a347dde 100644 --- a/app/assets/stylesheets/pages/boards.scss +++ b/app/assets/stylesheets/pages/boards.scss @@ -73,7 +73,7 @@ .board { // the next line cannot be replaced with .d-inline-block because it breaks display: none of SortableJS - // see https://gitlab.com/gitlab-org/gitlab-ce/issues/64828 + // see https://gitlab.com/gitlab-org/gitlab-foss/issues/64828 display: inline-block; width: calc(85vw - 15px); diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss index 0b0a4e50146..be0311f584f 100644 --- a/app/assets/stylesheets/pages/commits.scss +++ b/app/assets/stylesheets/pages/commits.scss @@ -81,7 +81,7 @@ position: relative; font-family: $monospace-font; $left: 12px; - overflow: hidden; // See https://gitlab.com/gitlab-org/gitlab-ce/issues/13987 + overflow: hidden; // See https://gitlab.com/gitlab-org/gitlab-foss/issues/13987 .max-width-marker { width: 72ch; color: $commit-max-width-marker-color; diff --git a/app/assets/stylesheets/pages/cycle_analytics.scss b/app/assets/stylesheets/pages/cycle_analytics.scss index e20711a193d..76cd4f34865 100644 --- a/app/assets/stylesheets/pages/cycle_analytics.scss +++ b/app/assets/stylesheets/pages/cycle_analytics.scss @@ -1,5 +1,5 @@ -#cycle-analytics { - max-width: 1000px; +#cycle-analytics, +.cycle-analytics { margin: 24px auto 0; position: relative; @@ -41,7 +41,8 @@ width: 20%; } - .fa { + .fa, + svg { color: $cycle-analytics-light-gray; &:hover { @@ -233,7 +234,7 @@ &.issue-title, &.commit-title, - &.merge-merquest-title { + &.merge-request-title { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -266,6 +267,7 @@ color: $gl-text-color; } + .mr-link, .issue-link, .commit-author-link, .issue-author-link { diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 0e844b0e4a5..5617ab0af41 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -571,7 +571,7 @@ /* * Overwrite hover style for dropdown items, so that they are not blue - * This should be removed during dev of https://gitlab.com/gitlab-org/gitlab-ce/issues/44040 + * This should be removed during dev of https://gitlab.com/gitlab-org/gitlab-foss/issues/44040 */ li a { &:hover, diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 6c03dbb56a7..d67a0f83aa2 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -492,7 +492,7 @@ $note-form-margin-left: 72px; vertical-align: top; white-space: normal; - // Fixes subpixel rounding issue https://gitlab.com/gitlab-org/gitlab-ce/issues/53973 + // Fixes subpixel rounding issue https://gitlab.com/gitlab-org/gitlab-foss/issues/53973 // background-color is needed for dark code preference padding-bottom: 1px; background-color: $white-light; @@ -980,7 +980,7 @@ $note-form-margin-left: 72px; } //This needs to be deleted when Snippet/Commit comments are convered to Vue -// See https://gitlab.com/gitlab-org/gitlab-ce/issues/53918#note_117038785 +// See https://gitlab.com/gitlab-org/gitlab-foss/issues/53918#note_117038785 .unstyled-comments { .discussion-header { padding: $gl-padding; diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index cda6c9ce0cc..1b2af932733 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -453,7 +453,7 @@ display: flex; width: 100%; background-color: $gray-light; - padding: $gl-padding; + padding: $gl-padding 0; overflow: auto; } |