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:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2018-05-10 20:44:55 +0300
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2018-05-10 20:44:55 +0300
commite42f7e2a5a733d7c3682bd7d15e509e1943003bc (patch)
treea6e0b2c43d3769a822ee145821d06ec7f445843a
parent34a10fef168048b6148a29b8693606a1b83d83e6 (diff)
[skip ci] Use default button styles for .btn-secondary
-rw-r--r--app/assets/stylesheets/bootstrap_migration.scss5
-rw-r--r--app/assets/stylesheets/framework/buttons.scss5
2 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss
index 55e35549cc5..db6dd82807d 100644
--- a/app/assets/stylesheets/bootstrap_migration.scss
+++ b/app/assets/stylesheets/bootstrap_migration.scss
@@ -133,8 +133,3 @@ table {
@extend .border-0;
}
}
-
-.btn-secondary {
- // btn-default has been renamed btn-secondary; need to change all instances of btn-default
- @include btn-default;
-}
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index 0115f542c88..c55260c7b06 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -253,6 +253,11 @@
}
}
+.btn-secondary {
+ // btn-default has been renamed btn-secondary; need to change all instances of btn-default
+ @include btn-default;
+}
+
.btn-terminal {
svg {
height: 14px;