Skip to content
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

Use recently introduced overflow utility instead of overwriting card defaults #6948

Merged
merged 1 commit into from Oct 31, 2018
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

@@ -24,19 +24,18 @@
transform: rotate(45deg);
}

// utility class from: https://github.com/twbs/bootstrap/pull/27268
.overflow-auto {

This comment has been minimized.

Copy link
@martenson

martenson Oct 31, 2018

Member

do we have to redefine the class given it was implemented in the PR mentioned above? https://github.com/twbs/bootstrap/pull/27268/files#diff-afd6c72eb64ef2c8a2d963958d6991d1R4

This comment has been minimized.

Copy link
@martenson

martenson Oct 31, 2018

Member

ah, it is unreleased yet, so I assume the plan is to remove it when they release

This comment has been minimized.

Copy link
@guerler

guerler Oct 31, 2018

Author Contributor

Its not in our version yet. It will be available with the next BS4 revision.

overflow: auto !important;
}

// default margins
$ui-margin-vertical: $margin-v * 0.25;
$ui-margin-vertical-large: $margin-v * 0.5;
$ui-margin-horizontal: $margin-h;
$ui-margin-horizontal-small: $margin-h * 0.5;
$ui-margin-horizontal-large: $margin-v * 2;

.card {
.card-body {
overflow: auto;
}
}

.ui-modal {
display: none;
overflow: auto;
@@ -38,7 +38,7 @@
%if tool_shed_repositories:
<div class="card">
<div class="card-header">Monitor installing tool shed repositories</div>
<div class="card-body">
<div class="card-body overflow-auto">
<table class="grid">
<tr>
<td>Name</td>
@@ -149,23 +149,23 @@
<input type="submit" name="viewkey" value="Switch to unused dependencies view"/>
<div class="card mt-2 mb-2">
<div class="card-header">Tool-centric dependencies</div>
<div class="card-body">
<div class="card-body overflow-auto">
<table class="manage-table colored" border="0" cellspacing="0" cellpadding="0" width="100%">
${render_tool_centric_table(tools, requirements_status)}
%elif viewkey == "Switch to unused dependencies view":
<input type="submit" name="viewkey" value="Switch to details view"/>
<input type="submit" name="viewkey" value="Switch to tool-centric view"/>
<div class="card">
<div class="card mt-2 mb-2">
<div class="card-header">Unused dependency environments</div>
<div class="card-body">
<div class="card-body overflow-auto">
<table class="manage-table colored" border="0" cellspacing="0" cellpadding="0" width="100%">
${render_unused_dependencies(unused_environments)}
%else:
<input type="submit" name="viewkey" value="Switch to tool-centric view"/>
<input type="submit" name="viewkey" value="Switch to unused dependencies view"/>
<div class="card mt-2 mb-2">
<div class="card-header">Dependency details</div>
<div class="card-body">
<div class="card-body overflow-auto">
<table class="manage-table colored" border="0" cellspacing="0" cellpadding="0" width="100%">
${render_dependencies_details(tools, requirements_status, tool_ids_by_requirements)}
%endif
@@ -25,7 +25,7 @@
<form name="sanitize_whitelist" method="post" action="${h.url_for( controller='admin', action='sanitize_whitelist' )}">
<div class="card mb-3">
<div class="card-header">Tool Sanitization Whitelist</div>
<div class="card-body">
<div class="card-body overflow-auto">
<table class="manage-table colored" border="0" cellspacing="0" cellpadding="0" width="100%">
<tr>
<th>Whitelist</th>
@@ -9,7 +9,7 @@
<div class="card-header">There are currently ${len( display_applications )} <a class="icon-btn" href="${ h.url_for( controller='admin', action='reload_display_application' ) }" title="Reload all display applications" data-placement="bottom">
<span class="fa fa-refresh"></span>
</a> display applications loaded.</div>
<div class="card-body">
<div class="card-body overflow-auto">
<table class="manage-table colored">
<tr>
<th>Reload</th>
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.