-
-
Notifications
You must be signed in to change notification settings - Fork 1.5k
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.
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
Filter tags and folders #2964
Merged
Merged
Filter tags and folders #2964
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
8dc5214
new feature: filter tags and folder list
elfman 51aff20
improve style of sidenav
elfman 885b9d2
remove unused ref
elfman 04e0523
fix .extra-buttons vertical position
amedora db78f1b
fix search input visuality for Monokai
amedora a7f802d
Merge branch 'master' into filter-tags-and-folders
amedora 7529feb
add placeholder to show 'filter tags/folders...'
amedora 0d4b625
add locales 'filter tags/folders...'
amedora c5484fb
Merge branch 'master' into filter-tags-and-folders
amedora f577955
Merge branch 'master' into filter-tags-and-folders
amedora f1d03ac
Merge branch 'master' into filter-tags-and-folders
amedora 725bf2a
Merge branch 'master' into filter-tags-and-folders
amedora 2c0e0a6
Merge branch 'master' into filter-tags-and-folders
amedora File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
.menu | ||
margin-bottom 30px | ||
margin-bottom 20px | ||
|
||
.menu-button | ||
navButtonColor() | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,5 @@ | ||
.storageList | ||
absolute left right | ||
bottom 37px | ||
top 180px | ||
margin-bottom 37px | ||
overflow-y auto | ||
|
||
.storageList-folded | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
import PropTypes from 'prop-types' | ||
import React from 'react' | ||
import CSSModules from 'browser/lib/CSSModules' | ||
import styles from './SearchButton.styl' | ||
import i18n from 'browser/lib/i18n' | ||
|
||
const SearchButton = ({ onClick, isActive }) => ( | ||
<button styleName='top-menu-search' onClick={e => onClick(e)}> | ||
<img | ||
styleName='icon-search' | ||
src={ | ||
isActive | ||
? '../resources/icon/icon-search-active.svg' | ||
: '../resources/icon/icon-search.svg' | ||
} | ||
/> | ||
<span styleName='tooltip'>{i18n.__('Search')}</span> | ||
</button> | ||
) | ||
|
||
SearchButton.propTypes = { | ||
onClick: PropTypes.func.isRequired, | ||
isActive: PropTypes.bool | ||
} | ||
|
||
export default CSSModules(SearchButton, styles) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
.top-menu-search | ||
navButtonColor() | ||
position relative | ||
margin-right 6px | ||
top 3px | ||
width 2em | ||
background-color transparent | ||
&:hover | ||
color $ui-button-default--active-backgroundColor | ||
background-color transparent | ||
.tooltip | ||
opacity 1 | ||
&:active, &:active:hover | ||
color $ui-button-default--active-backgroundColor | ||
|
||
.icon-search | ||
width 16px | ||
|
||
body[data-theme="white"] | ||
.top-menu-search | ||
navWhiteButtonColor() | ||
background-color transparent | ||
&:hover | ||
color #0B99F1 | ||
background-color transparent | ||
&:active, &:active:hover | ||
color #0B99F1 | ||
background-color transparent | ||
|
||
body[data-theme="dark"] | ||
.top-menu-search | ||
navDarkButtonColor() | ||
background-color transparent | ||
&:active | ||
background-color alpha($ui-dark-button--active-backgroundColor, 20%) | ||
background-color transparent | ||
&:hover | ||
background-color alpha($ui-dark-button--active-backgroundColor, 20%) | ||
background-color transparent | ||
|
||
|
||
|
||
.tooltip | ||
tooltip() | ||
position absolute | ||
pointer-events none | ||
top 26px | ||
left -20px | ||
z-index 200 | ||
padding 5px | ||
line-height normal | ||
border-radius 2px | ||
opacity 0 | ||
transition 0.1s | ||
white-space nowrap |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You've perfectly aligned the search glass to bottom (see first screenshot below). But I think it would be visually better to move it slightly up.
The following is with 2px as top