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.

Sign up for GitHub

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

Jump to bottom

Changed styling for search and main menu #378

Merged
merged 9 commits into from
Feb 5, 2024
Merged

Changed styling for search and main menu #378

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
67dc5b6
Changed styling for search and main menu
martinyde Jan 3, 2024
c8bac2b
Modified changelog
martinyde Jan 3, 2024
94e0143
Applied coding standards
martinyde Jan 3, 2024
216accd
Applied coding standards
martinyde Jan 3, 2024
76609bc
CHanged stuff after code review
martinyde Jan 4, 2024
f091fc6
Added marking of search result
martinyde Jan 4, 2024
8295425
Changed styling
martinyde Jan 4, 2024
3269be0
Changed the collapsible menu
martinyde Jan 4, 2024
5ba6a9e
Merge branch 'develop' into feature/131-update-main-menu
martinyde Feb 5, 2024
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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

* [PR-378](https://github.com/itk-dev/hoeringsportal/pull/378)
New main menu, new search.
* [PR-374](https://github.com/itk-dev/hoeringsportal/pull/374)
Fix hidden mobile filters

* [PR-367](https://github.com/itk-dev/hoeringsportal/pull/367)
Added and used Editor Advanced link

Expand Down
138 changes: 135 additions & 3 deletions config/sync/views.view.autocompletion_callbacks_nodes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@ uuid: 3324f913-1644-4a21-902e-6da2d8d0a7c1
langcode: da
status: true
dependencies:
config:
- field.storage.node.field_description
- field.storage.node.field_proposal
module:
- node
- search_autocomplete
- text
- user
_core:
default_config_hash: xL9Hk4AQHs1h4kuPUWFrapn1sZbCxsV3B7omkB1FhMg
Expand Down Expand Up @@ -218,7 +222,7 @@ display:
entity_field: type
plugin_id: field
label: ''
exclude: true
exclude: false
alter:
alter_text: false
text: ''
Expand Down Expand Up @@ -373,6 +377,130 @@ display:
hide_empty: false
empty_zero: false
hide_alter_empty: false
field_description:
id: field_description
table: node__field_description
field: field_description
relationship: none
group_type: group
admin_label: ''
plugin_id: field
label: ''
exclude: false
alter:
alter_text: false
text: ''
make_link: false
path: ''
absolute: false
external: false
replace_spaces: false
path_case: none
trim_whitespace: false
alt: ''
rel: ''
link_class: ''
prefix: ''
suffix: ''
target: ''
nl2br: false
max_length: 150
word_boundary: true
ellipsis: true
more_link: false
more_link_text: ''
more_link_path: ''
strip_tags: true
trim: true
preserve_tags: ''
html: false
element_type: ''
element_class: ''
element_label_type: ''
element_label_class: ''
element_label_colon: false
element_wrapper_type: ''
element_wrapper_class: ''
element_default_classes: true
empty: ''
hide_empty: false
empty_zero: false
hide_alter_empty: true
click_sort_column: value
type: text_default
settings: { }
group_column: value
group_columns: { }
group_rows: true
delta_limit: 0
delta_offset: 0
delta_reversed: false
delta_first_last: false
multi_type: separator
separator: ', '
field_api_classes: false
field_proposal:
id: field_proposal
table: node__field_proposal
field: field_proposal
relationship: none
group_type: group
admin_label: ''
plugin_id: field
label: ''
exclude: false
alter:
alter_text: false
text: ''
make_link: false
path: ''
absolute: false
external: false
replace_spaces: false
path_case: none
trim_whitespace: false
alt: ''
rel: ''
link_class: ''
prefix: ''
suffix: ''
target: ''
nl2br: false
max_length: 150
word_boundary: true
ellipsis: true
more_link: false
more_link_text: ''
more_link_path: ''
strip_tags: true
trim: true
preserve_tags: ''
html: false
element_type: ''
element_class: ''
element_label_type: ''
element_label_class: ''
element_label_colon: false
element_wrapper_type: ''
element_wrapper_class: ''
element_default_classes: true
empty: ''
hide_empty: false
empty_zero: false
hide_alter_empty: true
click_sort_column: value
type: text_default
settings: { }
group_column: value
group_columns: { }
group_rows: true
delta_limit: 0
delta_offset: 0
delta_reversed: false
delta_first_last: false
multi_type: separator
separator: ', '
field_api_classes: false
pager:
type: full
options:
Expand Down Expand Up @@ -531,7 +659,9 @@ display:
- url.query_args
- 'user.node_grants:view'
- user.permissions
tags: { }
tags:
- 'config:field.storage.node.field_description'
- 'config:field.storage.node.field_proposal'
cacheable: false
nodes_autocompletion_callback:
id: nodes_autocompletion_callback
Expand Down Expand Up @@ -574,5 +704,7 @@ display:
- url
- 'user.node_grants:view'
- user.permissions
tags: { }
tags:
- 'config:field.storage.node.field_description'
- 'config:field.storage.node.field_proposal'
cacheable: false
2 changes: 1 addition & 1 deletion web/themes/custom/hoeringsportal/assets/css/module/_content.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
}

.page--landing_page & {
padding-bottom: 0.25rem;
padding-bottom: .25rem;
}

.page--citizen_proposal & {
Expand Down
58 changes: 13 additions & 45 deletions web/themes/custom/hoeringsportal/assets/css/module/_nav.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
nav.navbar {
box-shadow: 0 0 10px rgba(0,0,0,.25);
transition: padding .4s ease-out;

.scrolled & {
padding: .1rem 1rem;
transition: padding .2s ease-in;
Expand All @@ -23,41 +24,21 @@ nav.navbar {
}
}
.navbar-nav {
padding: .5rem 0;

.nav-item {
&:last-child {
border-right: 2px solid $gray-300;
}

.nav-link {
font-family: $font-family-black;
font-size: 1rem;
position: relative;
display: block;
font-weight: $font-weight-black;
color: $black;
margin-top: .5rem;
margin-right: 1rem;
@include media-breakpoint-up(lg) {
&:before {
opacity: 0;
content: "";
position: absolute;
height: 0px;
left: 8px;
right: 8px;
bottom: 0;
transition: height .2s ease-out, opacity .2s ease-out;
}
&:hover {
color: darken($primary, 10%);
}
&.is-active {
color: $primary;
}
&:hover, &.is-active {
&:before {
opacity: 1;
transition: height .2s ease-in, opacity .2s ease-in;
height: 4px;
}
}
}
padding: 0 1em;
}
}

Expand All @@ -67,16 +48,20 @@ nav.navbar {
float: right;
}

.nav-item:last-child {
border-right: 0;
}

.nav-link {
color: $gray-800;

line-height: 1em;
padding-bottom: 0;
padding-top: 0;
margin-right: 0;
font-size: 1em;
margin-top: 1em;
margin-bottom: 1em;
font-weight: normal;

&:hover {
color: darken($primary, 10%);
Expand All @@ -88,23 +73,6 @@ nav.navbar {
margin-top: 0;
margin-bottom: 0;
}

&.has-border {
@include media-breakpoint-up(lg) {
border-right: 1px solid $gray-600;
}
}
}
@include media-breakpoint-up(lg) {
.nav-item--secondary-navigation:last-child .nav-link.has-border {
border-right: 0;
}
}

.nav-item--secondary-navigation {
&:last-child .nav-link.has-border {
border-right: 0;
}
}

.logout-link {
Expand Down
2 changes: 1 addition & 1 deletion web/themes/custom/hoeringsportal/assets/css/module/_proposal.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}

.form-item--error-message {
color: #863131;
color: $red;

@extend .small;
}
Expand Down
Loading
Loading