Reverting config

Reverting config.json
Этот коммит содержится в:
Asaad Mahmood
2016-10-18 20:55:59 +05:00
коммит произвёл Corey Hulen
родитель 06e5c097b3
Коммит d14a44cf98
5 изменённых файлов: 56 добавлений и 13 удалений

Просмотреть файл

@@ -199,6 +199,16 @@ export default class Post extends React.Component {
/> />
); );
if (this.props.compactDisplay) {
profilePic = (
<ProfilePicture
src=''
status={this.props.status}
user={this.props.user}
/>
);
}
if (PostUtils.isSystemMessage(post)) { if (PostUtils.isSystemMessage(post)) {
profilePic = ( profilePic = (
<span <span
@@ -214,10 +224,9 @@ export default class Post extends React.Component {
} }
let compactClass = ''; let compactClass = '';
let profilePicContainer = (<div className='post__img'>{profilePic}</div>); const profilePicContainer = (<div className='post__img'>{profilePic}</div>);
if (this.props.compactDisplay) { if (this.props.compactDisplay) {
compactClass = 'post--compact'; compactClass = 'post--compact';
profilePicContainer = '';
} }
let dropdownOpenedClass = ''; let dropdownOpenedClass = '';

Просмотреть файл

@@ -193,7 +193,7 @@ export default class SelectTeam extends React.Component {
let adminConsoleLink; let adminConsoleLink;
if (isSystemAdmin) { if (isSystemAdmin) {
adminConsoleLink = ( adminConsoleLink = (
<div className='margin--extra'> <div className='margin--extra hidden-xs'>
<Link <Link
to='/admin_console' to='/admin_console'
className='signup-team-login' className='signup-team-login'

Просмотреть файл

@@ -25,6 +25,8 @@
} }
.popover-content { .popover-content {
word-break: break-word;
p { p {
&:last-child { &:last-child {
margin-bottom: 5px; margin-bottom: 5px;

Просмотреть файл

@@ -530,6 +530,12 @@ body.ios {
} }
} }
.status-wrapper {
&:after {
bottom: 10px;
}
}
blockquote { blockquote {
display: inline-block; display: inline-block;
font-size: 1em; font-size: 1em;
@@ -636,12 +642,13 @@ body.ios {
.post__img { .post__img {
padding-top: 3px; padding-top: 3px;
width: 27px; width: 16px;
img, img,
svg { svg {
height: 20px; height: 20px;
width: 20px; visibility: hidden;
width: 9px;
} }
} }
} }

Просмотреть файл

@@ -21,6 +21,21 @@
} }
} }
.video-div {
&.embed-responsive-item {
height: 0;
padding-bottom: 75%;
iframe {
height: 100%;
left: 0;
position: absolute;
top: 0;
width: 100%;
}
}
}
.tutorial-steps__container { .tutorial-steps__container {
.tutorial__content { .tutorial__content {
.tutorial__steps { .tutorial__steps {
@@ -124,6 +139,14 @@
} }
} }
&.post--compact {
.status-wrapper {
&:after {
bottom: 12px;
}
}
}
&.same--root { &.same--root {
&.same--user { &.same--user {
.flag-icon__container { .flag-icon__container {
@@ -795,7 +818,7 @@
} }
.sidebar--menu { .sidebar--menu {
@include single-transition(transform, .5s, ease); @include single-transition(transform, .35s, ease);
@include translate3d(290px, 0, 0); @include translate3d(290px, 0, 0);
border: none; border: none;
display: block; display: block;
@@ -808,10 +831,11 @@
} }
.sidebar--left { .sidebar--left {
@include single-transition(transform, .5s, ease); @include single-transition(transform, .35s, ease);
@include translate3d(-290px, 0, 0); @include translate3d(-290px, 0, 0);
width: 290px;
border: none; border: none;
width: 290px;
&.sidebar--padded { &.sidebar--padded {
padding-top: 0; padding-top: 0;
} }
@@ -944,7 +968,7 @@
} }
.inner-wrap { .inner-wrap {
@include single-transition(all, .5s, ease); @include single-transition(all, .35s, ease);
.app__body & { .app__body & {
&:before { &:before {
@@ -955,7 +979,7 @@
left: -15px; left: -15px;
position: absolute; position: absolute;
top: 0; top: 0;
transition: background-color 0.5s ease, z-index 0s ease 0.5s; transition: background-color .35s ease, z-index 0s ease .35s;
width: calc(100% + 30px); width: calc(100% + 30px);
z-index: 0; z-index: 0;
} }
@@ -965,8 +989,9 @@
@include translate3d(290px, 0, 0); @include translate3d(290px, 0, 0);
&:before { &:before {
@include single-transition(all, .35s, ease);
background-color: rgba(0, 0, 0, .4); background-color: rgba(0, 0, 0, .4);
transition: background-color .5s ease;
z-index: 9999; z-index: 9999;
} }
} }
@@ -975,8 +1000,8 @@
@include translate3d(-290px, 0, 0); @include translate3d(-290px, 0, 0);
&:before { &:before {
background-color: rgba(0, 0, 0, 0.4); @include single-transition(all, .35s, ease);
transition: background-color 0.5s ease; background-color: rgba(0, 0, 0, .4);
z-index: 9999; z-index: 9999;
} }
} }