Skip to content
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.

Sign up for GitHub

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

Jump to bottom

New day and system messages #209

Merged
merged 3 commits into from
Jun 19, 2015
Merged

New day and system messages #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d482f1
new day and system messages improvements
sampaiodiego Jun 19, 2015
9d6b1ed
fixed new-date alignment
rcaferati Jun 19, 2015
b902f50
improving sys msgs style
engelgabriel Jun 19, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 64 additions & 43 deletions client/stylesheets/base.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
}
}

* {
*,
*:before,
*:after {
.box-sizing(border-box);
}

Expand Down Expand Up @@ -174,19 +176,19 @@ q {
-webkit-overflow-scrolling: touch;
}

.rocket-form{
.rocket-form {
max-width: 620px;
width: 90%;
padding: 25px 0;
legend{
legend {
margin-bottom: 23px;
position: relative;
width: 100%;
display: block;
h3{
h3 {
margin-bottom: 5px !important;
}
&:after{
&:after {
content: " ";
height: 1px;
background-color: #DFDFDF;
Expand All @@ -197,11 +199,11 @@ q {
left: 0;
}
}
fieldset{
fieldset {
display: block;
margin-bottom: 40px;
}
.submit{
.submit {
margin-top: 20px;
text-align: right;
}
Expand Down Expand Up @@ -234,8 +236,8 @@ q {
input[type='text'] {
display: block;
}
&.double-col{
> label{
&.double-col {
> label {
width: 30%;
float: left;
margin-bottom: 0;
Expand All @@ -244,17 +246,17 @@ q {
line-height: 15px;
padding: 10px 20px 10px 0;
}
> div{
> div {
float: left;
width: 70%;
label{
label {
display: inline-block;
margin-right: 4px;
line-height: 35px;
&:nth-last-child(1){
&:nth-last-child(1) {
margin-right: 0;
}
input{
input {
margin-right: 4px;
}
}
Expand Down Expand Up @@ -1112,7 +1114,7 @@ a.github-fork {
.custom-scroll(transparent, rgba(255, 255, 255, 0.05));
.transition-delay(.135s);
background-color: @primary-background-color;
&.no-shadow{
&.no-shadow {
box-shadow: 0 0 0;
}
> .wrapper {
Expand All @@ -1136,7 +1138,8 @@ a.github-fork {
margin-bottom: 0;
color: inherit;
}
input[type='text'], select {
input[type='text'],
select {
border-width: 0 0 1px 0;
border-color: @tertiary-font-color;
background-color: transparent;
Expand Down Expand Up @@ -1568,16 +1571,16 @@ a.github-fork {
}

.page-static {
.content{
> div{
.content {
> div {
margin-bottom: 25px;
&:nth-last-child(1){
&:nth-last-child(1) {
margin-bottom: 0;
}
}
p {
margin-bottom: 12px;
&:nth-last-child(1){
&:nth-last-child(1) {
margin-bottom: 0;
}
}
Expand Down Expand Up @@ -1916,18 +1919,32 @@ a.github-fork {
&.new-day {
margin-top: 60px;
}
&.new-day:before {
content: attr(data-date);
display: block;
position: absolute;
top: -30px;
left: 0;
width: 100%;
font-size: 12px;
font-weight: 600;
text-align: center;
border-top: 1px solid #ddd;
color: @secondary-font-color;
&.new-day {
&:before {
content: attr(data-date);
display: block;
position: absolute;
top: -30px;
left: 0;
font-size: 12px;
font-weight: 600;
text-align: center;
.calc(left, ~"50% - 70px");
color: @secondary-font-color;
z-index: 10;
padding: 0 10px;
background-color: #FFF;
min-width: 140px;
}
&:after {
content: " ";
display: block;
position: absolute;
top: -20px;
left: 0;
width: 100%;
border-top: 1px solid #ddd;
}
}
.edit-message {
display: none;
Expand Down Expand Up @@ -1991,15 +2008,19 @@ a.github-fork {
}
}
}
.system {
display: inline-block;
background-color: #EFEFEF;
border-radius: 4px;
padding: 8px 12px;
font-size: 12px;
color: @secondary-font-color;
i {
margin-right: 5px;
&.s,
&.p,
&.f,
&.r,
&.au,
&.ru,
&.ul,
&.nu,
&.wm,
&.uj {
.body {
color: @secondary-font-color;
font-style: italic;
}
}
.avatar-initials {
Expand Down Expand Up @@ -2999,12 +3020,12 @@ a.github-fork {
}
}

.rocket-team{
.rocket-team {
display: block;
li{
li {
display: inline-block;
}
a{
a {
display: inline-block;
width: 50px;
height: 50px;
Expand Down
4 changes: 2 additions & 2 deletions client/views/app/message.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template name="message">
<li id="{{_id}}" class="message {{own}} {{type}}" data-username="{{u.username}}" data-date="{{date}}">
<li id="{{_id}}" class="message {{own}} {{t}}" data-username="{{u.username}}" data-date="{{date}}">
<a class="thumb user-card-message" href="#" data-username="{{u.username}}" tabindex="1">{{> avatar username=u.username}}</a>
<a class="user user-card-message" href="#" data-username="{{u.username}}" tabindex="1">{{u.username}}</a>
<span class="info">
Expand All @@ -15,7 +15,7 @@
<textarea class="input-message-editing" dir="auto">{{msg}}</textarea>
</div>
{{else}}
<div dir="auto">
<div class="body" dir="auto">
{{{message}}}
{{#each urls}}
{{> oembed url=this}}
Expand Down