Skip to content

Improve sortable table header styles; improve active filter styles; f… #26

Merged
merged 1 commit into from
Oct 22, 2021
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
3 changes: 2 additions & 1 deletion app/templates/element/search.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@
// We have active filters - not just a sort.
$hasActiveFilters = true;
?>
<button class="top-search-active-filter deletebutton spin" type="button" aria-controls="<?php print $aria_controls; ?>" title="<?= __('match.op.clear.filters',[1]);?>">
<button class="top-search-active-filter deletebutton spin btn btn-default btn-sm" type="button" aria-controls="<?php print $aria_controls; ?>" title="<?= __('match.op.clear.filters',[1]);?>">
<em class="material-icons">cancel</em>
<span class="top-search-active-filter-title">
<?= $vv_searchable_attributes[$key]['label']; ?>
</span>
Expand Down
50 changes: 23 additions & 27 deletions app/webroot/css/co-base.css
Original file line number Diff line number Diff line change
Expand Up @@ -511,17 +511,15 @@ body.logged-in #top-menu {
padding: 0;
border: 1px solid var(--cmg-color-lightgray-005);
}
.top-search legend .material-icons {
vertical-align: middle;
}
.top-search legend button.cm-toggle {
#content .top-search legend button.cm-toggle {
position: absolute;
right: 0.5em;
border: none;
background-color: transparent;
}
#content .top-search legend .material-icons {
font-size: 20px;
font-size: 1.4em;
vertical-align: top;
}
#content .top-search legend button.cm-toggle .material-icons {
font-size: 34px;
Expand Down Expand Up @@ -601,7 +599,7 @@ body.logged-in #top-menu {
width: auto;
height: auto;
line-height: unset;
margin: 0;
margin: -6px 0 0;
padding: 0 1em;
}
.top-search .filter-clear-all-button:hover {
Expand All @@ -612,13 +610,20 @@ body.logged-in #top-menu {
display: none;
}
#top-search-active-filters {
margin-left: 1em;
margin-left: 0.25em;
padding: 0.5em 0;
}
.top-search-active-filter {
margin: 0 0.25em 0 0;
.top-search-active-filter.btn.btn-sm {
padding: 0.2em 0.4em;
white-space: nowrap;
font-style: italic;
box-shadow: none;
text-transform: none;
font-size: 0.8em;
border: 1px solid var(--cmg-color-lightgray-007);
}
.top-search-active-filter.btn.btn-sm:hover {
background-color: var(--cmg-color-lightgray-006);
color: black !important;
}
.top-search-active-filter-title::after {
content: ": ";
Expand Down Expand Up @@ -1066,20 +1071,20 @@ p { /* MDL override */
.warn-level-b td {
background-color: var(--cmg-color-yellow-001);
}
.asc, .desc {
font-style: italic;
text-decoration: none;
.asc,
.desc {
color: black;
}
a.asc::before, a.desc::before {
a.asc::after,
a.desc::after {
position: relative;
left: -2px;
right: -2px;
font-style: normal;
}
a.asc::before {
a.asc::after {
content: "▲"; /*\25b2 in escaped hex*/
top: -2px;
}
a.desc::before {
a.desc::after {
content: "▼"; /*\25bc in escaped hex*/
}
.co-grid {
Expand Down Expand Up @@ -1123,20 +1128,11 @@ table {
th, td {
padding: 0.75em;
text-align: left;
font-weight: normal;
}
th {
background-color: var(--cmg-color-lightgray-005);
color: var(--cmg-color-black);
}
th a {
color: var(--cmg-color-black);
text-decoration: underline;
}
th a:hover {
color: var(--cmg-color-gray-002) !important;
text-decoration: none !important;
}
td {
border-bottom: 1px solid var(--cmg-color-lightgray-005);
}
Expand Down
2 changes: 1 addition & 1 deletion app/webroot/css/co-color.css
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
--cmg-color-lightgray-007: #ccc; /* border color */
--cmg-color-lightgray-008: #bbb; /* icon color */
--cmg-color-lightgray-009: #ededed; /* data-list background color */
--cmg-color-lightgray-011: #e8e8e8; /* co-grid background color */
--cmg-color-lightgray-010: #e8e8e8; /* co-grid background color */

--cmg-color-green-001: #2a2; /* banner */
--cmg-color-green-002: #0b6623; /* infobox icon color */
Expand Down