diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-22 21:06:19 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-22 21:06:19 +0000 |
| commit | 69a23cbee136eda0ab37874399421e6865cfc76b (patch) | |
| tree | a6c94293a789bb2bdcbd6d8caf7a79dbac2ebee0 /app/assets/stylesheets/framework | |
| parent | ea4762d464bb36f3e36e318db47086e41f493377 (diff) | |
| download | gitlab-ce-69a23cbee136eda0ab37874399421e6865cfc76b.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets/framework')
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/selects.scss | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 1195e467192..5ae4f72de56 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -552,6 +552,11 @@ svg { vertical-align: text-top; } + + a.trial-link gl-emoji { + font-size: $gl-font-size; + vertical-align: baseline; + } } } diff --git a/app/assets/stylesheets/framework/selects.scss b/app/assets/stylesheets/framework/selects.scss index 2289f0a7011..bd0134a82d3 100644 --- a/app/assets/stylesheets/framework/selects.scss +++ b/app/assets/stylesheets/framework/selects.scss @@ -118,7 +118,7 @@ background: none; .select2-search-field input { - padding: 5px $gl-padding / 2; + padding: 5px $gl-input-padding; height: auto; font-family: inherit; font-size: inherit; |