Skip to content
Snippets Groups Projects
Commit c6615fdc authored by Rafael Caferati's avatar Rafael Caferati
Browse files

updated buttons

parent eaf551e3
No related merge requests found
Hide whitespace changes
Inline Side-by-side
client/stylesheets/base.less
+ 28
− 11
View file @ c6615fdc
...@@ -523,6 +523,7 @@ label.required:after { ...@@ -523,6 +523,7 @@ label.required:after {
// new layout buttons // new layout buttons
.button { .button {
&:extend(.unselectable);
display: inline-block; display: inline-block;
padding: 10px 12px 8px; padding: 10px 12px 8px;
background-color: #FFF; background-color: #FFF;
...@@ -532,10 +533,12 @@ label.required:after { ...@@ -532,10 +533,12 @@ label.required:after {
margin: 4px; margin: 4px;
text-transform: uppercase; text-transform: uppercase;
word-spacing: 0; word-spacing: 0;
box-shadow: 1px 1px 0 rgba(0, 0, 0, 0.1); box-shadow: 1px 1px 0 rgba(0, 0, 0, 0.125);
border: none; border: none;
line-height: 16px; line-height: 16px;
position: relative; position: relative;
background-color: #4f85de;
cursor: pointer;
span { span {
position: relative; position: relative;
z-index: 2; z-index: 2;
...@@ -547,7 +550,7 @@ label.required:after { ...@@ -547,7 +550,7 @@ label.required:after {
left: 0; left: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
background-color: rgba(0, 0, 0, 0.15); background-color: rgba(0, 0, 0, 0.125);
opacity: 0; opacity: 0;
z-index: 1; z-index: 1;
.transition(opacity .1s ease-out); .transition(opacity .1s ease-out);
...@@ -560,14 +563,16 @@ label.required:after { ...@@ -560,14 +563,16 @@ label.required:after {
} }
} }
&.primary { &.primary {
min-width: 120px; background-color: @tertiary-background-color;
background-color: #4f85de; color: @primary-font-color;
&:before{
background-color: rgba(0, 0, 0, 0.045);
}
} }
&.secondary { &.delete, &.remove, &.secondary {
min-width: 120px; min-width: 120px;
background-color: #bc2031; background-color: #bc2031;
} }
&.delete {}
&.facebook { &.facebook {
background-color: #325c99; background-color: #325c99;
} }
...@@ -1277,6 +1282,13 @@ a.github-fork { ...@@ -1277,6 +1282,13 @@ a.github-fork {
font-size: 22px; font-size: 22px;
font-weight: 500; font-weight: 500;
line-height: 29px; line-height: 29px;
.icon-star{
margin-right: -4px;
}
.icon-at,.icon-hash{
margin-right: -7px;
color: @secondary-font-color;
}
} }
// input[type='text']{ // input[type='text']{
// .calc(width, ~'100% - 100px'); // .calc(width, ~'100% - 100px');
...@@ -1762,6 +1774,7 @@ a.github-fork { ...@@ -1762,6 +1774,7 @@ a.github-fork {
width: 28px; width: 28px;
border-bottom: 1px solid @tertiary-background-color; border-bottom: 1px solid @tertiary-background-color;
color: @secondary-font-color; color: @secondary-font-color;
cursor: pointer;
&:hover { &:hover {
color: @primary-font-color; color: @primary-font-color;
} }
...@@ -1801,10 +1814,11 @@ a.github-fork { ...@@ -1801,10 +1814,11 @@ a.github-fork {
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
.calc(height, ~"100% - 60px"); .calc(height, ~"100% - 60px");
> div { > div {
.transition(transform .35s cubic-bezier(.5, 0, .1, 1)); .transition(transform .45s cubic-bezier(.5,0,0,1), opacity .125s ease-out .1s);
} }
> .-hidden { > .-hidden {
.transform(translateX(100%)); .transform(translateX(100%));
opacity: 0;
} }
> .animated { > .animated {
position: absolute; position: absolute;
...@@ -1857,14 +1871,19 @@ a.github-fork { ...@@ -1857,14 +1871,19 @@ a.github-fork {
width: 100px; width: 100px;
height: 100px; height: 100px;
.avatar { .avatar {
border-radius: 4px; border-radius: 0;
box-shadow: 1px 1px 0 rgba(0, 0, 0, 0.3); box-shadow: 1px 1px 0 rgba(0, 0, 0, 0.3);
.avatar-initials { .avatar-initials {
line-height: 100px; line-height: 100px;
} }
} }
} }
.nav {} nav {
margin-left: -4px;
.back{
float: right;
}
}
.info { .info {
margin-left: 120px; margin-left: 120px;
white-space: normal; white-space: normal;
...@@ -1959,8 +1978,6 @@ a.github-fork { ...@@ -1959,8 +1978,6 @@ a.github-fork {
margin: -5px 0 10px 0; margin: -5px 0 10px 0;
font-size: 12px; font-size: 12px;
} }
.views {}
.recent {}
} }
.user-image-status(@color) { .user-image-status(@color) {
......
client/views/app/chatWindowDashboard.html
+ 2
− 2
View file @ c6615fdc
...@@ -143,8 +143,8 @@ ...@@ -143,8 +143,8 @@
</div> </div>
</div> </div>
<nav> <nav>
<button class='-btn pull-right back'><span>{{_ "chatWindowDashboard.View_All"}} <i class='icon-angle-right'></i></span></button> <button class='button primary back'><span>{{_ "chatWindowDashboard.View_All"}} <i class='icon-angle-right'></i></span></button>
<button class='-btn primary pvt-msg'><span><i class='icon-chat'></i> {{_ "general.Conversation"}}</span></button> <button class='button pvt-msg'><span><i class='icon-chat'></i> {{_ "general.Conversation"}}</span></button>
</nav> </nav>
{{/with}} {{/with}}
</div> </div>
......
client/views/app/userCard.html
+ 2
− 2
View file @ c6615fdc
...@@ -18,10 +18,10 @@ ...@@ -18,10 +18,10 @@
</div> </div>
<div class="profile-buttons"> <div class="profile-buttons">
{{#unless $.Session.equals 'userProfileActive' $.Meteor.userId}} {{#unless $.Session.equals 'userProfileActive' $.Meteor.userId}}
<button class="-btn primary small private-chat"><span><i class='icon-chat'></i> {{_ "general.Conversation"}}</span></button> <button class="button primary small private-chat"><span><i class='icon-chat'></i> {{_ "general.Conversation"}}</span></button>
{{/unless}} {{/unless}}
{{#if canManageRoom}} {{#if canManageRoom}}
<button class="-btn btn-danger small remove-user"><span><i class='icon-cancel'></i> {{_ "general.Remove"}}</span></button> <button class="button delete small remove-user"><span><i class='icon-cancel'></i> {{_ "general.Remove"}}</span></button>
{{/if}} {{/if}}
</div> </div>
</template> </template>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment