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

Bugfix/use square buttons #67

Merged
merged 2 commits into from
Sep 12, 2023
Merged

Bugfix/use square buttons #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6987c73
Use .cbp-btn-square for icon-buttons in stories
dgibson666 Sep 12, 2023
dc9a3de
Deprecate hamburger mixin and remove CSS that is duplicated with squa…
dgibson666 Sep 12, 2023
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
2 changes: 1 addition & 1 deletion packages/vanilla/src/components/drawer/drawer.stories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default {
const Template = ({drawerPosition}) => {

return `
<button type="button" aria-label="Open Drawer" class="cbp-btn cbp-btn__secondary-outline" data-drawer="open">
<button type="button" aria-label="Open Drawer" class="cbp-btn-square cbp-btn__secondary-outline" data-drawer="open">
<i class="fas fa-bars"></i>
</button>

Expand Down
2 changes: 1 addition & 1 deletion packages/vanilla/src/components/header/header.stories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const ApplicationHeaderTemplate = () => {
<a href="#" class="cbp-nav-item">Child Page 3</a>
</div>
<div>
<button class="cbp-hamburger" data-drawer="open" id="cbp-nav-drawer-control" aria-label="Open navigation drawer">
<button class="cbp-btn-square cbp-btn__secondary-outline" data-drawer="open" id="cbp-nav-drawer-control" aria-label="Open navigation drawer">
<i class="fas fa-bars"></i>
</button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions packages/vanilla/src/components/menu/menu.stories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const OverflowMenuTemplate = ({buttonFill, menuPosition, controlLabel, controlAr
aria-controls="${menuID}"
aria-label="${controlAriaLabel}"
id="${controlID}"
class="cbp-menu__control cbp-btn cbp-btn__secondary-${buttonFill}"
class="cbp-menu__control cbp-btn-square cbp-btn__secondary-${buttonFill}"
>
<i class="fas fa-ellipsis-v"></i>${controlLabel!=undefined ? controlLabel : ''}
</button>
Expand Down Expand Up @@ -106,7 +106,7 @@ const OverflowMenuOptionsTemplate = ({buttonFill, menuPosition, controlLabel, co
aria-controls="${menuID}"
aria-label="${controlAriaLabel}"
id="menubutton2"
class="cbp-menu__control cbp-btn cbp-btn__secondary-${buttonFill}"
class="cbp-menu__control cbp-btn-square cbp-btn__secondary-${buttonFill}"
>
<i class="fas fa-ellipsis-v"></i>${controlLabel!=undefined ? controlLabel : ''}
</button>
Expand Down
11 changes: 0 additions & 11 deletions packages/vanilla/src/sass/components/_menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,11 @@

// The Control uses and inherits from button classes to reduce duplication
.cbp-menu__control {
display: flex;
justify-content: center;
align-items: center;
min-width: var(--cbp-space-6x);
min-height: var(--cbp-space-6x);
padding: 0;
letter-spacing: unset;

i {
font-size: var(--cbp-font-size-body);
margin-right: unset;
}

&:hover:not(:focus) {
background-color: var(--cbp-color-interactive-secondary-light);
}
}

/* The actual menu, positioned for mobile-first */
Expand Down
28 changes: 0 additions & 28 deletions packages/vanilla/src/sass/components/drawer/_hamburger.scss
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions packages/vanilla/src/sass/components/drawer/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@

@forward 'nav';

button[data-drawer] {
i {
margin: 0;
letter-spacing: initial;
}
}

/* Default Drawer Direction: 'left' */
.cbp-drawer {
Expand Down
8 changes: 0 additions & 8 deletions packages/vanilla/src/sass/components/header/_application.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// @use '../button/states' as *;
@use '../drawer/hamburger' as *;
@use '../../tokens/breakpoints' as *;

@mixin menu-hover {
Expand Down Expand Up @@ -87,13 +86,6 @@
}
}




.cbp-hamburger {
@include hamburger-menu;
}

@media (min-width: $cbp-breakpoint-md) {
.cbp-application-header {
padding-right: var(--cbp-space-8x);
Expand Down