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

732 search #811

Merged
merged 3 commits into from
May 29, 2018
Merged

732 search #811

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81f1c3e
chore(search): remove icons from search
aledavila May 25, 2018
64e541b
fix(search): fix default close button offset
aledavila May 25, 2018
57271df
fix(search): resolve merge conflict
aledavila May 29, 2018
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
4 changes: 0 additions & 4 deletions src/components/search/_search.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,6 @@
}

.#{$prefix}--search--lg .#{$prefix}--search-close {
right: rem(100px);
}

.#{$prefix}--search--lg .#{$prefix}--search-close:last-child {
right: rem(12px);
}

Expand Down
18 changes: 0 additions & 18 deletions src/components/search/search.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,6 @@
<path d="M8 0C3.6 0 0 3.6 0 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8zm3.5 10.1l-1.4 1.4L8 9.4l-2.1 2.1-1.4-1.4L6.6 8 4.5 5.9l1.4-1.4L8 6.6l2.1-2.1 1.4 1.4L9.4 8l2.1 2.1z"></path>
</svg>
{{#is suffix "lg"}}
<button class="bx--search-button" type="button" aria-label="Filter button">
<svg class="bx--search-filter" width="16" height="16" viewBox="0 0 16 16" fill-rule="evenodd">
<path d="M5 0C3.7 0 2.6.8 2.2 2H0v2h2.2C2.6 5.2 3.7 6 5 6c1.3 0 2.4-.8 2.8-2H16V2H7.8C7.4.8 6.3 0 5 0zm0 4c-.6 0-1-.4-1-1s.4-1 1-1 1 .4 1 1-.4 1-1 1zM5 10c-1.3 0-2.4.8-2.8 2H0v2h2.2c.4 1.2 1.5 2 2.8 2 1.3 0 2.4-.8 2.8-2H16v-2H7.8c-.4-1.2-1.5-2-2.8-2zm0 4c-.6 0-1-.4-1-1s.4-1 1-1 1 .4 1 1-.4 1-1 1z"></path>
<path d="M11 5c-1.3 0-2.4.8-2.8 2H0v2h8.2c.4 1.2 1.5 2 2.8 2 1.3 0 2.4-.8 2.8-2H16V7h-2.2c-.4-1.2-1.5-2-2.8-2zm0 4c-.6 0-1-.4-1-1s.4-1 1-1 1 .4 1 1-.4 1-1 1z"></path>
</svg>
</button>
<button class="bx--search-button" type="button" data-search-toggle aria-label="Grid and list toggle button">
<div data-search-view="grid">
<svg class="bx--search-view" width="16" height="16" viewBox="0 0 16 16" fill-rule="evenodd">
<path d="M0 0h7v7H0zM9 0h7v7H9zM0 9h7v7H0zM9 9h7v7H9z"></path>
</svg>
</div>
<div class="bx--search-view--hidden" data-search-view="list">
<svg class="bx--search-view" width="16" height="14" viewBox="0 0 16 14" fill-rule="evenodd">
<path d="M0 0h16v2H0zM0 4h16v2H0zM0 8h16v2H0zM0 12h16v2H0z"></path>
</svg>
</div>
</button>
<label class="bx--label" id="search-input-label-1" for="search__input-1">Search</label>
{{/is}}
</div>
Expand Down