+
+
menu
= $this->element('searchGlobal') ?>
diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css
index 640734aa4..2e9a40519 100644
--- a/app/webroot/css/co-base.css
+++ b/app/webroot/css/co-base.css
@@ -137,35 +137,83 @@ a {
}
/* TOP BAR */
#top-bar {
- position: relative;
display: flex;
- padding: 0.5em 1em 0.3em 0.5em;
+ justify-content: space-between;
+ align-items: center;
+ padding: 0;
border-bottom: 1px solid var(--cmg-color-lightgray-006);
- min-height: 46px;
+ min-height: 47px;
}
-body.logged-out #top-bar {
+body.logged-out #top-bar,
+body.cos.select #top-bar {
justify-content: end;
}
+#top-bar .material-icons {
+ vertical-align: bottom;
+}
+#top-bar .top-menu-button {
+ padding: 0.5em 1em;
+ background-color: transparent;
+ border: none;
+}
+#top-bar .icon-adjust {
+ margin-right: -8px;
+}
+#top-controls {
+ display: flex;
+ flex: 1;
+}
+/* Mobile menu icon */
+#co-hamburger {
+ margin: 0;
+ padding: 0.5em 1em;
+ cursor: pointer;
+ -webkit-font-smoothing: antialiased;
+}
+
+/* GLOBAL SEARCH */
+#global-search {
+ width: 100%;
+ background-color: var(--cmg-color-lightgray-003);
+ border-radius: 0;
+ border: none;
+ border-top: 1px solid var(--cmg-color-lightgray-006);
+ border-bottom: 1px solid var(--cmg-color-lightgray-006);
+}
+#global-search form {
+ display: flex;
+ justify-content: space-between;
+ padding: 1em;
+}
+#global-search #global-search-q { /* search input */
+ padding-left: 0.5em;
+ width: 100%;
+ border-radius: 0;
+ border: 1px solid var(--cmg-color-lightgray-006);
+}
+#global-search-button {
+ background-color: var(--cmg-color-blue-002);
+ color: white;
+ border-radius: 0 3px 3px 0;
+}
+#top-bar #global-search-toggle {
+ display: flex;
+ align-items: center;
+ padding: 0.5em 0;
+}
/* TOP MENU */
#top-menu {
z-index: 100;
}
-body.logged-in #top-menu {
- position: absolute;
- right: 15px;
-}
#top-menu ul {
display: flex;
column-gap: 2em;
list-style: none;
+ margin: 0;
+ padding: 0;
font-size: 1em;
line-height: unset;
}
-#top-bar .top-menu-button {
- background-color: transparent;
- border: none;
- margin-top: 3px;
-}
#top-menu .top-menu-link-text {
display: none;
}
@@ -175,10 +223,6 @@ body.logged-in #top-menu {
#top-menu li a.dropdown-toggle:hover {
text-decoration: none;
}
-#top-menu .material-icons {
- vertical-align: bottom;
- font-size: 23px;
-}
#top-menu .dropdown-item {
padding: 0.5em 1em;
}
@@ -186,19 +230,13 @@ body.logged-in #top-menu {
margin-right: 0.25em;
vertical-align: middle;
}
-#top-menu .icon-adjust {
- margin-right: -8px;
-}
#user-panel {
- position: absolute;
- right: 0;
- top: 27px;
- z-index: 200;
color: var(--cmg-color-gray-001);
background-color: var(--cmg-color-lightgray-002);
border: 1px solid var(--cmg-color-lightgray-005);
- padding: 1em;
- min-width: calc(100vw - 50px);
+ padding: 0;
+ margin: 9px 0 0;
+ min-width: 100vw;
box-shadow: 0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);
font-size: 1em;
}
@@ -218,8 +256,7 @@ body.logged-in #top-menu {
}
#user-panel-user-info { /* mobile only styling */
border-top: 1px solid var(--cmg-color-lightgray-006);
- margin-top: 1em;
- padding-top: 1em;
+ padding: 1em;
}
#user-panel-user-info .material-icons {
float: left;
@@ -268,14 +305,11 @@ body.logged-in #top-menu {
#user-panel #panel-orgid {
margin-top: 0;
}
-#user-panel.with-co-switcher {
- padding-bottom: 0;
-}
#user-panel #user-panel-switch-co {
clear: both;
text-align: center;
border-top: 1px solid var(--cmg-color-lightgray-006);
- margin-top: 4em;
+ margin-top: 2.5em;
padding: 0;
}
#user-panel #co-switch-link {
@@ -296,43 +330,19 @@ body.logged-in #top-menu {
margin: 1em auto;
}
#logout-in-panel {
- margin: 4px 0 -8px;
text-align: right;
}
+#logout-in-panel-link {
+ padding: 1em;
+ margin: 0;
+ width: 100%;
+}
#login .material-icons,
#logout-in-panel .material-icons {
font-size: 1rem;
vertical-align: top;
margin-top: 0.25rem;
}
-
-/* GLOBAL SEARCH */
-#search-bar {
- display: none;
-}
-#search-bar.visible {
- display: block;
-}
-#global-search form {
- display: flex;
- align-items: end;
-}
-#global-search input {
- width: 300px;
- margin: 2px 0 2px 2px;
-}
-#global-search button {
- padding: 0 0.5em;
- margin: 0;
- background-color: transparent;
- color: white;
- border: none;
-}
-#global-search button .material-icons {
- position: relative;
- top: 2px;
- font-size: 1.6em;
-}
/* Shib IDP */
#idp-select-container {
clear: both;
@@ -361,8 +371,8 @@ body.logged-in #top-menu {
border-color: var(--cmg-color-red-007);
}
.co-alert.alert-information {
- background-color: var(--cmg-color-blue-003);
- color: var(--cmg-color-blue-002);
+ background-color: var(--cmg-color-blue-006);
+ color: var(--cmg-color-blue-005);
border-color: var(--cmg-color-blue-001);
}
.co-alert .alert-icon {
@@ -402,18 +412,6 @@ ul.form-list li.alert-banner .co-alert {
z-index: 100;
padding-top: 0;
}
-/* show our custom navigation icon for shrinking and expanding the drawer
-- this baves a little differently in mobile vs desktop mode */
-#co-hamburger {
- display: inline-block;
- float: left;
- position: relative;
- top: 3px;
- margin: 0;
- padding: 0;
- cursor: pointer;
- -webkit-font-smoothing: antialiased;
-}
#main-menu {
margin: 0;
padding: 0;
@@ -596,44 +594,71 @@ ul.form-list li.alert-banner .co-alert {
clear: both;
margin-top: 1em;
}
-/* SEARCH PAGE */
-#CoDashboardSearchForm {
+/* SEARCH RESULTS */
+#search-container {
+ padding: 1em;
margin-bottom: 1em;
+ background-color: var(--cmg-color-lightgray-004);
+ border: 1px solid var(--cmg-color-lightgray-006);
+}
+#search-clear {
+ color: var(--cmg-color-gray-001);
+ text-decoration: none;
+ position: absolute;
+ right: 4.5em;
}
#search-results {
display: flex;
- flex-flow: row wrap;
+ flex-wrap: wrap;
+ gap: 1em;
}
-#search-results .co-card {
- flex: 1 0 20%;
- width: auto;
+#search-results-meta {
+ padding: 0;
}
-#search-results .co-card li {
- padding: 0.5em;
+#search-results-meta li {
+ list-style: none;
+ display: inline;
}
-#search-results .co-card li:nth-child(2n+1) {
- background-color: #ededed;
+#search-results-meta li:after {
+ content: ",";
}
-#search .input.text,
-#search .submit {
- display: inline-block;
+#search-results-meta li:first-child:after,
+#search-results-meta li:last-child:after {
+ content: "";
}
-#search input#CoDashboardQ {
- height: 24px;
- width: 170px;
- margin-right: 0.5em;
- padding: 4px;
- border: 1px solid #ccc;
- font-size: 16px;
+#search-results h3 {
+ margin-bottom: 0.5em;
}
-#search input#CoDashboardQ:focus {
- background-color: #ffe;
- border: 1px solid #ccc;
+#search-results ul.search-results-group {
+ padding: 0;
+ list-style: none;
+ display: flex;
+ flex-wrap: wrap;
+ gap: 1em;
}
-#search input[type=submit] {
- position: relative;
- top: -2px;
- height: 33px;
+#search-results li.search-result {
+ display: block;
+ padding: 0;
+ border: 1px dashed var(--cmg-color-lightgray-008);
+ flex: 1 1 10%;
+ min-width: 220px;
+}
+#search-results li.search-result a {
+ display: block;
+ padding: 1em;
+ color: var(--cmg-color-gray-002);
+ height: 100%;
+}
+#search-results li.search-result a:hover,
+#search-results li.search-result a:focus-visible {
+ text-decoration: none;
+ background-color: var(--cmg-color-lightgray-004);
+}
+#search-results .search-result-name {
+ color: var(--cmg-color-blue-001);
+}
+#search-results .search-result-match-info {
+ font-size: 0.8em;
}
/* TOP FILTER */
.top-filters {
@@ -724,7 +749,6 @@ ul.form-list li.alert-banner .co-alert {
width: auto;
height: auto;
line-height: unset;
- margin: -6px 0 0;
padding: 0 1em;
}
.top-filters .filter-clear-all-button:hover {
@@ -1458,7 +1482,6 @@ table.list-mode .read-only-link-container {
}
.btn.btn-sm {
font-size: 0.9em;
- margin: -0.5em 0 0 0.1em;
}
.btn-primary,
.btn-primary:focus,
diff --git a/app/webroot/css/co-color.css b/app/webroot/css/co-color.css
index 38f2b6a9a..c2a60612c 100644
--- a/app/webroot/css/co-color.css
+++ b/app/webroot/css/co-color.css
@@ -36,6 +36,8 @@
primary hyperlink hover color; pagination; accessible on backgrounds down to #c9c9c9 */
--cmg-color-blue-003: #9fc6e2; /* spinner */
--cmg-color-blue-004: #17a2b8; /* info badge; XXX check for deprecated */
+ --cmg-color-blue-005: #0B3556; /* alert: info text color */
+ --cmg-color-blue-006: #d4ecff; /* search bar active */
/* Dark Grays */
--cmg-color-gray-001: #222; /* body text */
diff --git a/app/webroot/css/co-responsive.css b/app/webroot/css/co-responsive.css
index a74e147cf..c9f02a59c 100644
--- a/app/webroot/css/co-responsive.css
+++ b/app/webroot/css/co-responsive.css
@@ -53,9 +53,6 @@
display: block;
color: var(--cmg-color-white);
}
- #top-menu {
- right: 15px;
- }
#top-menu .top-menu-link-text {
display: inline;
}
@@ -65,8 +62,6 @@
}
#user-panel-user-info {
border-top: none;
- margin: 0 80px 0 0;
- padding-top: 0;
}
#logout-in-panel {
position: absolute;
@@ -146,34 +141,59 @@
min-height: 46px;
line-height: 1.6em;
}
- #global-search-toggle {
+ /* GLOBAL SEARCH */
+ #top-bar #global-search-toggle {
display: none;
}
- #search-bar {
+ #global-search {
+ position: static;
display: block;
- margin: -0.5em 1em -0.5em -0.5em; /* offset top-bar padding */
+ font-size: 1em;
+ background-color: transparent;
+ border: none;
+ border-right: 1px solid var(--cmg-color-lightgray-006);
+ padding: 0.5em 0.2em;
+ }
+ #global-search form {
+ padding: 0 0.5em;
+ min-height: 30px;
}
- #search-bar input {
- width: calc(100vw - 400px); /* XXX this will change as more items get added to the top menu */
+ #global-search #global-search-q {
+ flex: 1;
+ width: auto;
border: none;
- padding: 0.4em 0.5em 0.4em 1em;
- height: 44px;
+ background-color: transparent;
}
- #search-bar input#q:focus-visible {
+ #global-search #global-search-q:focus-visible {
outline: none;
}
- #search-bar button {
- margin-left: 1em;
- margin-top: -2px;
+ #global-search button {
padding: 0.25em 0.75em;
- display: none;
- text-transform: none;
+ margin-left: 0.25em;
font-weight: 400;
- font-size: 1em;
+ background-color: transparent;
+ border-radius: 3px;
+ }
+ #global-search button.btn-link {
+ color: var(--cmg-color-gray-001);
+ text-decoration: none;
}
- #search-bar button.visible {
+ #global-search button.btn-link:hover {
+ text-decoration: underline;
+ }
+ #global-search button.visible {
display: inline-block;
}
+ /* SEARCH RESULTS */
+ #search {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ }
+ #search-results {
+ flex-wrap: nowrap;
+ gap: 2em;
+ }
#top-menu {
z-index: 30;
}