IBX: 11010 improve anchor links switcher #1805
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -3,6 +3,8 @@ | |||||
|
|
||||||
| .ibexa-anchor-navigation { | ||||||
| $self: &; | ||||||
| background-color: $ibexa-color-white; | ||||||
| padding: calculateRem(24px) calculateRem(32px) 0 calculateRem(32px); | ||||||
|
|
||||||
| &__sections { | ||||||
| .card { | ||||||
|
|
@@ -49,13 +51,10 @@ | |||||
| &__header { | ||||||
| height: calculateRem(87px); | ||||||
| padding: calculateRem(20px) 0 0 calculateRem(17px); | ||||||
| } | ||||||
|
|
||||||
| &__body { | ||||||
| height: calc(100% - #{calculateRem(87px)}); | ||||||
| font-size: $ibexa-text-font-size-medium; | ||||||
| } | ||||||
|
|
||||||
|
|
@@ -73,39 +72,48 @@ | |||||
|
|
||||||
| &__sections { | ||||||
| min-width: calculateRem(240px); | ||||||
| max-width: calculateRem(240px); | ||||||
| list-style: none; | ||||||
| display: none; | ||||||
| margin: calculateRem(24px) 0 0; | ||||||
| position: absolute; | ||||||
| right: calculateRem(30px); | ||||||
| z-index: 1; | ||||||
|
Contributor
There was a problem hiding this comment. personally I would use at least sth like z-index 10 to leave possibility to add sth between 0 and &__sections |
||||||
|
|
||||||
| &--active { | ||||||
| display: block; | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| &__sections-header { | ||||||
| font-size: $ibexa-text-font-size-extra-large; | ||||||
| font-weight: 600; | ||||||
| color: $ibexa-color-primary; | ||||||
| margin: calculateRem(16px) 0; | ||||||
| } | ||||||
|
|
||||||
| &__sections-item { | ||||||
| height: calculateRem(32px); | ||||||
| } | ||||||
|
|
||||||
| &__sections-item-btn { | ||||||
| display: inline-flex; | ||||||
| width: 100%; | ||||||
| padding: 0; | ||||||
| border: calculateRem(1px) solid transparent; | ||||||
| text-align: left; | ||||||
| color: $ibexa-color-dark-400; | ||||||
| align-items: center; | ||||||
| font-weight: 600; | ||||||
| border-left: 1px solid $ibexa-color-light; | ||||||
|
Contributor
There was a problem hiding this comment.
Suggested change
|
||||||
|
|
||||||
| &::before { | ||||||
| content: ''; | ||||||
| display: block; | ||||||
| width: calculateRem(2px); | ||||||
| height: calculateRem(32px); | ||||||
| margin: 0 calculateRem(16px) 0 0; | ||||||
| opacity: 0; | ||||||
| } | ||||||
|
|
||||||
| &::after { | ||||||
|
|
@@ -119,21 +127,20 @@ | |||||
| } | ||||||
|
|
||||||
| &:hover { | ||||||
| color: $ibexa-color-primary; | ||||||
|
|
||||||
| &::before { | ||||||
| opacity: 1; | ||||||
| background-color: $ibexa-color-primary; | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| &--active { | ||||||
| color: $ibexa-color-primary; | ||||||
|
|
||||||
| &::before { | ||||||
| opacity: 1; | ||||||
| background-color: $ibexa-color-primary; | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,6 +4,10 @@ | |
| .ibexa-edit-content { | ||
| @include edit-right-side-container; | ||
|
|
||
| &-width-wrapper { | ||
| width: calc(100% - calculateRem(300px)); | ||
| } | ||
|
|
||
| &__container { | ||
| max-width: calculateRem(820px); | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,6 +11,11 @@ | |
| <target state="new">More</target> | ||
| <note>key: anchor_menu.more</note> | ||
| </trans-unit> | ||
| <trans-unit id="fc987cbd27f6b39135fba2e19aec6ab4fd8fe088" resname="anchor_menu.sections"> | ||
| <source>Sections</source> | ||
| <target state="new">Sections</target> | ||
| <note>key: anchor_menu.sections</note> | ||
| </trans-unit> | ||
| </body> | ||
| </file> | ||
| </xliff> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,11 +6,6 @@ | |
| <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note> | ||
| </header> | ||
| <body> | ||
| <trans-unit id="8ace6daf300d4e12a28054d996c185db9ce7fe91" resname="authentication.credentials_expire_in.warning"> | ||
| <source>Your current password will expire in %days% day(s). You can change it in User settings/My account settings.</source> | ||
| <target state="new">Your current password will expire in %days% day(s). You can change it in User settings/My account settings.</target> | ||
|
|
@@ -351,6 +346,16 @@ | |
| <target state="new">We’ve sent to your email account a link to reset your password.</target> | ||
| <note>key: ibexa.forgot_user_password.success.alert</note> | ||
| </trans-unit> | ||
| <trans-unit id="ed391233ecfa73eeaf4884c184b6b07e30d8f8fa" resname="ibexa.notifications.search_form.label.from"> | ||
| <source>From</source> | ||
| <target state="new">From</target> | ||
| <note>key: ibexa.notifications.search_form.label.from</note> | ||
| </trans-unit> | ||
| <trans-unit id="b5ffcfba814a8539a4257894dc59affdfb49f1c6" resname="ibexa.notifications.search_form.label.to"> | ||
| <source>To</source> | ||
| <target state="new">To</target> | ||
| <note>key: ibexa.notifications.search_form.label.to</note> | ||
| </trans-unit> | ||
| <trans-unit id="a806cedb66ffc2616efb687174a31441d15d6b29" resname="ibexa_author.Email"> | ||
| <source>Email</source> | ||
| <target state="new">Email</target> | ||
|
|
@@ -371,6 +376,16 @@ | |
| <target state="new">Name</target> | ||
| <note>key: ibexa_author.name</note> | ||
| </trans-unit> | ||
| <trans-unit id="a8c78354005b82690d25244c10c2914d1c7cc620" resname="ibexa_notifications"> | ||
| <source>Notifications</source> | ||
| <target state="new">Notifications</target> | ||
| <note>key: ibexa_notifications</note> | ||
| </trans-unit> | ||
| <trans-unit id="3fb3513f9d1afa70eca71242490ec7b403bdd41c" resname="ibexa_notifications.btn.mark_all_as_read"> | ||
| <source>Mark all as read</source> | ||
| <target state="new">Mark all as read</target> | ||
| <note>key: ibexa_notifications.btn.mark_all_as_read</note> | ||
| </trans-unit> | ||
| <trans-unit id="599a4e82a1f7e8220dc4f792e1541cd3f0963dac" resname="ibexa_object_relation_list.cta.limit.multi"> | ||
| <source>Set up a Relation with one or several Items</source> | ||
| <target state="new">Set up a Relation with one or several Items</target> | ||
|
|
@@ -396,26 +411,6 @@ | |
| <target state="new">Delete</target> | ||
| <note>key: ibexa_object_relation_list.delete_selected_relations</note> | ||
| </trans-unit> | ||
| <trans-unit id="8390c7c1adbff8a264583f6f060256c993023787" resname="language.delete"> | ||
| <source>Delete</source> | ||
| <target state="new">Delete</target> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -68,7 +68,7 @@ | |
| 'location': location, | ||
| 'parent_location': parent_location, | ||
| 'language': language, | ||
| 'grouped_fields': grouped_fields | ||
| }) %} | ||
|
|
||
| {% embed '@ibexadesign/ui/anchor_navigation_menu.html.twig' with anchor_params %} | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,14 +17,8 @@ | |
|
|
||
| {% form_theme form with form_templates %} | ||
|
|
||
| {% block anchor_menu %} | ||
| {% include '@ibexadesign/ui/anchor_navigation_menu.html.twig' with anchor_params %} | ||
| {% endblock %} | ||
|
|
||
| {% block content %} | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,9 +10,9 @@ | |
| ] | ||
| } %} | ||
|
|
||
| {% block main_container_class %}{{ parent() }} ibexa-content-type-edit ibexa-main-container--without-anchor-menu-items{% endblock %} | ||
|
|
||
| {% block anchor_menu %} | ||
| {% set content_type_edit_anchor_menu = knp_menu_get('ibexa.admin_ui.menu.content_type_edit.anchor_menu', [], { | ||
| 'content_type': content_type, | ||
| }) %} | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,13 @@ | ||
| {% trans_default_domain 'ibexa_anchor_menu' %} | ||
|
|
||
| <div class="ibexa-anchor-navigation-menu"> | ||
| <div class="ibexa-anchor-navigation-menu__body"> | ||
| {% block navigation_menu_body %} | ||
| {% if items|default([])|length > 1 %} | ||
| <ul class="ibexa-anchor-navigation-menu__sections ibexa-anchor-navigation-menu__sections--active ibexa-anchor-navigation-menu__sections--no-border"> | ||
| <li class="ibexa-anchor-navigation-menu__sections-header"> | ||
| {{ 'anchor_menu.sections'|trans|desc('Sections') }} | ||
| </li> | ||
| {% for item in items %} | ||
| {% set item_label = item is iterable ? item.label : item %} | ||
| {% set sanitized_item = item is iterable and item.target_id is defined ? item.target_id : item_label|lower|slug %} | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,28 +2,26 @@ | |
|
|
||
| {% block main_container_class %} | ||
| ibexa-main-container--edit-container | ||
| ibexa-main-container--without-anchor-menu-items | ||
| {% endblock %} | ||
|
|
||
| {% block header_row %}{% endblock %} | ||
|
|
||
| {% block left_sidebar %}{% endblock %} | ||
|
|
||
| {% block back_to_top %}{% endblock %} | ||
|
|
||
| {% block content_column %} | ||
| <div class="ibexa-main-container__content-column"> | ||
| {% block header %}{% endblock %} | ||
| {% block anchor_menu %} | ||
| {% include '@ibexadesign/ui/anchor_navigation_menu.html.twig' with anchor_params|default({}) %} | ||
| {% endblock %} | ||
| <div class="ibexa-edit-content"> | ||
| <div class="ibexa-edit-content-width-wrapper"> | ||
| {% block content %}{% endblock %} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| {% endblock %} | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -44,6 +44,9 @@ | |
| {% endblock %} | ||
|
|
||
| {% block children_2nd_level %} | ||
| <div class="ibexa-anchor-navigation-menu__sections-header"> | ||
| {{ 'anchor_menu.sections'|trans|desc('Sections') }} | ||
| </div> | ||
| {% for item in currentItem.children %} | ||
| {%- set itemClass = 'ibexa-anchor-navigation-menu__sections-item-btn' %} | ||
| {%- if loop.first %} | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
for safety,
.ibexa-tabs--switchercan be used in other contexts as well