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

assets/buttons: adding better focus behaviour for button light //list… #4120

Merged
merged 1 commit into from
Dec 29, 2021
Merged

assets/buttons: adding better focus behaviour for button light //list… #4120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 2 additions & 5 deletions meinberlin/apps/contrib/templates/meinberlin_contrib/component_library.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,11 +481,6 @@ <h2 id="cl-breadcrumbs">Breadcrumbs</h2>
<h2 id="cl-buttons">Buttons</h2>

<div class="cl-example">
<p>
<button class="btn" type="button">Button</button>
<input class="btn" type="button" value="Input Button" />
<a class="btn" href="#">Link as Button</a>
</p>
<p>
<button class="btn btn--light" type="button">Light Button</button>
<button class="btn btn--transparent" type="button">Transparent Button</button>
Expand All @@ -503,6 +498,8 @@ <h2 id="cl-buttons">Buttons</h2>
<p>
<button class="btn btn--link" type="button">Button as Link</button>
<button class="btn btn--none" type="button">No Button</button>
<a class="btn btn--link" href="#" type="button">Link as Button</a>
<a class="btn btn--link is-disabled" type="button" href="">Link Button disabled</a>
</p>
<p>
<button class="btn btn--select" type="button">Select Button <i class="fa fa-caret-down" aria-hidden="true"></i></button>
Expand Down
21 changes: 13 additions & 8 deletions meinberlin/assets/scss/components/_button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,16 @@
@include button-color($body-bg, $bg-secondary);

&,
&:focus,
&:hover,
&:active,
&:disabled,
&.is-disabled {
border-color: $border-color;
}

&:focus,
&:hover,
&:active {
border-color: $idea-remark-color;
}
}

.btn--transparent {
Expand Down Expand Up @@ -109,19 +112,21 @@
background-color: transparent;

color: $link-color;
text-decoration: underline;
text-decoration: underline !important;
font-weight: normal;
cursor: pointer;

&:hover,
&:focus {
color: $link-hover-color;
color: $link-hover-color !important;
border-color: transparent;
background-color: transparent;
}

&.is-disabled,
&:disabled {
color: $text-color;
&.is-disabled {
color: $text-color !important;
border-color: transparent;
background-color: transparent;
cursor: not-allowed;
}
}
Expand Down
12 changes: 0 additions & 12 deletions meinberlin/assets/scss/components/_list_item.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,6 @@
background-color: $body-bg;
margin-bottom: $em-spacer;
page-break-inside: avoid;

&.selected {
background-color: $bg-secondary;
}

&.selected:focus {
outline: none;
}

// &:hover:not(.no-hover) {
// background-color: mix($body-bg, $bg-secondary);
// }
}

.list-item--squashed {
Expand Down