diff options
| author | Camil Staps <info@camilstaps.nl> | 2019-01-26 22:07:18 +0100 |
|---|---|---|
| committer | Camil Staps <info@camilstaps.nl> | 2019-08-07 20:49:13 +0200 |
| commit | 71fd79c810257c2d2a183f989d83a77960f59006 (patch) | |
| tree | 3b5ba994256d9f59014df397ed61ee30d850a56b | |
| parent | 1171517a68fb465494e8a96cc5b4e6f9deb27404 (diff) | |
| download | gitlab-ce-71fd79c810257c2d2a183f989d83a77960f59006.tar.gz | |
4-column table layout for starrers view
| -rw-r--r-- | app/assets/stylesheets/pages/users.scss | 5 | ||||
| -rw-r--r-- | app/views/projects/starrers/index.html.haml | 4 | ||||
| -rw-r--r-- | app/views/shared/users/_usercell.html.haml | 12 |
3 files changed, 19 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/users.scss b/app/assets/stylesheets/pages/users.scss index 8bb8729f037..d3acf9a1c48 100644 --- a/app/assets/stylesheets/pages/users.scss +++ b/app/assets/stylesheets/pages/users.scss @@ -94,3 +94,8 @@ flex: 1; } } + +.card-body .user { + color: $gl-text-color; + font-weight: $gl-font-weight-bold; +} diff --git a/app/views/projects/starrers/index.html.haml b/app/views/projects/starrers/index.html.haml index 1b7dfcf7a29..729b0ca2eb0 100644 --- a/app/views/projects/starrers/index.html.haml +++ b/app/views/projects/starrers/index.html.haml @@ -21,5 +21,5 @@ %li = link_to filter_user_path(sort: value), class: ("is-active" if @sort == value) do = title -%ul.content-list.users-list.qa-users-list - = render partial: 'shared/users/user', collection: @starrers, as: :user +.row.prepend-top-10 + = render partial: 'shared/users/usercell', collection: @starrers, as: :user diff --git a/app/views/shared/users/_usercell.html.haml b/app/views/shared/users/_usercell.html.haml new file mode 100644 index 00000000000..93eaa282b23 --- /dev/null +++ b/app/views/shared/users/_usercell.html.haml @@ -0,0 +1,12 @@ +- user = local_assigns.fetch(:user) + +.col-lg-3.col-md-4.col-sm-12 + .card + .card-body + = image_tag avatar_icon_for_user(user, 40), class: "avatar s40", alt: '' + .block-truncated + = link_to user.name, user_path(user), class: 'user js-user-link', data: { user_id: user.id } + %span.cgray= user.to_reference + + - if user == current_user + %span.badge.badge-success.prepend-left-5= _("It's you") |