summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-18 18:47:06 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-18 18:47:06 +0000
commit0c26f871e30f84221c41fc034c412c68773bce15 (patch)
tree9205736a38a3005933287d057689890f046c8f9b
parent15b3d467c1dea3a774915ad671427e3503ce2e00 (diff)
parentb0ec61500e4de9dafd9dfb0177d92349c789de8e (diff)
downloadgitlab-ce-0c26f871e30f84221c41fc034c412c68773bce15.tar.gz
Merge branch 'fix_sort_dropdown_style' into 'master'
Fix sort dropdown partially not showing on screen. This MR fixes the sort dropdown menu partially not showing on the screen. Closes gitlab-org/gitlab-ce#986 Screenshot of the Problem: ![Problem](https://gitlab.com/uploads/gitlab-org/gitlab-ce/8d442e872c/Screenshot_from_2015-01-17_15_18_41.png) @dzaporozhets Can you take a look at this? See merge request !299
-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