summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannes Rosenögger <123haynes@gmail.com>2015-01-17 16:39:29 +0100
committerHannes Rosenögger <123haynes@gmail.com>2015-01-17 16:39:29 +0100
commitb0ec61500e4de9dafd9dfb0177d92349c789de8e (patch)
treecfa209765a0976541b255c5c55a37c6c3edbdf6a
parentada6c6080b2fa0d63003f8b29b5c32195254906d (diff)
downloadgitlab-ce-b0ec61500e4de9dafd9dfb0177d92349c789de8e.tar.gz
Fixes the sort dropdown goind outside of the screen
see gitlab-org/gitlab-ce#986
-rw-r--r--app/assets/stylesheets/generic/common.scss5
-rw-r--r--app/views/shared/_sort_dropdown.html.haml2
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss
index cd6352db85f..1a7e96f1d0c 100644
--- a/app/assets/stylesheets/generic/common.scss
+++ b/app/assets/stylesheets/generic/common.scss
@@ -54,6 +54,11 @@ pre {
text-shadow: none;
}
+.dropdown-menu-align-right {
+ left: auto;
+ right: 0px;
+}
+
.dropdown-menu > li > a:hover,
.dropdown-menu > li > a:focus {
background: $bg_primary;
diff --git a/app/views/shared/_sort_dropdown.html.haml b/app/views/shared/_sort_dropdown.html.haml
index 93ed9b67336..3e6a62380f3 100644
--- a/app/views/shared/_sort_dropdown.html.haml
+++ b/app/views/shared/_sort_dropdown.html.haml
@@ -6,7 +6,7 @@
- else
Newest
%b.caret
- %ul.dropdown-menu
+ %ul.dropdown-menu.dropdown-menu-align-right
%li
= link_to page_filter_path(sort: 'newest') do
= sort_title_recently_created