Skip to content

bootstrap 4 uses card instead of panel #2399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
* defined in the other CSS/SCSS files in this directory. It is generally better to create a new
* file per style scope.
*
*= require bulkrax/application
*= require fontselect
*= require codemirror
*= require codemirror/themes/neat
Expand All @@ -22,6 +21,7 @@
*= require blacklight_advanced_search
*= require blacklight_range_limit
*= require cropper.min
*= require bulkrax/application
*= require_self
*= require hyku_knapsack/application
*/
8 changes: 4 additions & 4 deletions app/assets/stylesheets/hyku.scss
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ footer.navbar {
padding-left: 1em;
}

.panel-heading {
.card-heading {
line-height: 2.4em;
}

Expand Down Expand Up @@ -334,8 +334,8 @@ footer.navbar {
padding: 0;
}

#users > .panel {
.panel-body {
#users > .card {
.card-body {
padding-left: 0;
}

Expand Down Expand Up @@ -544,7 +544,7 @@ span.constraint-value p, .facet-values p {
}

// make the facet counts appear at the end of the facet panel
.facet-content .panel-body .facet-values p {
.facet-content .card-body .facet-values p {
display: flex;
justify-content: space-between;
}
Expand Down
10 changes: 5 additions & 5 deletions app/assets/stylesheets/themes/cultural_repository.scss
Original file line number Diff line number Diff line change
Expand Up @@ -241,19 +241,19 @@

// Note: copied over to override /* line 226, /usr/local/bundle/gems/bootstrap-sass-3.4.1/assets/stylesheets/bootstrap/_panels.scss
.panel-group {
.panel {
.card {
border-radius: 0 !important;
margin-bottom: 0 !important;
}

.panel + .panel {
.card + .card {
margin-top: 0 !important;
}
}

// Note: copied over to override /* line 238, /usr/local/bundle/gems/bootstrap-sass-3.4.1/assets/stylesheets/bootstrap/_panels.scss */
.panel-group .panel-heading + .panel-collapse > .panel-body,
.panel-group .panel-heading + .panel-collapse > .list-group {
.panel-group .card-heading + .panel-collapse > .card-body,
.panel-group .card-heading + .panel-collapse > .list-group {
border-top: 0 !important;
}

Expand Down Expand Up @@ -311,7 +311,7 @@

@media (max-width: 768px) {
// Note: copied over to override /* line 163, /usr/local/bundle/gems/blacklight-6.23.0/app/assets/stylesheets/blacklight/_facets.scss */
#facets .top-panel-heading {
#facets .top-card-heading {
border: 1px solid #999999 !important;
}
}
Expand Down
4 changes: 2 additions & 2 deletions app/views/admin/roles_service/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<%= t('hyrax.admin.roles_service_jobs.header') %></h1>
<% end %>

<div class='panel panel-default'>
<div class='panel-body'>
<div class='card card-default'>
<div class='card-body'>
<div class='table-responsive'>
<table class='table table-striped datatable'>
<tbody>
Expand Down
8 changes: 4 additions & 4 deletions app/views/hyrax/content_blocks/_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,9 @@
</div>
</div>
<div id="homepage_about_section_heading" class="tab-pane">
<div class="panel panel-default labels">
<div class="card card-default labels">
<%= simple_form_for ContentBlock.for(:homepage_about_section_heading), url: hyrax.content_block_path(ContentBlock.for(:homepage_about_section_heading)), html: {class: 'nav-safety'} do |f| %>
<div class="panel-body">
<div class="card-body">
<div class="field form-group">
<%= f.label :homepage_about_section_heading %><br />
<%# the following line was changed from hyrax to give some context for what this context block does %>
Expand All @@ -169,9 +169,9 @@
</div>
</div>
<div id="homepage_about_section_content" class="tab-pane">
<div class="panel panel-default labels">
<div class="card card-default labels">
<%= simple_form_for ContentBlock.for(:homepage_about_section_content), url: hyrax.content_block_path(ContentBlock.for(:homepage_about_section_content)), html: {class: 'nav-safety'} do |f| %>
<div class="panel-body">
<div class="card-body">
<div class="field form-group">
<%= f.label :homepage_about_section_content %><br />
<%# the following line was changed from hyrax to give some context for what this context block does %>
Expand Down
6 changes: 3 additions & 3 deletions app/views/hyrax/oers/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
</div>
<div class="col-xs-12">&nbsp;</div>
<div itemscope itemtype="http://schema.org/CreativeWork" class="col-xs-12">
<div class="panel panel-default">
<div class="panel-heading">
<div class="card card-default">
<div class="card-heading">
<%= render 'work_title', presenter: @presenter %>
<%= render 'show_actions', presenter: @presenter %>
</div>
<div class="panel-body">
<div class="card-body">
<div class="row">
<%= render 'workflow_actions_widget', presenter: @presenter %>
<% if @presenter.video_embed_viewer? %>
Expand Down
4 changes: 2 additions & 2 deletions app/views/roles/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
<div class="panel-body">
<div class="card card-default">
<div class="card-body">
<table class="table table-striped datatable">
<thead>
<tr>
Expand Down
2 changes: 1 addition & 1 deletion app/views/themes/cultural_repository/_facets.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<% # main container for facets/limits menu -%>
<% if has_facet_values? %>
<div id="facets" class="cultural-repository facets sidenav">
<div class="top-panel-heading">
<div class="top-card-heading">
<button type="button" class="facets-toggle navbar-toggler" data-toggle="collapse" data-target="#facet-panel-collapse" aria-expanded="false" aria-controls="facet-panel-collapse">
<span class="sr-only">Toggle facets</span>
<span class="navbar-toggler-icon"></span>
Expand Down
6 changes: 3 additions & 3 deletions app/views/themes/image_show/hyrax/base/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
<%= render 'work_type', presenter: @presenter %>
</div>
<div itemscope itemtype="http://schema.org/CreativeWork" class="col-xs-12">
<div class="panel panel-default">
<div class="panel-heading">
<div class="card card-default">
<div class="card-heading">
<%= render 'work_title', presenter: @presenter %>
</div>
<div class="panel-body">
<div class="card-body">
<div class="row">
<%= render 'workflow_actions_widget', presenter: @presenter %>
<% if @presenter.iiif_viewer? %>
Expand Down
6 changes: 3 additions & 3 deletions app/views/themes/scholarly_show/hyrax/oers/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
<%= render 'work_type', presenter: @presenter %>
</div>
<div itemscope itemtype="http://schema.org/CreativeWork" class="col-xs-12">
<div class="panel panel-default">
<div class="panel-heading">
<div class="card card-default">
<div class="card-heading">
<%= render 'work_title', presenter: @presenter %>
</div>
<div class="panel-body">
<div class="card-body">
<div class="row">
<%= render 'workflow_actions_widget', presenter: @presenter %>
<% if @presenter.iiif_viewer? %>
Expand Down
Loading