diff options
Diffstat (limited to 'app/assets/stylesheets/pages')
-rw-r--r-- | app/assets/stylesheets/pages/clusters.scss | 26 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/commits.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 10 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 13 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/profile.scss | 10 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/search.scss | 45 |
6 files changed, 57 insertions, 48 deletions
diff --git a/app/assets/stylesheets/pages/clusters.scss b/app/assets/stylesheets/pages/clusters.scss index b450bca4f41..5a091c14e53 100644 --- a/app/assets/stylesheets/pages/clusters.scss +++ b/app/assets/stylesheets/pages/clusters.scss @@ -7,20 +7,6 @@ } } - .agents-empty-state { - .text-content { - @include gl-max-w-full; - @include media-breakpoint-up(lg) { - max-width: 70%; - } - } - - .gl-alert-actions { - @include gl-mt-0; - @include gl-flex-wrap; - } - } - .gl-card-body { @include media-breakpoint-up(sm) { @include gl-pt-2; @@ -40,3 +26,15 @@ } } } + +.agent-activity-list { + .system-note .timeline-entry-inner { + .timeline-icon { + @include gl-mt-1; + } + } + + &.issuable-discussion .main-notes-list::before { + @include gl-top-3; + } +} diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss index 7f35b8fab43..cc8ea1493fc 100644 --- a/app/assets/stylesheets/pages/commits.scss +++ b/app/assets/stylesheets/pages/commits.scss @@ -149,7 +149,6 @@ .commit-content { padding-right: 10px; white-space: normal; - overflow: hidden; .commit-title { display: flex; diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index cf5e93e94a2..8600a4059d8 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -456,12 +456,6 @@ } .multiple-users { - position: relative; - height: 24px; - margin-bottom: 17px; - margin-top: 4px; - padding-bottom: 4px; - .btn-link { padding: 0; border: 0; @@ -875,10 +869,6 @@ } } -.issuable-suggestions svg { - vertical-align: sub; -} - .suggestion-footer { font-size: 12px; line-height: 15px; diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 3b86750c6ca..a4b8e912614 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -947,19 +947,6 @@ $tabs-holder-z-index: 250; color: $gray-500; line-height: initial; } - - // GlDropdown mini pipeline (Vue) - // As the `mini-pipeline-item` mixin specificity is lower - // than the toggle of dropdown with 'variant="link"' we add - // classes ".gl-button.btn-link" to make it more specific - // and avoid having the size overriden - // - // See https://gitlab.com/gitlab-org/gitlab/-/issues/320737 - button.gl-button.btn-link.mini-pipeline-graph-dropdown-toggle, - .stage-cell button.gl-button.btn-link.mini-pipeline-graph-dropdown-toggle svg { - height: $ci-action-icon-size-lg; - width: $ci-action-icon-size-lg; - } } .merge-request-details .file-finder-overlay.diff-file-finder { diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss index af9f10c9a26..a7ed7172f5f 100644 --- a/app/assets/stylesheets/pages/profile.scss +++ b/app/assets/stylesheets/pages/profile.scss @@ -329,16 +329,6 @@ table.u2f-registrations { } } -.email-badge { - display: inline; - margin-right: $gl-padding / 2; - - .email-badge-email { - display: inline; - margin-right: $gl-padding / 4; - } -} - .edit-user { svg { fill: $gl-text-color-secondary; diff --git a/app/assets/stylesheets/pages/search.scss b/app/assets/stylesheets/pages/search.scss index 2e6c6a021f8..4c31cc6e111 100644 --- a/app/assets/stylesheets/pages/search.scss +++ b/app/assets/stylesheets/pages/search.scss @@ -321,6 +321,51 @@ input[type='checkbox']:hover { } } +// This overrides parts of the Project File View CSS +// We leverage most of the styling but broke off +// from how we were doing it in `shared/file_highlight` +#search-blob-content { + .line_holder { + pre { + padding: 0; // This overrides the existing style that will add space between each line. + } + + svg { + float: none; // We have more than one icon on this implementation and don't want to float them. + margin: 0; // We will manage the margin with GitLab UI utility classes + } + + .line-numbers { + padding: 0; // This overrides the existing style that will add space between each line. + min-width: 6.5rem; // Ensure our numbers fit + + .diff-line-num { + a { + transition: none; // There will be a hover transition from theme, blue, darkened + } + } + } + + &:hover { + svg { + visibility: visible; // We want to show the icons when the any part of the line is hovered + } + } + + // The icons only appear on hover + // So on mobile we can hide them and retake the space for the code blob + @include media-breakpoint-down(sm) { + svg { + display: none; + } + + .line-numbers { + min-width: 4rem; + } + } + } +} + // Disable webkit input icons, link to solution: https://stackoverflow.com/questions/9421551/how-do-i-remove-all-default-webkit-search-field-styling /* stylelint-disable property-no-vendor-prefix */ input[type='search']::-webkit-search-decoration, |