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

Move search filters above input so not hidden behind autocomplete. #114

Open
wants to merge 2 commits into
base: trunk
Choose a base branch
from
Open

Move search filters above input so not hidden behind autocomplete. #114

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
186c975
Move search filters above input so not hidden behind autocomplete.
iandunn Jun 10, 2022
e13bbdb
Prevent search results horizontal scrolling and overflow
iandunn Jun 10, 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
8 changes: 7 additions & 1 deletion source/wp-content/themes/wporg-developer/scss/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1686,6 +1686,7 @@ a.screen-reader-text:focus,
}

.site-title {
margin-right: 20px;

@media screen and (max-width: 500px) {
margin-bottom: 2rem;
Expand Down Expand Up @@ -2911,8 +2912,13 @@ button.code-tab.is-active {
}

&.search-wrap-inline .search-field {
width: calc(100vw - 60px);
margin: 0;
border: none;

@media ( min-width: 501px ) {
width: 100%;
}
}

&.search-wrap-embedded .search-field {
Expand All @@ -2922,7 +2928,7 @@ button.code-tab.is-active {
}

&.search-wrap-embedded .search-post-type {
margin-top: 2rem;
margin-bottom: 2rem;
justify-content: space-between;
color: $color-white;
max-width: 450px;
Expand Down
29 changes: 14 additions & 15 deletions source/wp-content/themes/wporg-developer/searchform.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,11 @@
?>
<div class="search-wrap <?php echo esc_attr( $classes ); ?>">
<form role="search" method="get" class="searchform <?php echo esc_attr( $form_class ); ?>" action="<?php echo esc_url( $search_url ); ?>">
<div class="search-field">
<input type="search" id="search-field" placeholder="<?php echo esc_attr( $placeholder ); ?>" value="<?php echo esc_attr( get_search_query() ); ?>" name="s">
<button class="button-search" aria-label="<?php esc_html_e( 'Search', 'wporg' ); ?>">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" role="img" aria-hidden="true" focusable="false"><path d="M13.5 6C10.5 6 8 8.5 8 11.5c0 1.1.3 2.1.9 3l-3.4 3 1 1.1 3.4-2.9c1 .9 2.2 1.4 3.6 1.4 3 0 5.5-2.5 5.5-5.5C19 8.5 16.5 6 13.5 6zm0 9.5c-2.2 0-4-1.8-4-4s1.8-4 4-4 4 1.8 4 4-1.8 4-4 4z"></path></svg>
</button>
</div>
<?php if ( $show_filters ) : ?>

<div class="search-post-type">
<span><?php _e( 'Filter by type:', 'wporg' ); ?></span>
<?php
<?php if ( $show_filters ) : ?>
<div class="search-post-type">
<span><?php _e( 'Filter by type:', 'wporg' ); ?></span>
<?php
$search_post_types = array(
'wp-parser-function' => __( 'Functions', 'wporg' ),
'wp-parser-hook' => __( 'Hooks', 'wporg' ),
Expand All @@ -61,13 +55,18 @@
?>
<div>
<input id="<?php echo esc_attr( $post_type ); ?>" type="checkbox" name="post_type[]" value="<?php echo esc_attr( $post_type ); ?>" <?php echo $checked; ?> />
<label for="<?php echo esc_attr( $post_type ); ?>"><?php echo $label; ?></label>
<label for="<?php echo esc_attr( $post_type ); ?>"><?php echo $label; ?></label>
</div>
<?php } ?>
</div>
<?php } ?>
</div>
<?php endif; ?>

<?php endif; ?>
<div class="search-field">
<input type="search" id="search-field" placeholder="<?php echo esc_attr( $placeholder ); ?>" value="<?php echo esc_attr( get_search_query() ); ?>" name="s">
<button class="button-search" aria-label="<?php esc_html_e( 'Search', 'wporg' ); ?>">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" role="img" aria-hidden="true" focusable="false"><path d="M13.5 6C10.5 6 8 8.5 8 11.5c0 1.1.3 2.1.9 3l-3.4 3 1 1.1 3.4-2.9c1 .9 2.2 1.4 3.6 1.4 3 0 5.5-2.5 5.5-5.5C19 8.5 16.5 6 13.5 6zm0 9.5c-2.2 0-4-1.8-4-4s1.8-4 4-4 4 1.8 4 4-1.8 4-4 4z"></path></svg>
</button>
</div>

</form>
</div>
17 changes: 14 additions & 3 deletions source/wp-content/themes/wporg-developer/stylesheets/autocomplete.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,31 @@ div.awesomplete li[aria-selected="true"] mark {

.search-wrap div.awesomplete > ul {
top: 40px;
max-width: 100%;
text-align: left;
max-height: 13.5em;
color: #404040;
overflow: auto;
overflow-x: hidden;
background: linear-gradient(to bottom right, #fff, hsla(0, 0%, 100%, 0.9));
}

@media (min-width: 400px) {
.search-wrap div.awesomplete > ul {
max-width: calc( 100vw - 50% - var(--wp--custom--alignment--scroll-bar-width) );
}
}

.search-wrap div.awesomplete > ul li {
padding-right: 20px;
}

.search-wrap-inline div.awesomplete > ul {
right: 0;
left: auto;
}

.search-wrap .searchform label div.awesomplete > input,
.search-wrap div.awesomplete {
.search-wrap div.awesomplete {
width: 100%;
}

Expand All @@ -51,7 +62,7 @@ div.awesomplete li[aria-selected="true"] mark {

.search-wrap div.awesomplete {
/* This is for the input to expand */
display: flex;
display: flex;
}

div.awesomplete > ul::before {
Expand Down
13 changes: 12 additions & 1 deletion source/wp-content/themes/wporg-developer/stylesheets/main.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.