Commit f7d68dfc authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch '25925-fix-tag-sorting-and-filtering-options' into 'master'

Set default sort for tags to Last updated and fix nav controls spacing

Closes #25925

See merge request !8263
parents b0765d24 bff6ca63
...@@ -199,6 +199,7 @@ ul.content-list { ...@@ -199,6 +199,7 @@ ul.content-list {
display: -webkit-flex; display: -webkit-flex;
display: -ms-flexbox; display: -ms-flexbox;
display: flex; display: flex;
align-items: center;
white-space: nowrap; white-space: nowrap;
} }
......
...@@ -116,8 +116,8 @@ ...@@ -116,8 +116,8 @@
padding-top: 16px; padding-top: 16px;
padding-bottom: 11px; padding-bottom: 11px;
display: inline-block; display: inline-block;
width: 50%;
line-height: 28px; line-height: 28px;
white-space: normal;
/* Small devices (phones, tablets, 768px and lower) */ /* Small devices (phones, tablets, 768px and lower) */
@media (max-width: $screen-xs-max) { @media (max-width: $screen-xs-max) {
...@@ -158,7 +158,6 @@ ...@@ -158,7 +158,6 @@
} }
.nav-controls { .nav-controls {
width: 50%;
display: inline-block; display: inline-block;
float: right; float: right;
text-align: right; text-align: right;
...@@ -167,7 +166,9 @@ ...@@ -167,7 +166,9 @@
> .btn, > .btn,
> .btn-container, > .btn-container,
> .dropdown { > .dropdown,
> input,
> form {
margin-right: $gl-padding-top; margin-right: $gl-padding-top;
display: inline-block; display: inline-block;
vertical-align: top; vertical-align: top;
...@@ -182,19 +183,21 @@ ...@@ -182,19 +183,21 @@
float: none; float: none;
} }
> form {
display: inline-block;
}
.icon-label { .icon-label {
display: none; display: none;
} }
input { .btn,
.dropdown,
.dropdown-toggle,
input,
form {
height: 35px; height: 35px;
}
input {
display: inline-block; display: inline-block;
position: relative; position: relative;
margin-right: $gl-padding-top;
/* Medium devices (desktops, 992px and up) */ /* Medium devices (desktops, 992px and up) */
@media (min-width: $screen-md-min) { width: 200px; } @media (min-width: $screen-md-min) { width: 200px; }
...@@ -218,6 +221,7 @@ ...@@ -218,6 +221,7 @@
.btn, .btn,
form, form,
.dropdown, .dropdown,
.dropdown-toggle,
.dropdown-menu-toggle, .dropdown-menu-toggle,
.form-control { .form-control {
margin: 0 0 10px; margin: 0 0 10px;
...@@ -272,6 +276,10 @@ ...@@ -272,6 +276,10 @@
padding: 17px 0; padding: 17px 0;
} }
} }
pre {
width: 100%;
}
} }
.layout-nav { .layout-nav {
...@@ -427,8 +435,12 @@ ...@@ -427,8 +435,12 @@
} }
@media (max-width: $screen-xs-max) { @media (max-width: $screen-xs-max) {
.top-area .nav-controls { .top-area {
flex-flow: row wrap;
.nav-controls {
$controls-margin: $btn-xs-side-margin - 2px; $controls-margin: $btn-xs-side-margin - 2px;
flex: 0 0 100%;
&.controls-flex { &.controls-flex {
display: flex; display: flex;
...@@ -439,6 +451,7 @@ ...@@ -439,6 +451,7 @@
} }
.controls-item, .controls-item,
.controls-item-full,
.controls-item:last-child { .controls-item:last-child {
flex: 1 1 35%; flex: 1 1 35%;
display: block; display: block;
...@@ -452,8 +465,8 @@ ...@@ -452,8 +465,8 @@
} }
.controls-item-full { .controls-item-full {
@extend .controls-item;
flex: 1 1 100%; flex: 1 1 100%;
} }
} }
}
} }
...@@ -8,7 +8,7 @@ class Projects::TagsController < Projects::ApplicationController ...@@ -8,7 +8,7 @@ class Projects::TagsController < Projects::ApplicationController
before_action :authorize_admin_project!, only: [:destroy] before_action :authorize_admin_project!, only: [:destroy]
def index def index
params[:sort] = params[:sort].presence || 'name' params[:sort] = params[:sort].presence || sort_value_recently_updated
@sort = params[:sort] @sort = params[:sort]
@tags = TagsFinder.new(@repository, params).execute @tags = TagsFinder.new(@repository, params).execute
......
...@@ -2,17 +2,17 @@ ...@@ -2,17 +2,17 @@
- page_title "Tags" - page_title "Tags"
= render "projects/commits/head" = render "projects/commits/head"
%div{ class: container_class } %div.flex-list{ class: container_class }
.top-area .top-area.flex-row
.nav-text .nav-text.row-main-content
Tags give the ability to mark specific points in history as being important Tags give the ability to mark specific points in history as being important
.nav-controls .nav-controls.row-fixed-content
= form_tag(filter_tags_path, method: :get) do = form_tag(filter_tags_path, method: :get) do
= search_field_tag :search, params[:search], { placeholder: 'Filter by tag name', id: 'tag-search', class: 'form-control search-text-input input-short', spellcheck: false } = search_field_tag :search, params[:search], { placeholder: 'Filter by tag name', id: 'tag-search', class: 'form-control search-text-input input-short', spellcheck: false }
.dropdown .dropdown
%button.dropdown-toggle.btn{ type: 'button', data: { toggle: 'dropdown'} } %button.dropdown-toggle{ type: 'button', data: { toggle: 'dropdown'} }
%span.light %span.light
= projects_sort_options_hash[@sort] = projects_sort_options_hash[@sort]
= icon('chevron-down') = icon('chevron-down')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment