diff options
| author | Clement Ho <408677-ClemMakesApps@users.noreply.gitlab.com> | 2019-07-24 16:33:02 +0000 |
|---|---|---|
| committer | Clement Ho <408677-ClemMakesApps@users.noreply.gitlab.com> | 2019-07-24 16:33:02 +0000 |
| commit | 25698fda236d3ab2c5327d3acd1f9fde6f2b5e04 (patch) | |
| tree | 73cfb73d011585bf39b1970c335b6772c2fa7941 | |
| parent | 5c69b781b8516b5652abb065034eb0ae059aec95 (diff) | |
| parent | a7fa9bc248bda1044113e33f9ff0eca8938af0b2 (diff) | |
| download | gitlab-ce-64970-cannot-click-open-a-dropdown-merge-button-in-merge-requests.tar.gz | |
Merge branch 'rverissimo-master-patch-43755' into 'master'64970-cannot-click-open-a-dropdown-merge-button-in-merge-requests
Update tooltip values to meet design specs
Closes gitlab-ui#264
See merge request gitlab-org/gitlab-ce!30981
| -rw-r--r-- | app/assets/stylesheets/framework/tooltips.scss | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables_overrides.scss | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/tooltips.scss b/app/assets/stylesheets/framework/tooltips.scss index 98f28987a82..edc2fb532c8 100644 --- a/app/assets/stylesheets/framework/tooltips.scss +++ b/app/assets/stylesheets/framework/tooltips.scss @@ -1,7 +1,6 @@ .tooltip-inner { - font-size: $tooltip-font-size; + font-size: $gl-font-size-small; border-radius: $border-radius-default; - line-height: 16px; + line-height: $gl-line-height; font-weight: $gl-font-weight-normal; - padding: 8px; } diff --git a/app/assets/stylesheets/framework/variables_overrides.scss b/app/assets/stylesheets/framework/variables_overrides.scss index ea96381a098..604b48e11ab 100644 --- a/app/assets/stylesheets/framework/variables_overrides.scss +++ b/app/assets/stylesheets/framework/variables_overrides.scss @@ -48,3 +48,7 @@ $spacers: ( 9: ($spacer * 8) ); $pagination-color: $gl-text-color; +$tooltip-padding-y: 0.5rem; +$tooltip-padding-x: 0.75rem; +$tooltip-arrow-height: 0.5rem; +$tooltip-arrow-width: 1rem; |