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

Select Menu improvements #893

Merged
merged 3 commits into from
Sep 12, 2019
Merged

Select Menu improvements #893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
394753b
Replace <menu> with <div>
simurai Sep 11, 2019
1bf780b
Add permanent transparent border
simurai Sep 11, 2019
cffac8d
Fix linter
simurai Sep 11, 2019
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
44 changes: 22 additions & 22 deletions docs/content/components/select-menu.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ Use a `<details>` element to toggle the Select Menu. The `<summary>` element can
</svg>
</button>
</header>
<menu class="SelectMenu-list">
<div class="SelectMenu-list">
<button class="SelectMenu-item" role="menuitem">Item 1</button>
<button class="SelectMenu-item" role="menuitem">Item 2</button>
<button class="SelectMenu-item" role="menuitem">Item 3</button>
</menu>
</div>
</div>
</div>
</details>
Expand Down Expand Up @@ -69,11 +69,11 @@ In case the Select Menu should be aligned to the right, use `SelectMenu right-0`
</svg>
</button>
</header>
<menu class="SelectMenu-list">
<div class="SelectMenu-list">
<button class="SelectMenu-item" role="menuitem">Item 1</button>
<button class="SelectMenu-item" role="menuitem">Item 2</button>
<button class="SelectMenu-item" role="menuitem">Item 3</button>
</menu>
</div>
</div>
</div>
</details>
Expand Down Expand Up @@ -106,7 +106,7 @@ Add a `.SelectMenu-icon .octicon-check` icon and it will show up when `aria-chec
</svg>
</button>
</header>
<menu class="SelectMenu-list">
<div class="SelectMenu-list">
<button class="SelectMenu-item" role="menuitemcheckbox" aria-checked="true">
<!-- <%= octicon "check", class: "SelectMenu-icon" %> -->
<svg
Expand Down Expand Up @@ -172,7 +172,7 @@ Add a `.SelectMenu-icon .octicon-check` icon and it will show up when `aria-chec
</svg>
Default state
</button>
</menu>
</div>
</div>
</div>
</details>
Expand Down Expand Up @@ -204,7 +204,7 @@ The list of items is arguably the most important subcomponent within the menu. B
</svg>
</button>
</header>
<menu class="SelectMenu-list">
<div class="SelectMenu-list">
<button class="SelectMenu-item" role="menuitem">
Text only
</button>
Expand Down Expand Up @@ -241,7 +241,7 @@ The list of items is arguably the most important subcomponent within the menu. B
<h5>With a heading</h5>
<span>and some longer description</span>
</button>
</menu>
</div>
</div>
</div>
</details>
Expand Down Expand Up @@ -273,14 +273,14 @@ The Select Menu's list can be divided into multiple parts by adding a `.SelectMe
</svg>
</button>
</header>
<menu class="SelectMenu-list">
<div class="SelectMenu-list">
<button class="SelectMenu-item" role="menuitem">Item 1</button>
<button class="SelectMenu-item" role="menuitem">Item 2</button>
<div class="SelectMenu-divider">More options</div>
<button class="SelectMenu-item" role="menuitem">Item 3</button>
<button class="SelectMenu-item" role="menuitem">Item 4</button>
<button class="SelectMenu-item" role="menuitem">Item 5</button>
</menu>
</div>
</div>
</div>
</details>
Expand Down Expand Up @@ -317,7 +317,7 @@ Also consider adding a `.SelectMenu-footer` at the bottom. It can be used for ad
<form class="SelectMenu-filter">
<input class="SelectMenu-input form-control" type="text" placeholder="Filter" aria-label="Filter">
</form>
<menu class="SelectMenu-list">
<div class="SelectMenu-list">
<button class="SelectMenu-item" role="menuitem">Item 1</a>
<button class="SelectMenu-item" role="menuitem">Item 2</a>
<button class="SelectMenu-item" role="menuitem">Item 3</a>
Expand All @@ -343,7 +343,7 @@ Also consider adding a `.SelectMenu-footer` at the bottom. It can be used for ad
<button class="SelectMenu-item" role="menuitem">Item 23</a>
<button class="SelectMenu-item" role="menuitem">Item 24</a>
<button class="SelectMenu-item" role="menuitem">Item 25</a>
</menu>
</div>
<footer class="SelectMenu-footer">Showing 25 of 25</footer>
</div>
</div>
Expand Down Expand Up @@ -383,18 +383,18 @@ Sometimes you need two or more lists of items in your Select Menu, e.g. branches
<button class="SelectMenu-tab" aria-selected="true">Branches</button>
<button class="SelectMenu-tab">Tags</button>
</nav>
<menu class="SelectMenu-list">
<div class="SelectMenu-list">
<button class="SelectMenu-item" role="menuitem">Branch 1</button>
<button class="SelectMenu-item" role="menuitem">Branch 2</button>
<button class="SelectMenu-item" role="menuitem">Branch 3</button>
<button class="SelectMenu-item" role="menuitem">Branch 4</button>
<button class="SelectMenu-item" role="menuitem">Branch 5</button>
</menu>
<menu class="SelectMenu-list" hidden>
</div>
<div class="SelectMenu-list" hidden>
<button class="SelectMenu-item" role="menuitem">Tag 1</button>
<button class="SelectMenu-item" role="menuitem">Tag 2</button>
<button class="SelectMenu-item" role="menuitem">Tag 3</button>
</menu>
</div>
<footer class="SelectMenu-footer">Showing 5 of 5</footer>
</div>
</div>
Expand Down Expand Up @@ -427,12 +427,12 @@ A `SelectMenu-message` can be used to show different kind of messages to a user.
</svg>
</button>
</header>
<menu class="SelectMenu-list">
<div class="SelectMenu-list">
<button class="SelectMenu-item" role="menuitem">Item 1</button>
<button class="SelectMenu-item" role="menuitem">Item 2</button>
<div class="SelectMenu-message border-bottom border-top bg-red-0 text-red p-2">Message goes here</div>
<button class="SelectMenu-item" role="menuitem">Item 3</button>
</menu>
</div>
</div>
</div>
</details>
Expand Down Expand Up @@ -467,7 +467,7 @@ When fetching large lists, consider showing a `.SelectMenu-loading` animation.
<form class="SelectMenu-filter">
<input class="SelectMenu-input form-control" type="text" placeholder="Filter" aria-label="Filter" />
</form>
<menu class="SelectMenu-list">
<div class="SelectMenu-list">
<div class="SelectMenu-loading">
<!-- <%= octicon "octoface", class: "anim-pulse", width: 32 %> -->
<svg
Expand All @@ -483,7 +483,7 @@ When fetching large lists, consider showing a `.SelectMenu-loading` animation.
/>
</svg>
</div>
</menu>
</div>
<footer class="SelectMenu-footer">Loading...</footer>
</div>
</div>
Expand Down Expand Up @@ -516,7 +516,7 @@ Sometimes a Select Menu needs to communicate a "blank slate" where there's no co
</svg>
</button>
</header>
<menu class="SelectMenu-list">
<div class="SelectMenu-list">
<div class="SelectMenu-blankslate">
<!-- <%= octicon "repo", class: "color-gray-3", width: 24 %> -->
<svg width="24 " height="32" viewBox="0 0 12 16" class="octicon octicon-repo color-gray-3" aria-hidden="true">
Expand All @@ -529,7 +529,7 @@ Sometimes a Select Menu needs to communicate a "blank slate" where there's no co
<p class="mb-3 text-gray">We didn’t find any matching repositories that you can commit to.</p>
<button type="button" class="btn btn-sm btn-primary">Create a repository</button>
</div>
</menu>
</div>
</div>
</div>
</details>
Expand Down
5 changes: 3 additions & 2 deletions src/select-menu/select-menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,8 @@
@include breakpoint(sm) {
flex: none;
padding: $spacer-1 $spacer-3;
border: $border-width $border-style transparent;
border-bottom-width: 0;
border-top-left-radius: $border-radius;
border-top-right-radius: $border-radius;
}
Expand All @@ -257,8 +259,7 @@
box-shadow: 0 0 0 1px $border-color;

@include breakpoint(sm) {
border: $border;
border-bottom-width: 0;
border-color: $border-color;
box-shadow: none;
}
}
Expand Down