summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
authorJacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>2016-03-19 11:39:34 -0400
committerJacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>2016-03-25 09:48:12 -0400
commit6f48cb860957676273d1e7bfc1195195599ab0f1 (patch)
treee50d42d20c6da2d983acd9634a0a4129a398ee21 /app/assets/stylesheets
parent531331f79d63a736efd1d40d7ad40b5a277327fd (diff)
downloadgitlab-ce-6f48cb860957676273d1e7bfc1195195599ab0f1.tar.gz
Fix broken functionality in sidebar after merge.
Added nice animations too.
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/application.scss1
-rw-r--r--app/assets/stylesheets/pages/issuable.scss2
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index e2d590f4df4..69b3b6586de 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -10,6 +10,7 @@
*= require dropzone/basic
*= require cal-heatmap
*= require cropper.css
+ *= require animate
*/
/*
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index 459c1840ec1..467df4c3653 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -255,7 +255,7 @@
.dropdown-menu-toggle {
width: 100%;
- padding-top: 0;
+ padding-top: 6px;
}
.open .dropdown-menu {