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

IBX-4213: Missing hovers on icons #639

Merged
merged 3 commits into from
Nov 18, 2022
Merged

IBX-4213: Missing hovers on icons #639

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77dd71b
IBX-4213: Missing hovers on icons
GrabowskiM Nov 8, 2022
91c2b82
added missing classes
GrabowskiM Nov 14, 2022
4358fea
absolute to flex
GrabowskiM Nov 14, 2022
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
28 changes: 28 additions & 0 deletions src/bundle/Resources/public/scss/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@

&:hover {
border-color: transparent;

.ibexa-icon {
fill: $ibexa-color-primary;
}
}

&--primary.ibexa-btn {
Expand All @@ -31,6 +35,10 @@
&:hover {
color: $ibexa-color-white;
box-shadow: 0 0 0 transparent, $ibexa-btn-hover-box-shadow;

.ibexa-icon {
fill: $ibexa-color-white;
}
}

&:hover:focus {
Expand Down Expand Up @@ -95,6 +103,10 @@

&:hover {
border-color: $ibexa-color-dark;

.ibexa-icon {
fill: $ibexa-color-dark;
}
}

&:focus {
Expand Down Expand Up @@ -153,6 +165,10 @@
background-color: $ibexa-color-dark;
box-shadow: 0 0 0 transparent, $ibexa-btn-hover-box-shadow-dark;

.ibexa-icon {
fill: $ibexa-color-white;
}

&:focus {
box-shadow: $ibexa-btn-focus-box-shadow, $ibexa-btn-hover-box-shadow-dark;
}
Expand Down Expand Up @@ -184,6 +200,10 @@
box-shadow: 0 0 0 transparent, $ibexa-btn-hover-box-shadow-info;
background-color: $ibexa-color-info;

.ibexa-icon {
fill: $ibexa-color-white;
}

&:focus {
color: $ibexa-color-white;
box-shadow: $ibexa-btn-focus-box-shadow-info, $ibexa-btn-hover-box-shadow-info;
Expand All @@ -204,13 +224,21 @@
color: $ibexa-color-dark;
fill: $ibexa-color-dark;
border-color: $ibexa-color-dark;

.ibexa-icon {
fill: $ibexa-color-dark;
}
}

&.ibexa-btn--inverted-hover {
&:hover {
color: $ibexa-color-white;
fill: $ibexa-color-white;
border-color: $ibexa-color-white;

.ibexa-icon {
fill: $ibexa-color-white;
}
}
}

Expand Down
22 changes: 19 additions & 3 deletions src/bundle/Resources/public/scss/_content-type-selector.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,31 @@
border-bottom: calculateRem(1px) solid transparent;
transition: all $ibexa-admin-transition-duration $ibexa-admin-transition;

.ibexa-icon--toggle {
position: absolute;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need this to have position absolute?

right: calculateRem(12px);
transition: var(--bs-accordion-btn-icon-transition);
}

&:not(.collapsed) {
box-shadow: calculateRem(4px) calculateRem(22px) calculateRem(47px) 0 rgba($ibexa-color-info, 0.05);
border-bottom-color: $ibexa-color-light;

.ibexa-icon--toggle {
transform: var(--bs-accordion-btn-icon-transform);
}
}

&:hover {
color: $ibexa-color-primary;

.ibexa-icon--toggle {
fill: $ibexa-color-primary;
}
}

&::after {
width: calculateRem(12px);
height: calculateRem(12px);
background-size: unset;
display: none;
}
}
}
Expand Down
14 changes: 13 additions & 1 deletion src/bundle/Resources/public/scss/_header-user-menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
margin-left: calculateRem(8px);
border: none;

&:after {
&::after {
content: '';
width: 0;
height: 0;
Expand All @@ -38,6 +38,12 @@
border-right: calculateRem(4px) solid transparent;
border-top: calculateRem(4px) solid $ibexa-color-white;
}

&:hover {
&::after {
border-top: calculateRem(4px) solid $ibexa-color-info;
}
}
}

&__thumbnail-wrapper {
Expand All @@ -53,6 +59,12 @@
height: calculateRem(24px);
padding-bottom: calculateRem(4px);
cursor: pointer;

&:hover {
.ibexa-icon {
fill: $ibexa-color-info;
}
}
}

&__notice-dot {
Expand Down
60 changes: 43 additions & 17 deletions src/bundle/Resources/public/scss/_main-header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,32 +46,50 @@
border-color: $ibexa-color-info;
background: $ibexa-color-info-800;

&.ibexa-input--text:not(:disabled) {
&:focus,
&:hover {
border-color: $ibexa-color-info;
background: $ibexa-color-info-800;
&.ibexa-input--text:not(:focus):placeholder-shown {
border-color: transparent;
}

&.ibexa-input--text {
&:not(:disabled) {
&:focus,
&:hover {
border-color: $ibexa-color-info;
background: $ibexa-color-info-800;
}
}
}

&.form-control:focus {
color: $ibexa-color-light;
}

&.ibexa-input--text:not(:focus):placeholder-shown {
border-color: transparent;
}

&::placeholder {
color: $ibexa-color-light;
}
}

.ibexa-input-text-wrapper__action-btn--search {
background: $ibexa-color-info-600;
width: calculateRem(58px);
height: calculateRem(48px);
transform: translateX(10px);
.ibexa-input-text-wrapper__action-btn {
&:hover {
.ibexa-icon {
fill: $ibexa-color-info;
}
}

&--search {
background: $ibexa-color-info-600;
width: calculateRem(58px);
height: calculateRem(48px);
transform: translateX(10px);

&:hover {
box-shadow: 0 calculateRem(22px) calculateRem(24px) 0 rgba($ibexa-color-info, 0.2);

.ibexa-icon {
fill: $ibexa-color-white;
}
}
}
}

&__user-menu-column {
Expand All @@ -80,8 +98,16 @@
align-items: center;
justify-content: flex-end;
}
}

.ibexa-input--text:not(:focus):placeholder-shown + .ibexa-input-text-wrapper__actions .ibexa-input-text-wrapper__action-btn--search {
background-color: transparent;
.ibexa-input--text:not(:focus):placeholder-shown + .ibexa-input-text-wrapper__actions .ibexa-input-text-wrapper__action-btn--search {
background-color: transparent;

&:hover {
box-shadow: none;

.ibexa-icon {
fill: $ibexa-color-info;
}
}
}
}
4 changes: 2 additions & 2 deletions src/bundle/Resources/views/themes/admin/ui/component/input_text.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
{% if is_password_input %}
<button
type="button"
class="btn ibexa-input-text-wrapper__action-btn ibexa-input-text-wrapper__action-btn--password-toggler"
class="btn ibexa-btn ibexa-btn--no-text ibexa-input-text-wrapper__action-btn ibexa-input-text-wrapper__action-btn--password-toggler"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Personally, I don't think this should be ibexa-btn.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Discussed in private, Gosia also confirmed, that this button should behave as ghost (and have same changes as ghost, if such occured in future)

tabindex="5"
>
<svg class="ibexa-icon ibexa-icon--small ibexa-input-text-wrapper__password-show">
Expand All @@ -41,7 +41,7 @@
</svg>
</button>
{% elseif has_search %}
<button type="{{ search_button_type|default('submit') }}" class="btn ibexa-input-text-wrapper__action-btn ibexa-input-text-wrapper__action-btn--search" tabindex="-1">
<button type="{{ search_button_type|default('submit') }}" class="btn ibexa-btn ibexa-btn--no-text ibexa-input-text-wrapper__action-btn ibexa-input-text-wrapper__action-btn--search" tabindex="-1">
<svg class="ibexa-icon ibexa-icon--small">
<use xlink:href="{{ ibexa_icon_path('search') }}"></use>
</svg>
Expand Down
4 changes: 4 additions & 0 deletions src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,10 @@
<span class="ibexa-content-type-selector__group-title accordion-header">
<button type="button" class="accordion-button {% if not loop.first %} collapsed{% endif %}" data-bs-toggle="collapse" data-bs-target="#{{ group_label }}">
{{ choice_translation_domain is same as(false) ? group_label : group_label|trans({}, choice_translation_domain) }}

<svg class="ibexa-icon ibexa-icon--tiny-small ibexa-icon--toggle">
<use xlink:href="{{ ibexa_icon_path('caret-down') }}"></use>
</svg>
</button>
</span>
<div class="ibexa-content-type-selector__list-wrapper accordion-collapse collapse{% if loop.first %} show{% endif %}" id="{{ group_label }}">
Expand Down