diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-05 15:10:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-05 15:10:36 +0300 |
commit | 797182cd82922765fe79a13bc0ed6bd5672d4283 (patch) | |
tree | 82d0ea1a8378560de4aeb5c1e446b74282035d60 /app/assets/stylesheets | |
parent | a060caf3db3090d75284a71a08ab1cf697afad97 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/page_bundles/jira_connect.scss | 14 | ||||
-rw-r--r-- | app/assets/stylesheets/page_bundles/wiki.scss | 5 |
2 files changed, 11 insertions, 8 deletions
diff --git a/app/assets/stylesheets/page_bundles/jira_connect.scss b/app/assets/stylesheets/page_bundles/jira_connect.scss index c3e49da92a6..ff989b474ad 100644 --- a/app/assets/stylesheets/page_bundles/jira_connect.scss +++ b/app/assets/stylesheets/page_bundles/jira_connect.scss @@ -2,6 +2,11 @@ // We should only import styles that we actually use. // @import '@gitlab/ui/src/scss/gitlab_ui'; +@import '@gitlab/ui/src/scss/bootstrap'; +@import 'bootstrap-vue/src/index'; + +@import '@gitlab/ui/src/scss/utilities'; + $atlaskit-border-color: #dfe1e6; .ac-content { @@ -40,14 +45,16 @@ $header-height: 40px; } .jira-connect-user { - float: right; - position: relative; - top: -30px; + font-size: $gl-font-size; + position: fixed; + top: 10px; + right: 20px; } .jira-connect-app { margin-top: $header-height; max-width: 600px; + min-height: 95vh; padding-top: 48px; padding-left: 16px; padding-right: 16px; @@ -108,5 +115,6 @@ svg { } .browser-limitations-notice { + font-size: $gl-font-size; margin-top: 32px; } diff --git a/app/assets/stylesheets/page_bundles/wiki.scss b/app/assets/stylesheets/page_bundles/wiki.scss index eb34e7f3876..9f0fa137910 100644 --- a/app/assets/stylesheets/page_bundles/wiki.scss +++ b/app/assets/stylesheets/page_bundles/wiki.scss @@ -15,11 +15,6 @@ padding: 11px 0; } - .wiki-page-title { - margin: 0; - font-size: 22px; - } - .wiki-last-edit-by { display: block; color: var(--gray-500, $gray-500); |