Buttons and container list tweaks.

This commit is contained in:
Sean Li 2015-01-23 11:19:23 -08:00
parent 499927c55a
commit a9ae7a24f8
3 changed files with 28 additions and 23 deletions

View File

@ -47,7 +47,7 @@ var Containers = React.createClass({
<div className="create"> <div className="create">
<ModalTrigger modal={<ContainerModal/>}> <ModalTrigger modal={<ContainerModal/>}>
<div className="wrapper"> <div className="wrapper">
<span className="icon icon-add-3"></span> <a className="btn btn-action only-icon"><span className="icon icon-add-1"></span></a>
</div> </div>
</ModalTrigger> </ModalTrigger>
</div> </div>

View File

@ -10,10 +10,11 @@
.sidebar { .sidebar {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
min-width: 240px; min-width: 280px;
margin: 0; margin: 0;
box-sizing: border-box; box-sizing: border-box;
border-right: 1px solid #eee; border-right: 1px solid #eee;
//padding: 10px 26px 0px 10px;
.sidebar-header { .sidebar-header {
flex: 0 auto; flex: 0 auto;
@ -22,6 +23,7 @@
display: flex; display: flex;
border-bottom: 1px solid transparent; border-bottom: 1px solid transparent;
transition: border-bottom 0.25s; transition: border-bottom 0.25s;
padding: 0px 28px 0px 10px;
&.sep { &.sep {
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
@ -46,22 +48,6 @@
.wrapper { .wrapper {
text-align: center; text-align: center;
display: inline-block; display: inline-block;
width: 50px;
span.icon {
margin-top: 5px;
margin-left: auto;
display: inline-block;
border-radius: 20px;
font-size: 26px;
color: @brand-primary;
}
&:hover {
span.icon {
color: darken(@brand-primary, 20%);
}
}
} }
} }
@ -90,10 +76,22 @@
color: inherit; color: inherit;
flex-shrink: 0; flex-shrink: 0;
cursor: default; cursor: default;
margin: 0px 5px 0px 20px;
&.active { &.active {
background: #eee; background: @brand-primary;
li {
.name {
color: white;
}
.image {
color: white;
opacity: 0.9;
}
}
color: white;
border-bottom: none; border-bottom: none;
border-radius: 40px;
&:hover { &:hover {
} }
@ -110,8 +108,7 @@
li { li {
vertical-align: middle; vertical-align: middle;
padding-bottom: 14px; padding: 10px 16px 10px 16px;
margin: 16px 24px 0px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@ -126,10 +123,10 @@
overflow: hidden; overflow: hidden;
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
color: #555; color: @gray-darkest;
} }
.image { .image {
color: #999; color: @gray-lighter;
font-size: 12px; font-size: 12px;
font-weight: 400; font-weight: 400;
text-overflow: ellipsis; text-overflow: ellipsis;

View File

@ -60,6 +60,12 @@
margin-right: 4px; margin-right: 4px;
} }
} }
&.only-icon {
padding: 0px 14px 0px 14px;
.icon:before {
top: 5px;
}
}
} }
} }
@ -82,7 +88,9 @@
margin-right: 4px; margin-right: 4px;
} }
&.only-icon { &.only-icon {
padding: 0px 5px 10px 5px;
.icon:before { .icon:before {
position: relative;
margin-right: 0px; margin-right: 0px;
} }
} }