summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-04-19 19:33:32 +0100
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-04-19 19:33:32 +0100
commitb6ac775f039b086b5b4de3a763d9ea1a8981cc2c (patch)
tree71ea410adb642c6835782e238163e219a55db023
parent56df25eec910a52d17ddd84b35dbdac1c6756c48 (diff)
downloadgitlab-ce-29977-style-comments-and-system-notes-real-time-updates.tar.gz
move duration variable to variables.scss29977-style-comments-and-system-notes-real-time-updates
-rw-r--r--app/assets/stylesheets/framework/animations.scss2
-rw-r--r--app/assets/stylesheets/framework/variables.scss5
2 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/animations.scss b/app/assets/stylesheets/framework/animations.scss
index 6019e88f894..7c50b80fd2b 100644
--- a/app/assets/stylesheets/framework/animations.scss
+++ b/app/assets/stylesheets/framework/animations.scss
@@ -146,8 +146,6 @@ a {
transition: none;
}
-$fade-in-duration: 200ms;
-
@keyframes fadeIn {
0% {
opacity: 0;
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 712eb7caf33..c1c9b3fb37a 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -454,6 +454,11 @@ $label-remove-border: rgba(0, 0, 0, .1);
$label-border-radius: 100px;
/*
+* Animation
+*/
+$fade-in-duration: 200ms;
+
+/*
* Lint
*/
$lint-incorrect-color: $red-500;