Commit 0a43421a authored by Clement Ho's avatar Clement Ho

Merge branch '46877-bootstrap-4-lists' into 'master'

Resolve ""well-list" is removed from Bootstrap 4"

Closes #46877

See merge request gitlab-org/gitlab-ce!19207
parents 74a1cda0 a94a53b1
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* Well styled list * Well styled list
* *
*/ */
.card-body-list { .hover-list {
position: relative; position: relative;
margin: 0; margin: 0;
padding: 0; padding: 0;
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
.card .card
.card-header .card-header
Group info: Group info:
%ul.well-list %ul.content-list
%li %li
.avatar-container.s60 .avatar-container.s60
= group_icon(@group, class: "avatar s60") = group_icon(@group, class: "avatar s60")
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
Projects Projects
%span.badge.badge-pill %span.badge.badge-pill
#{@group.projects.count} #{@group.projects.count}
%ul.well-list %ul.content-list
- @projects.each do |project| - @projects.each do |project|
%li %li
%strong %strong
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
Projects shared with #{@group.name} Projects shared with #{@group.name}
%span.badge.badge-pill %span.badge.badge-pill
#{@group.shared_projects.count} #{@group.shared_projects.count}
%ul.well-list %ul.content-list
- @group.shared_projects.sort_by(&:name).each do |project| - @group.shared_projects.sort_by(&:name).each do |project|
%li %li
%strong %strong
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
%span.badge.badge-pill= @group.members.size %span.badge.badge-pill= @group.members.size
.float-right .float-right
= link_to icon('pencil-square-o', text: 'Manage access'), polymorphic_url([@group, :members]), class: "btn btn-sm" = link_to icon('pencil-square-o', text: 'Manage access'), polymorphic_url([@group, :members]), class: "btn btn-sm"
%ul.well-list.group-users-list.content-list.members-list %ul.content-list.group-users-list.content-list.members-list
= render partial: 'shared/members/member', collection: @members, as: :member, locals: { show_controls: false } = render partial: 'shared/members/member', collection: @members, as: :member, locals: { show_controls: false }
.card-footer .card-footer
= paginate @members, param_name: 'members_page', theme: 'gitlab' = paginate @members, param_name: 'members_page', theme: 'gitlab'
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
.card .card
.card-header .card-header
Project info: Project info:
%ul.well-list %ul.content-list
%li %li
%span.light Name: %span.light Name:
%strong %strong
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
.float-right .float-right
= link_to admin_group_path(@group), class: 'btn btn-sm' do = link_to admin_group_path(@group), class: 'btn btn-sm' do
= icon('pencil-square-o', text: 'Manage access') = icon('pencil-square-o', text: 'Manage access')
%ul.well-list.content-list.members-list %ul.content-list.members-list
= render partial: 'shared/members/member', collection: @group_members, as: :member, locals: { show_controls: false } = render partial: 'shared/members/member', collection: @group_members, as: :member, locals: { show_controls: false }
.card-footer .card-footer
= paginate @group_members, param_name: 'group_members_page', theme: 'gitlab' = paginate @group_members, param_name: 'group_members_page', theme: 'gitlab'
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
%span.badge.badge-pill= @project.users.size %span.badge.badge-pill= @project.users.size
.float-right .float-right
= link_to icon('pencil-square-o', text: 'Manage access'), polymorphic_url([@project, :members]), class: "btn btn-sm" = link_to icon('pencil-square-o', text: 'Manage access'), polymorphic_url([@project, :members]), class: "btn btn-sm"
%ul.well-list.project_members.content-list.members-list %ul.content-list.project_members.members-list
= render partial: 'shared/members/member', collection: @project_members, as: :member, locals: { show_controls: false } = render partial: 'shared/members/member', collection: @project_members, as: :member, locals: { show_controls: false }
.card-footer .card-footer
= paginate @project_members, param_name: 'project_members_page', theme: 'gitlab' = paginate @project_members, param_name: 'project_members_page', theme: 'gitlab'
.card .card
.card-header .card-header
Profile Profile
%ul.well-list %ul.content-list
%li %li
%span.light Member since %span.light Member since
%strong= user.created_at.to_s(:medium) %strong= user.created_at.to_s(:medium)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
- if @user.groups.any? - if @user.groups.any?
.card .card
.card-header Group projects .card-header Group projects
%ul.card-body-list %ul.hover-list
- @user.group_members.includes(:source).each do |group_member| - @user.group_members.includes(:source).each do |group_member|
- group = group_member.group - group = group_member.group
%li.group_member %li.group_member
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
.col-md-6 .col-md-6
.card .card
.card-header Joined projects (#{@joined_projects.count}) .card-header Joined projects (#{@joined_projects.count})
%ul.card-body-list %ul.hover-list
- @joined_projects.sort_by(&:full_name).each do |project| - @joined_projects.sort_by(&:full_name).each do |project|
- member = project.team.find_member(@user.id) - member = project.team.find_member(@user.id)
%li.project_member %li.project_member
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
.card .card
.card-header .card-header
= @user.name = @user.name
%ul.well-list %ul.content-list
%li %li
= image_tag avatar_icon_for_user(@user, 60), class: "avatar s60" = image_tag avatar_icon_for_user(@user, 60), class: "avatar s60"
%li %li
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
.card .card
.card-header .card-header
Account: Account:
%ul.well-list %ul.content-list
%li %li
%span.light Name: %span.light Name:
%strong= @user.name %strong= @user.name
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
- if event.push_with_commits? - if event.push_with_commits?
.event-body .event-body
%ul.well-list.event_commits %ul.content-list.event_commits
= render "events/commit", project: project, event: event = render "events/commit", project: project, event: event
- create_mr = event.new_ref? && create_mr_button?(project.default_branch, event.ref_name, project) && event.authored_by?(current_user) - create_mr = event.new_ref? && create_mr_button?(project.default_branch, event.ref_name, project) && event.authored_by?(current_user)
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
.controls .controls
= link_to new_project_path(namespace_id: @group.id), class: "btn btn-sm btn-success" do = link_to new_project_path(namespace_id: @group.id), class: "btn btn-sm btn-success" do
New project New project
%ul.well-list %ul.content-list
- @projects.each do |project| - @projects.each do |project|
%li %li
.list-item-name .list-item-name
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
.card .card
.card-header .card-header
Quick help Quick help
%ul.well-list %ul.content-list
%li= link_to 'See our website for getting help', support_url %li= link_to 'See our website for getting help', support_url
%li %li
%button.btn-blank.btn-link.js-trigger-search-bar{ type: 'button' } %button.btn-blank.btn-link.js-trigger-search-bar{ type: 'button' }
......
...@@ -116,9 +116,9 @@ ...@@ -116,9 +116,9 @@
.lead .lead
List with hover effect List with hover effect
%code .well-list %code .hover-list
.example .example
%ul.well-list %ul.hover-list
%li %li
One item One item
%li %li
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
.example .example
.card .card
.card-header Your list .card-header Your list
%ul.well-list %ul.content-list
%li %li
One item One item
%li %li
......
%h5.prepend-top-0 %h5.prepend-top-0
History of authentications History of authentications
%ul.well-list %ul.content-list
- events.each do |event| - events.each do |event|
%li %li
%span.description %span.description
......
- is_admin = local_assigns.fetch(:admin, false) - is_admin = local_assigns.fetch(:admin, false)
- if @gpg_keys.any? - if @gpg_keys.any?
%ul.well-list %ul.content-list
= render partial: 'profiles/gpg_keys/key', collection: @gpg_keys, locals: { is_admin: is_admin } = render partial: 'profiles/gpg_keys/key', collection: @gpg_keys, locals: { is_admin: is_admin }
- else - else
%p.settings-message.text-center %p.settings-message.text-center
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
.card .card
.card-header .card-header
SSH Key SSH Key
%ul.well-list %ul.content-list
%li %li
%span.light Title: %span.light Title:
%strong= @key.title %strong= @key.title
......
- is_admin = local_assigns.fetch(:admin, false) - is_admin = local_assigns.fetch(:admin, false)
- if @keys.any? - if @keys.any?
%ul.well-list %ul.content-list
= render partial: 'profiles/keys/key', collection: @keys, locals: { is_admin: is_admin } = render partial: 'profiles/keys/key', collection: @keys, locals: { is_admin: is_admin }
- else - else
%p.settings-message.text-center %p.settings-message.text-center
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
%h5.prepend-top-default %h5.prepend-top-default
Webhooks (#{@hooks.count}) Webhooks (#{@hooks.count})
- if @hooks.any? - if @hooks.any?
%ul.well-list %ul.content-list
- @hooks.each do |hook| - @hooks.each do |hook|
= render 'project_hook', hook: hook = render 'project_hook', hook: hook
- else - else
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
.card .card
.card-header .card-header
Domains (#{@domains.count}) Domains (#{@domains.count})
%ul.well-list.pages-domain-list{ class: ("has-verification-status" if verification_enabled) } %ul.content-list.pages-domain-list{ class: ("has-verification-status" if verification_enabled) }
- @domains.each do |domain| - @domains.each do |domain|
%li.pages-domain-list-item.unstyled %li.pages-domain-list-item.unstyled
- if verification_enabled - if verification_enabled
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
= number_with_delimiter(issuables.length) = number_with_delimiter(issuables.length)
- class_prefix = dom_class(issuables).pluralize - class_prefix = dom_class(issuables).pluralize
%ul{ class: "well-list milestone-#{class_prefix}-list", id: "#{class_prefix}-list-#{id}" } %ul{ class: "content-list milestone-#{class_prefix}-list", id: "#{class_prefix}-list-#{id}" }
= render partial: 'shared/milestones/issuable', = render partial: 'shared/milestones/issuable',
collection: issuables, collection: issuables,
as: :issuable, as: :issuable,
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
.card-header .card-header
%strong %strong
= t('sherlock.application_backtrace') = t('sherlock.application_backtrace')
%ul.well-list %ul.content-list
- @query.application_backtrace.each do |location| - @query.application_backtrace.each do |location|
%li %li
%strong %strong
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
.card-header .card-header
%strong %strong
= t('sherlock.full_backtrace') = t('sherlock.full_backtrace')
%ul.well-list %ul.content-list
- @query.backtrace.each do |location| - @query.backtrace.each do |location|
%li %li
- if location.application? - if location.application?
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
.card-header .card-header
%strong %strong
= t('sherlock.general') = t('sherlock.general')
%ul.well-list %ul.content-list
%li %li
%span.light %span.light
#{t('sherlock.time')}: #{t('sherlock.time')}:
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
= @query.formatted_query = @query.formatted_query
%strong %strong
= t('sherlock.query') = t('sherlock.query')
%ul.well-list %ul.content-list
%li %li
.code.js-syntax-highlight.sherlock-code .code.js-syntax-highlight.sherlock-code
:preserve :preserve
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
= @query.explain = @query.explain
%strong %strong
= t('sherlock.query_plan') = t('sherlock.query_plan')
%ul.well-list %ul.content-list
%li %li
.code.js-syntax-highlight.sherlock-code .code.js-syntax-highlight.sherlock-code
%pre %pre
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
.card-header .card-header
%strong %strong
= t('sherlock.general') = t('sherlock.general')
%ul.well-list %ul.content-list
%li %li
%span.light %span.light
#{t('sherlock.id')}: #{t('sherlock.id')}:
......
...@@ -193,7 +193,7 @@ List with avatar, title and description using .content-list ...@@ -193,7 +193,7 @@ List with avatar, title and description using .content-list
![List with avatar](img/components-listwithavatar.png) ![List with avatar](img/components-listwithavatar.png)
List with hover effect .well-list List with hover effect .content-list
![List with hover effect](img/components-listwithhover.png) ![List with hover effect](img/components-listwithhover.png)
......
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