diff options
| author | winh <winnie@gitlab.com> | 2017-08-25 13:43:06 +0200 |
|---|---|---|
| committer | winh <winnie@gitlab.com> | 2017-08-25 13:43:06 +0200 |
| commit | 50bdb1f57b495beb10ca969e38cbc6b5860ae839 (patch) | |
| tree | 057e965a9bee063d3cc8ce4fcbbb36677ccb9e02 | |
| parent | 24244d03b55bc7732b3362bab1e1cc7e04c2dabf (diff) | |
| download | gitlab-ce-winh-dropdowns-line-height.tar.gz | |
Use Bootstrap default line height for new dropdownswinh-dropdowns-line-height
| -rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index a45d5a6dca0..25b87c877ea 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -750,6 +750,7 @@ a, button { border-radius: 0; + line-height: $line-height-base; padding: 8px 16px; // make sure the text color is not overriden diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index a408bde37d6..0d3dbcd372b 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -725,7 +725,6 @@ button.mini-pipeline-graph-dropdown-toggle { padding: 3px 7px 4px; clear: both; font-weight: $gl-font-weight-normal; - line-height: 1.428571429; white-space: nowrap; margin: 0 5px; border-radius: 3px; |