summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/utilities.scss
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-04 03:08:37 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-04 03:08:37 +0000
commit7ec2694360b4d4bd9a4b00ef5166a77c854d9d4f (patch)
tree6f3c9a688625b5c4dc1bae11be1fc8a4af388b23 /app/assets/stylesheets/utilities.scss
parent27a18afc7dba4e09a5ec78e5c251c31216d7792a (diff)
downloadgitlab-ce-7ec2694360b4d4bd9a4b00ef5166a77c854d9d4f.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets/utilities.scss')
-rw-r--r--app/assets/stylesheets/utilities.scss2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/stylesheets/utilities.scss b/app/assets/stylesheets/utilities.scss
index 9e99c92d3f2..f3e6927767c 100644
--- a/app/assets/stylesheets/utilities.scss
+++ b/app/assets/stylesheets/utilities.scss
@@ -40,6 +40,8 @@
.mh-50vh { max-height: 50vh; }
+.font-size-inherit { font-size: inherit; }
+
.gl-w-64 { width: px-to-rem($grid-size * 8); }
.gl-h-32 { height: px-to-rem($grid-size * 4); }
.gl-h-64 { height: px-to-rem($grid-size * 8); }