Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
b3c5347
Initial commit
joelit Mar 17, 2025
98b7e5e
Global search bar toggle button
joelit Mar 17, 2025
c2c7cd1
Mock-up of the global search for layout tweaking
joelit Mar 17, 2025
c91c590
Layout tweaks
joelit Mar 18, 2025
f893601
Responsive layout tweaks
joelit May 21, 2025
47d67e8
Pass supported languages from GlobalConfig
joelit May 21, 2025
2b85d4a
Language and vocabulaty dropdown lists for global search
joelit May 21, 2025
9b17424
Dropdown menu styling
joelit May 21, 2025
b7df4af
Dropdown menu styling
joelit May 21, 2025
71b596e
More useful vocabulary list
joelit May 21, 2025
7abe5df
Working version of vocabulary list
joelit Aug 20, 2025
eb31f16
Handle search parameters
joelit Aug 20, 2025
9c98421
Use the same search parameter name for rest & web
joelit Aug 20, 2025
73abdd4
Bring search parameter names in line
joelit Aug 20, 2025
f131432
Fix separator
joelit Aug 20, 2025
bf71567
JS style fixes
joelit Aug 20, 2025
44db979
CSS tweaks
joelit Aug 21, 2025
120759c
Dropdown selection updates menu header texts
joelit Aug 21, 2025
74eb7d1
Cypress tests
joelit Aug 21, 2025
1702442
Adding fallback generic fonts for dropdown chevrons
joelit Aug 21, 2025
b9f93be
Custom checkboxes
joelit Aug 27, 2025
62ff073
Text fade for vocabulary dropdown toggle chevron
joelit Aug 27, 2025
991e4f2
Fixed twig rendered lists
joelit Aug 27, 2025
d3b7d65
Keyboard navigable language selector
joelit Aug 27, 2025
c85db94
Custom checkboxes for vocab selector
joelit Aug 27, 2025
d9c2db8
Remove unnecessary overwriting of SKOSMOS object
joelit Aug 27, 2025
766844b
Remove the vocabulary selector fade-out for now
joelit Aug 27, 2025
60947d8
vocab list styling
joelit Aug 28, 2025
269f660
Fixes according to code review
joelit Aug 28, 2025
cd92612
rename vocab_url filter to global_url, it's more descriptive
osma Aug 28, 2025
d207617
Don't render global search template unless needed
joelit Nov 4, 2025
651d610
Amend existing tests to reflect changes in the global search bar
joelit Nov 4, 2025
1756fb4
Tweaked for clarity
joelit Nov 4, 2025
692326c
Removed duplicate definition
joelit Nov 4, 2025
9814873
Tweaked the language parameter handling
joelit Nov 5, 2025
9e39f71
Additional tests
joelit Nov 5, 2025
d655b50
Standard JS fixes
joelit Nov 5, 2025
612f0de
Revert to previous search parameters
joelit Nov 6, 2025
c719dab
Fixed handling of the search parameters
joelit Nov 6, 2025
27aae2f
JS style fixes
joelit Nov 6, 2025
19c8443
Add translation filters for the search titles
joelit Nov 6, 2025
908518d
Fixed query parameters in cypress tests
joelit Nov 6, 2025
b3369d2
Renamed cypress tests to disambiguate between search bar and search page
joelit Nov 6, 2025
8477da0
Join the string of selected vocabs with separating commas
joelit Nov 6, 2025
f38d645
Renamed hint texts to reflect upcoming translation template names
joelit Nov 6, 2025
a815b93
Fixed CSS variable names according to code review
joelit Nov 6, 2025
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
186 changes: 172 additions & 14 deletions resource/css/skosmos.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
--light-color: #f2f5f7;
--alert-color: #a0270a;
--white-color: #ffffff;
--header-bar-text: var(--white-color);
--headerbar-vocab-bg: var(--dark-color);
--feedback-form-bg: var(--white-color);
--feedback-form-text: var(--dark-color);
--feedback-form-input: var(--light-color);
Expand All @@ -24,6 +26,9 @@
--search-border: var(--medium-color);
--search-button-bg: var(--dark-color);
--search-button-text: var(--white-color);
--search-vocab-selector-bg: var(--medium-color);
--search-vocab-selector-selected-bg: var(--dark-color);
--search-vocab-selector-check: var(--white-color);
--search-dropdown-toggle-hover-text: var(--white-color);
--search-dropdown-toggle-hover-bg: var(--dark-color);
--vocab-bg: var(--white-color);
Expand Down Expand Up @@ -162,7 +167,7 @@ body {
/* Headerbar
*****************************************/
#headerbar.landing, #headerbar.landing-one-vocab {
color: var(--dark-color);
color: var(--header-bar-text);
}

#headerbar.vocab-home, #headerbar.concept {
Expand Down Expand Up @@ -192,49 +197,180 @@ body {
font-family: var(--font-family-heading);
}

#search-multi-vocab-title {
color: var(--vocab-text);
#global-search-toggle {
transition: none;
background-color: var(--headerbar-vocab-bg);
Comment thread
joelit marked this conversation as resolved.
border-style: none;
white-space: nowrap;
}

#global-search-toggle.collapsed::after {
background-image: none;
transform: none;
padding-left: 0.5rem;

content: "\f078"; /* fa-chevron-down */
color: var(--header-bar-text);
font: var(--fa-font-solid);
display: inline-block;
}

#global-search-toggle::after {
background-image: none;
transform: none;
padding-left: 0.5rem;

content: "\f077"; /* fa-chevron-up */
color: var(--header-bar-text);
font: var(--fa-font-solid);
display: inline-block;
}

#global-search-text {
min-width: 400px;
overflow: auto;
}

#global-search-text h2 {
font-family: var(--font-family-heading);
font-weight: bold;
font-size: 2rem;
}

#global-search-bar .dropdown {
display: inline-block;
}

#search-wrapper {
color: var(--vocab-text);
float: right;
height: 3.5em;
display: flex;
align-items: stretch;
flex-wrap: wrap;
}

#search-wrapper select, #search-wrapper input, #search-wrapper button {
height: 100%;
}

#search-wrapper button.dropdown-toggle {
background-color: var(--search-bg);
color: var(--vocab-text);
border: 1px solid var(--search-border);
border-radius: 0;
padding-left: 1rem;
padding-right: 1rem;
padding-right: 1.5rem;
}

#search-wrapper button.dropdown-toggle:hover, #search-wrapper button.dropdown-toggle.show {
background-color: var(--medium-color);
}

#search-wrapper button.dropdown-toggle i {
padding-left: 0.25rem;
padding-left: 0.5rem;
font-size: 0.75rem;
}

#search-wrapper button.btn.dropdown-toggle::after {
display: none !important;
}

#search-wrapper #language-list {
inset: -3px auto auto 0px !important;
background-color: var(--search-bg);
#search-wrapper #language-list, #search-wrapper #vocab-list {
inset: -2px auto auto 0px !important;
background-color: var(--search-dropdown-bg);
color: var(--vocab-text);
border: 1px solid var(--search-border);
border-radius: 0;
border: 0;
width: max-content;
list-style: none;
}
#search-wrapper #vocab-list {
padding-top: 0.25rem;
padding-left: 0.5rem;
padding-right: 0.5rem;
}

#search-wrapper .vocab-dropdown-btn {
width: 15rem;
position: relative;
padding-right: 2rem;
}

#search-wrapper .vocab-dropdown-btn span {
display: block;
overflow: hidden;
z-index: 0;
}

#search-wrapper .chevron {
position: absolute;
right: 0.5rem;
top: 33%;
display: block;
z-index: 2;
}

#search-wrapper .vocab-select {
display: block;
position: relative;
padding-left: 35px;
margin-bottom: 0.25rem;
cursor: pointer;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}

/* Custom checkbox */

#search-wrapper .vocab-select input {
position: absolute;
opacity: 0;
cursor: pointer;
height: 0;
width: 0;
}

#search-wrapper .checkmark {
position: absolute;
border: 1px solid var(--dark-color);
top: 0;
left: 0;
height: 1.5rem;
width: 1.5rem;
background-color: var(--white-color);
}

#search-wrapper .vocab-select:hover input ~ .checkmark {
background-color: var(--search-vocab-selector-selected-bg);
}

#search-wrapper .vocab-select input:checked ~ .checkmark {
background-color: var(--search-vocab-selector-selected-bg);
}

#search-wrapper .checkmark:after {
content: "";
position: absolute;
display: none;
}

#search-wrapper .vocab-select input:checked ~ .checkmark:after {
display: block;
}

#search-wrapper .vocab-select .checkmark:after {
left: 9px;
top: 5px;
width: 5px;
height: 10px;
border: solid white;
border-width: 0 3px 3px 0;
-webkit-transform: rotate(45deg);
-ms-transform: rotate(45deg);
transform: rotate(45deg);
}

#search-wrapper #language-list li a:hover, #search-wrapper #language-list li a:active {
color: var(--search-dropdown-toggle-hover-text);
color: var(--search-dropdown-toggle-hover-text);
background-color: var(--search-dropdown-toggle-hover-bg);
}

Expand Down Expand Up @@ -278,6 +414,20 @@ body {
overflow-y: auto;
}

#search-wrapper #language-list li:hover label {
background-color: var(--medium-color);
}

#search-wrapper #language-list li:active label {
background-color: var(--medium-color);
}

#search-wrapper #language-list li:has(input:checked) label {
background-color: var(--search-button-bg);
color: var(--white-color);
font-weight: bold;
}

/* Setting scrollbar style separately in Firefox */
@-moz-document url-prefix() {
#search-wrapper ul {
Expand Down Expand Up @@ -346,6 +496,14 @@ body {
width: 3.5em;
}

#search-form {
width: auto;
}

#search-form span, #search-form button {
flex-wrap: nowrap;
}

#clear-button {
position: absolute;
color: var(--vocab-text);
Expand Down
Loading