-
Notifications
You must be signed in to change notification settings - Fork 235
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
Add SearchBar for layers selection #400
Merged
Merged
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
c404aa1
Add SearchBar for layers selection
Jatana 6f8d672
Remove commented code
Jatana 46a5bfe
Add new line to the end of css file
Jatana 285332e
Merge branch 'master' into layers-searchbar-v2
Jatana 90158fe
Fix searchbar error with only one letter pattern
Jatana 80c74f2
Prettifying
Jatana 4f25ac9
Merge branch 'layers-searchbar-v2' of https://github.com/Jatana/Fabri…
Jatana a45f230
Fix bug with no search results
Jatana 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
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,39 @@ | ||
.insert-layer-title { | ||
position: relative; | ||
margin-top: 10px !important; | ||
margin-bottom: 21px !important; | ||
} | ||
|
||
#layer-search-icon { | ||
position: absolute; | ||
left: -5px; | ||
top: 31px; | ||
// color: rgb(69, 80, 97); | ||
} | ||
|
||
#layer-search-icon:hover { | ||
cursor: pointer; | ||
} | ||
|
||
#layer-search-input { | ||
position: absolute; | ||
top: 36px; | ||
left: 20px; | ||
font-size: 15px; | ||
background: none; | ||
border: none; | ||
color: rgb(69, 80, 97); | ||
// border-bottom: 1px solid black; | ||
outline: none; | ||
opacity: 1; | ||
transition: 0.3s; | ||
} | ||
|
||
.layer-search-input-selected { | ||
opacity: 1 !important; | ||
} | ||
|
||
.matched-search-char { | ||
color: rgb(69, 80, 97); | ||
// text-decoration: underline; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If we dont need this please remove it. |
||
} |
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 |
---|---|---|
|
@@ -1206,4 +1206,4 @@ input[type="file"] { | |
background: white; | ||
transform: rotate(-45deg) | ||
} | ||
} | ||
} |
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 |
---|---|---|
|
@@ -1275,7 +1275,9 @@ class Content extends React.Component { | |
/> | ||
<h5 className="sidebar-heading">LOGIN</h5> | ||
<Login setUserId={this.setUserId} setUserName={this.setUserName}></Login> | ||
<h5 className="sidebar-heading">INSERT LAYER</h5> | ||
<h5 className="sidebar-heading insert-layer-title"><input id="layer-search-input" placeholder="Search for layer"></input><div id="insert-layer-sign">INSERT LAYER</div><i className="material-icons" id="layer-search-icon"> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Align |
||
search | ||
</i></h5> | ||
<Pane | ||
handleClick = {this.handleClick} | ||
setDraggingLayer = {this.setDraggingLayer} | ||
|
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
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 |
---|---|---|
|
@@ -35,4 +35,4 @@ Tabs.propTypes = { | |
selectedPhase: React.PropTypes.number | ||
}; | ||
|
||
export default Tabs; | ||
export default Tabs; |
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
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.
If we dont need this please remove it.