Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-08-08 13:26:09 +0300
committerFatih Acet <acetfatih@gmail.com>2016-08-12 23:24:49 +0300
commit41f7cee99149f98f82afbe54587a4d2853f1ddc6 (patch)
treea53c82efba4fcdb0cbaf0fbd3461282e83c330de /app/assets/stylesheets/pages/merge_conflicts.scss
parentb79378cae8067d6c967770c0a3129e7a9999cc2f (diff)
Show loading button while Ajax request is in progress.
Diffstat (limited to 'app/assets/stylesheets/pages/merge_conflicts.scss')
-rw-r--r--app/assets/stylesheets/pages/merge_conflicts.scss4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/merge_conflicts.scss b/app/assets/stylesheets/pages/merge_conflicts.scss
index 965348b3b88..ab5a2570827 100644
--- a/app/assets/stylesheets/pages/merge_conflicts.scss
+++ b/app/assets/stylesheets/pages/merge_conflicts.scss
@@ -137,4 +137,8 @@ $unselected_line: #f8f8f8;
outline: none;
}
}
+
+ .btn-success .fa-spinner {
+ color: #FFF;
+ }
}