diff options
| author | Phil Hughes <me@iamphill.com> | 2017-05-30 07:36:10 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-05-30 07:36:10 +0000 |
| commit | 77ba9a547bb9fb000a2381d945a3e1b74706cec9 (patch) | |
| tree | 4e3eb6db6a514f5e064236cd19bf7457877918fc | |
| parent | 9dfecec53d907a8beb6c2f119d6688aa92c959fd (diff) | |
| parent | 9e95257e81dee81aba9c6117bd47eae285993967 (diff) | |
| download | gitlab-ce-77ba9a547bb9fb000a2381d945a3e1b74706cec9.tar.gz | |
Merge branch '32954-loading-icon' into 'master'
Displays loading icon in async buttons inline
Closes #32954
See merge request !11735
| -rw-r--r-- | app/assets/stylesheets/pages/environments.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/environments.scss b/app/assets/stylesheets/pages/environments.scss index 48d3b7b1d07..f269d53093d 100644 --- a/app/assets/stylesheets/pages/environments.scss +++ b/app/assets/stylesheets/pages/environments.scss @@ -64,6 +64,10 @@ } } + .btn .text-center { + display: inline; + } + .commit-title { margin: 0; } diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index 292584eba28..cf2e565dd2d 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -88,6 +88,10 @@ } } + .btn .text-center { + display: inline; + } + .tooltip { white-space: nowrap; } |