Skip to content

Commit

Permalink
Merge pull request #361 from javier-tarazaga/improve-panes-style
Browse files Browse the repository at this point in the history
Minor improvements to the pane's tab style
  • Loading branch information
javier-tarazaga authored Jan 29, 2019
2 parents 9af5b44 + 5535eda commit 49f7c58
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 8 deletions.
1 change: 0 additions & 1 deletion src/components/projecteditor/panes.js
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,6 @@ class Panes extends Component {
<PanesHeader
panes={this.props.panes}
paneComponents={this.panes}

closeAllPanes={this.closeAllPanes}
closeAllOtherPanes={this.closeAllOtherPanes}
tabClicked={this.tabClicked}
Expand Down
7 changes: 4 additions & 3 deletions src/components/projecteditor/sidePanels/style.less
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,9 @@
display: flex;
align-content: center;
align-items: center;
height: 38px;
padding: 9px;
height: 35px;
padding: 7px 12px 8px 12px;
border-bottom: 1px solid #121516;
.panelIcon {
color: #fff;
margin-left: 7px;
Expand All @@ -123,4 +124,4 @@
}
}
}
}
}
34 changes: 30 additions & 4 deletions src/components/projecteditor/style.less
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@
-ms-user-select: none;
user-select: none;
background-color: #252525;
min-height: 38px;
min-height: 35px;
width: 100%;
overflow-y: hidden;
overflow-x: auto;
.tab {
padding: 10px 12px 10px 12px;
padding: 7px 12px 8px 12px;
display: flex;
align-items: center;
align-content: center;
Expand All @@ -78,6 +78,8 @@
background-color: #2D2D2D;
cursor: pointer;
color: #969696;
border-right: 1px solid #121516;
padding-right: 24px;
.tabContainer {
div {
float: left;
Expand All @@ -89,16 +91,40 @@
}
}
.close {
margin-left: 10px;
display: none;
font-size: 0.85em;
}
}
&.selected {
background-color: #1e1e1e;
color: #FFFFFF;
padding-right: 10px;
.close {
display: block;
opacity: 1;
color: #fff;
opacity: 0.8;
&:hover {
opacity: 1;
}
button {
padding: 0 0;
}
}
}
&:hover{
padding-right: 10px;
.close {
display: block;
opacity: 1;
color: #fff;
opacity: 0.8;
&:hover {
opacity: 1;
}
button {
padding: 0 0;
}
}
}
}
Expand Down Expand Up @@ -172,7 +198,7 @@
.sidePanelContainer {
position: relative;
}

.sideButtonsContainer {
position: absolute;
top: 0;
Expand Down

0 comments on commit 49f7c58

Please sign in to comment.