diff options
Diffstat (limited to 'app/assets/stylesheets/pages')
-rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/issues.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/labels.scss | 12 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/login.scss | 4 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 18 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/profile.scss | 25 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/settings.scss | 12 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/sherlock.scss | 31 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/users.scss | 4 |
10 files changed, 31 insertions, 81 deletions
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 8600a4059d8..cdef843c9b4 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -514,7 +514,7 @@ } .with-performance-bar .right-sidebar { - top: $header-height + $performance-bar-height; + top: calc(#{$header-height} + #{$performance-bar-height}); } .sidebar-move-issue-confirmation-button { diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss index 880231f5644..d77c8a40a79 100644 --- a/app/assets/stylesheets/pages/issues.scss +++ b/app/assets/stylesheets/pages/issues.scss @@ -256,7 +256,7 @@ ul.related-merge-requests > li gl-emoji { } .with-performance-bar .issue-sticky-header { - top: $header-height + $performance-bar-height; + top: calc(#{$header-height} + #{$performance-bar-height}); } @include media-breakpoint-up(md) { diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss index c7b4dd660d0..82216b8d5c5 100644 --- a/app/assets/stylesheets/pages/labels.scss +++ b/app/assets/stylesheets/pages/labels.scss @@ -68,13 +68,6 @@ color: $white; } -.dropdown-labels-error { - padding: 5px 10px; - margin-bottom: 10px; - background-color: $red-500; - color: $white; -} - .manage-labels-list { padding: 0; margin-bottom: 0; @@ -114,9 +107,8 @@ display: none; } -.label-subscribe-button { - width: 105px; - font-weight: 200; +.label-subscription { + width: 109px; } .labels-container { diff --git a/app/assets/stylesheets/pages/login.scss b/app/assets/stylesheets/pages/login.scss index 71ddbf175e9..fffea301a4f 100644 --- a/app/assets/stylesheets/pages/login.scss +++ b/app/assets/stylesheets/pages/login.scss @@ -10,6 +10,8 @@ .flash-container { margin-bottom: $gl-padding; + position: relative; + top: 8px; } .brand-holder { @@ -203,7 +205,7 @@ &.with-system-header { .login-page-broadcast { - margin-top: $system-header-height + $header-height; + margin-top: calc(#{$system-header-height} + #{$header-height}); } } diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index a4b8e912614..10026e290e8 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -689,14 +689,14 @@ $tabs-holder-z-index: 250; @include media-breakpoint-up(md) { position: -webkit-sticky; position: sticky; - top: $header-height + $mr-tabs-height; + top: calc(#{$header-height} + #{$mr-tabs-height}); .with-system-header & { - top: $header-height + $mr-tabs-height + $system-header-height; + top: calc(#{$header-height} + #{$mr-tabs-height} + #{$system-header-height}); } .with-system-header.with-performance-bar & { - top: $header-height + $mr-tabs-height + $system-header-height + $performance-bar-height; + top: calc(#{$header-height} + #{$mr-tabs-height} + #{$system-header-height} + #{$performance-bar-height}); } .mr-version-menus-container { @@ -704,7 +704,7 @@ $tabs-holder-z-index: 250; } .with-performance-bar & { - top: $header-height + $performance-bar-height + $mr-tabs-height; + top: calc(#{$header-height} + #{$performance-bar-height} + #{$mr-tabs-height}); } } } @@ -717,11 +717,11 @@ $tabs-holder-z-index: 250; border-bottom: 1px solid $border-color; .with-system-header & { - top: $header-height + $system-header-height; + top: calc(#{$header-height} + #{$system-header-height}); } .with-system-header.with-performance-bar & { - top: $header-height + $system-header-height + $performance-bar-height; + top: calc(#{$header-height} + #{$system-header-height} + #{$performance-bar-height}); } @include media-breakpoint-up(sm) { @@ -752,7 +752,7 @@ $tabs-holder-z-index: 250; .with-performance-bar { .merge-request-tabs-holder, .epic-tabs-holder { - top: $header-height + $performance-bar-height; + top: calc(#{$header-height} + #{$performance-bar-height}); } } @@ -957,10 +957,10 @@ $tabs-holder-z-index: 250; .mr-compare { .diff-file .file-title-flex-parent { - top: $header-height + $mr-tabs-height + 36px; + top: calc(#{$header-height} + #{$mr-tabs-height} + 36px); .with-performance-bar & { - top: $performance-bar-height + $header-height + $mr-tabs-height + 36px; + top: calc(#{$performance-bar-height} + #{$header-height} + #{$mr-tabs-height} + 36px); } } } diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 04da75b586f..d8c3851748d 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -368,7 +368,7 @@ $system-note-svg-size: 16px; border-radius: 0; @media (min-width: map-get($grid-breakpoints, md)) { - top: $mr-tabs-height + $header-height; + top: calc(#{$mr-tabs-height} + #{$header-height}); .with-performance-bar & { top: 123px; diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss index a7ed7172f5f..f76a8030e5b 100644 --- a/app/assets/stylesheets/pages/profile.scss +++ b/app/assets/stylesheets/pages/profile.scss @@ -363,23 +363,22 @@ table.u2f-registrations { color: $gl-text-color-secondary; } -.gitlab-slack-gif { - width: 100%; - max-width: $add-to-slack-gif-max-width; +.gitlab-slack-body { + max-width: 420px; } -.gitlab-slack-well { - background-color: $white; - box-shadow: none; - max-width: $add-to-slack-well-max-width; +.gitlab-slack-slack-logo { + transform: scale(200%); // Slack logo SVG is scaled down 50% and has empty space around it } -.gitlab-slack-logo { - width: $add-to-slack-logo-size; - height: $add-to-slack-logo-size; +.skype-icon { + color: $skype; } -.gitlab-slack-popup { - width: 100%; - max-width: $add-to-slack-popup-max-width; +.linkedin-icon { + color: $linkedin; +} + +.twitter-icon { + color: $twitter; } diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss index 37e272cfff7..633051918a4 100644 --- a/app/assets/stylesheets/pages/settings.scss +++ b/app/assets/stylesheets/pages/settings.scss @@ -293,10 +293,8 @@ } } -.modal-doorkeepr-auth { - .modal-body { - padding: $gl-padding; - } +.doorkeeper-authorize { + max-width: px-to-rem(500px); } .created-deploy-token-container { @@ -316,12 +314,6 @@ } } -.mirror-error-badge { - background-color: $red-400; - border-radius: $border-radius-default; - color: $white; -} - .push-pull-table { margin-top: 1em; } diff --git a/app/assets/stylesheets/pages/sherlock.scss b/app/assets/stylesheets/pages/sherlock.scss deleted file mode 100644 index 55b0b5295af..00000000000 --- a/app/assets/stylesheets/pages/sherlock.scss +++ /dev/null @@ -1,31 +0,0 @@ -table .sherlock-code { - max-width: 700px; -} - -.sherlock-code { - pre { - word-wrap: normal; - - code { - white-space: pre; - } - } -} - -.sherlock-line-samples-table { - thead th, - tbody td { - font-size: 13px !important; - text-align: right; - padding: 0 10px !important; - } - - .slow { - color: $red-500; - font-weight: $gl-font-weight-bold; - } -} - -.sherlock-file-sample pre { - padding-top: 28px !important; -} diff --git a/app/assets/stylesheets/pages/users.scss b/app/assets/stylesheets/pages/users.scss index 917d16a9c53..3dcc17df61a 100644 --- a/app/assets/stylesheets/pages/users.scss +++ b/app/assets/stylesheets/pages/users.scss @@ -1,7 +1,3 @@ -.user-sort-dropdown { - margin-left: $gl-padding-8; -} - .user-search-form { position: relative; |