diff options
| author | winh <winnie@gitlab.com> | 2017-05-23 09:25:28 +0200 |
|---|---|---|
| committer | winh <winnie@gitlab.com> | 2017-06-15 15:22:14 +0200 |
| commit | b2419cdb4208c144b37afea9d68107821f17bb43 (patch) | |
| tree | 0b6fab524ba448ce03d21348d3b125aca533579c | |
| parent | a1695253215534539ea17794a8696212c5454b82 (diff) | |
| download | gitlab-ce-winh-wrap-search-bar.tar.gz | |
Make issuable search bar wrapwinh-wrap-search-bar
| -rw-r--r-- | app/assets/stylesheets/framework/filters.scss | 16 | ||||
| -rw-r--r-- | app/views/shared/issuable/_search_bar.html.haml | 16 |
2 files changed, 20 insertions, 12 deletions
diff --git a/app/assets/stylesheets/framework/filters.scss b/app/assets/stylesheets/framework/filters.scss index cfbaaaa04c7..3f7c7d1c9f8 100644 --- a/app/assets/stylesheets/framework/filters.scss +++ b/app/assets/stylesheets/framework/filters.scss @@ -238,7 +238,7 @@ border: none; position: static; right: 0; - height: 100%; + height: 34px; outline: none; z-index: 1; @@ -258,6 +258,11 @@ // - Without `width: 100%`: `e.target` = `.filtered-search`, https://i.imgur.com/cNI2CyT.png width: 100%; min-width: 0; + + .tokens-container { + flex-wrap: wrap; + width: 100%; + } } .filtered-search-input-dropdown-menu { @@ -276,8 +281,6 @@ .filtered-search-history-dropdown-wrapper { position: static; - display: flex; - flex-direction: column; } .filtered-search-history-dropdown-toggle-button { @@ -285,9 +288,11 @@ width: auto; border-radius: 0; border: 0; - border-right: 1px solid $border-color; + border: 1px solid $border-color; + border-right-color: white; color: $gl-text-color-secondary; transition: color 0.1s linear; + height: 36px; &:hover, &:focus { @@ -320,6 +325,8 @@ .filtered-search-history-dropdown { width: 40%; + left: auto; + top: auto; @media (max-width: $screen-xs-min) { left: 0; @@ -362,6 +369,7 @@ .filter-dropdown-container { display: -webkit-flex; display: flex; + height: 36px; .dropdown-toggle { line-height: 22px; diff --git a/app/views/shared/issuable/_search_bar.html.haml b/app/views/shared/issuable/_search_bar.html.haml index d3d290692a2..6f50a00ea17 100644 --- a/app/views/shared/issuable/_search_bar.html.haml +++ b/app/views/shared/issuable/_search_bar.html.haml @@ -10,15 +10,15 @@ .check-all-holder.hidden = check_box_tag "check-all-issues", nil, false, class: "check-all-issues left" .issues-other-filters.filtered-search-wrapper + - if type != :boards_modal && type != :boards + = dropdown_tag(custom_icon('icon_history'), + options: { wrapper_class: "filtered-search-history-dropdown-wrapper", + toggle_class: "filtered-search-history-dropdown-toggle-button", + dropdown_class: "filtered-search-history-dropdown", + content_class: "filtered-search-history-dropdown-content", + title: "Recent searches" }) do + .js-filtered-search-history-dropdown{ data: { project_full_path: @project.full_path } } .filtered-search-box - - if type != :boards_modal && type != :boards - = dropdown_tag(custom_icon('icon_history'), - options: { wrapper_class: "filtered-search-history-dropdown-wrapper", - toggle_class: "filtered-search-history-dropdown-toggle-button", - dropdown_class: "filtered-search-history-dropdown", - content_class: "filtered-search-history-dropdown-content", - title: "Recent searches" }) do - .js-filtered-search-history-dropdown{ data: { project_full_path: @project.full_path } } .filtered-search-box-input-container .scroll-container %ul.tokens-container.list-unstyled |