PLT-2549 - Improvements to theme stuff (#2657)

This commit is contained in:
Asaad Mahmood
2016-04-07 23:37:50 +05:00
committed by Corey Hulen
parent af98754d24
commit 5cf982e021
5 changed files with 731 additions and 728 deletions

View File

@@ -1,6 +1,7 @@
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
import $ from 'jquery';
import UserStore from 'stores/user_store.jsx';
import TeamStore from 'stores/team_store.jsx';
import PreferenceStore from 'stores/preference_store.jsx';
@@ -34,6 +35,12 @@ export default class TutorialIntroScreens extends React.Component {
this.state = {currentScreen: 0};
}
componentDidMount() {
$('body').addClass('app__body');
}
componentWillUnmount() {
$('body').removeClass('app__body');
}
handleNext() {
if (this.state.currentScreen < 2) {
this.setState({currentScreen: this.state.currentScreen + 1});

View File

@@ -1,518 +1,522 @@
@charset 'UTF-8';
.browser--ie {
.app__body {
&.browser--ie {
.modal {
.modal-dialog {
@include translateY(0);
}
}
}
.modal-body {
max-height: calc(90vh - 62px);
overflow: auto;
padding: 20px 15px;
.edit-modal-body {
overflow: visible;
.suggestion-list__content {
max-height: 150px;
}
}
}
.more-table {
margin: 0;
table-layout: fixed;
}
.modal {
.modal-dialog {
@include translateY(0);
}
}
}
.modal-body {
max-height: calc(90vh - 62px);
overflow: auto;
padding: 20px 15px;
.edit-modal-body {
overflow: visible;
.suggestion-list__content {
max-height: 150px;
}
}
}
.more-table {
margin: 0;
table-layout: fixed;
}
.modal {
color: alpha-color($black, .9);
width: 100%;
&.modal-image {
.modal-backdrop {
&.in {
@include opacity(.7);
}
}
}
.custom-textarea {
border-color: $light-gray;
color: inherit;
&:focus {
border-color: $light-gray;
box-shadow: none;
}
}
.btn {
font-size: 13px;
&.btn-default {
background: transparent;
border: none;
}
}
.info__label {
font-weight: 600;
padding-right: 0;
text-align: right;
}
.team-member-list {
color: alpha-color($black, .9);
width: 100%;
}
.remove__member {
color: $dark-gray;
float: right;
font-size: 20px;
line-height: 0;
padding: 6px;
&:hover {
color: $red;
}
}
.modal-dialog {
margin-left: auto;
margin-right: auto;
max-width: 95%;
}
.modal-push-down {
margin-top: 5%;
}
.modal-next-bar {
height: 100%;
position: absolute;
right: 0;
top: 0;
}
.modal-header {
@include border-radius(0);
@include clearfix;
background: $primary-color;
border: 1px solid $light-gray;
color: $white;
min-height: 56px;
padding: 15px 15px 11px;
.modal-title {
color: $bg--gray;
float: left;
font-size: 17px;
line-height: 27px;
.name {
color: $white;
font-weight: 600;
&.modal-image {
.modal-backdrop {
&.in {
@include opacity(.7);
}
}
}
.modal-action {
margin: 0;
padding: 0;
}
.custom-textarea {
border-color: $light-gray;
color: inherit;
.close {
@include opacity(1);
@include single-transition(all, .25s, ease-in);
color: $white;
height: 30px;
line-height: 30px;
position: absolute;
right: 10px;
width: 30px;
z-index: 5;
&:hover {
@include alpha-property(background, $black, .1);
}
span {
font-family: 'Open Sans', sans-serif;
line-height: 10px;
&:focus {
border-color: $light-gray;
box-shadow: none;
}
}
.btn {
&.btn-primary {
float: right;
margin: -4px 25px 0 0;
position: relative;
font-size: 13px;
i {
&.btn-default {
background: transparent;
border: none;
}
}
.info__label {
font-weight: 600;
padding-right: 0;
text-align: right;
}
.team-member-list {
width: 100%;
}
.remove__member {
color: $dark-gray;
float: right;
font-size: 20px;
line-height: 0;
padding: 6px;
&:hover {
color: $red;
}
}
.modal-dialog {
margin-left: auto;
margin-right: auto;
max-width: 95%;
}
.modal-push-down {
margin-top: 5%;
}
.modal-next-bar {
height: 100%;
position: absolute;
right: 0;
top: 0;
}
.modal-header {
@include border-radius(0);
@include clearfix;
background: $primary-color;
border: 1px solid $light-gray;
color: $white;
min-height: 56px;
padding: 15px 15px 11px;
.modal-title {
color: $bg--gray;
float: left;
font-size: 17px;
line-height: 27px;
.name {
color: $white;
font-weight: 600;
}
}
.modal-action {
margin: 0;
padding: 0;
}
.close {
@include opacity(1);
@include single-transition(all, .25s, ease-in);
color: $white;
height: 30px;
line-height: 30px;
position: absolute;
right: 10px;
width: 30px;
z-index: 5;
&:hover {
@include alpha-property(background, $black, .1);
}
span {
font-family: 'Open Sans', sans-serif;
line-height: 10px;
}
}
.btn {
&.btn-primary {
float: right;
margin: -4px 25px 0 0;
position: relative;
i {
margin-right: 5px;
}
}
}
}
.no-channel-message {
padding: 2em 1em;
text-align: center;
.primary-message {
font-size: 1.25em;
}
.secondary-message {
@include opacity(.8);
margin: 1em 0 0;
}
}
.modal-content {
border-radius: 0;
box-shadow: none;
}
.modal-chevron-icon {
font-size: 120%;
top: 50%;
}
.modal-prev-bar {
height: 100%;
left: 0;
position: absolute;
top: 0;
}
&.more-channel__modal {
.modal-body {
padding: 0;
}
}
.modal-image {
height: 100%;
margin: 0 auto;
max-width: 100%;
position: relative;
width: 100%;
.modal-body {
@include clearfix;
display: table;
height: 100%;
max-height: 100%;
table-layout: fixed;
width: 100%;
}
.modal-image__wrapper {
@include border-radius(3px);
display: table-cell;
max-width: 90%;
position: relative;
text-align: center;
vertical-align: middle;
width: 100%;
&:hover {
@include border-radius(3px 3px 0 0);
}
&.default {
height: 80%;
width: 100%;
}
audio,
canvas,
progress,
video {
display: block;
height: auto;
max-width: 100%;
}
.modal-close {
@include single-transition(opacity, .6s);
@include background-size(100% 100%);
@include opacity(0);
background-image: url('../images/close.png');
cursor: pointer;
height: 37px;
position: absolute;
right: -13px;
top: -13px;
transition: opacity .6s;
width: 37px;
z-index: 9999;
&.modal-close--show {
@include opacity(1);
}
}
> div {
display: inline-block;
min-height: 100px;
min-width: 320px;
position: relative;
}
code {
min-height: 130px;
min-width: 330px;
}
pre,
code {
display: inline-block;
}
.post-body--code {
max-height: calc(100vh - 80px);
max-width: calc(100vw - 80px);
overflow: auto;
}
img {
max-height: 100%;
max-width: 100%;
}
.spinner {
.file__loading {
left: 50%;
margin-left: -16px;
margin-top: -16px;
position: absolute;
top: 50%;
z-index: 2;
}
}
}
.modal-content {
background: alpha-color($black, 0);
border: none;
box-shadow: none;
height: 100%;
padding: 0;
width: 100%;
}
.modal-image__body {
display: table-cell;
height: 100%;
overflow: visible;
padding: 0;
position: relative;
text-align: center;
vertical-align: middle;
}
.image-control {
background: url('../images/prev.png') left no-repeat;
float: left;
height: 45px;
margin-top: -23px;
position: relative;
top: 50%;
width: 50px;
&.image-next {
background: url('../images/next.png') left no-repeat;
float: right;
}
}
.loader-image {
bottom: 0;
left: 0;
margin: auto;
position: absolute;
right: 0;
top: 0;
}
.loader-percent {
bottom: 0;
color: $dark-gray;
height: 20px;
left: 0;
margin: auto;
position: absolute;
right: 0;
top: 55px;
}
.modal-button-bar {
@include single-transition(opacity, .6s);
@include border-radius(0 0 3px 3px);
@include opacity(0);
background-color: $black;
bottom: -40px;
left: 0;
line-height: 40px;
padding: 0 10px;
position: absolute;
right: 0;
&.footer--show {
@include opacity(1);
}
.image-links {
a,
span {
float: right;
}
}
.text {
bottom: 0;
color: $white;
margin-left: 5px;
vertical-align: middle;
}
.public-link {
margin-right: 5px;
}
}
}
}
.no-channel-message {
padding: 2em 1em;
text-align: center;
.primary-message {
font-size: 1.25em;
}
.secondary-message {
@include opacity(.8);
margin: 1em 0 0;
}
.invite {
margin-right: 40px;
}
.modal-content {
border-radius: 0;
box-shadow: none;
}
.modal-chevron-icon {
font-size: 120%;
top: 50%;
}
.modal-prev-bar {
height: 100%;
left: 0;
position: absolute;
top: 0;
}
&.more-channel__modal {
.modal-body {
padding: 0;
}
}
.modal-image {
height: 100%;
margin: 0 auto;
max-width: 100%;
position: relative;
width: 100%;
.modal-body {
@include clearfix;
display: table;
height: 100%;
max-height: 100%;
table-layout: fixed;
width: 100%;
}
.modal-image__wrapper {
@include border-radius(3px);
display: table-cell;
max-width: 90%;
position: relative;
text-align: center;
vertical-align: middle;
width: 100%;
&:hover {
@include border-radius(3px 3px 0 0);
}
&.default {
height: 80%;
width: 100%;
}
audio,
canvas,
progress,
video {
display: block;
height: auto;
max-width: 100%;
}
.modal-close {
@include single-transition(opacity, .6s);
@include background-size(100% 100%);
@include opacity(0);
background-image: url('../images/close.png');
cursor: pointer;
height: 37px;
position: absolute;
right: -13px;
top: -13px;
transition: opacity .6s;
width: 37px;
z-index: 9999;
&.modal-close--show {
@include opacity(1);
}
}
> div {
display: inline-block;
min-height: 100px;
min-width: 320px;
position: relative;
}
code {
min-height: 130px;
min-width: 330px;
}
pre, code {
display: inline-block;
}
.post-body--code {
max-height: calc(100vh - 80px);
max-width: calc(100vw - 80px);
overflow: auto;
}
img {
max-height: 100%;
max-width: 100%;
}
.spinner {
.file__loading {
left: 50%;
margin-left: -16px;
margin-top: -16px;
position: absolute;
top: 50%;
z-index: 2;
}
}
}
.modal-content {
background: alpha-color($black, 0);
border: none;
box-shadow: none;
height: 100%;
padding: 0;
width: 100%;
}
.modal-image__body {
display: table-cell;
height: 100%;
overflow: visible;
padding: 0;
position: relative;
text-align: center;
vertical-align: middle;
}
.image-control {
background: url('../images/prev.png') left no-repeat;
float: left;
height: 45px;
margin-top: -23px;
position: relative;
top: 50%;
width: 50px;
&.image-next {
background: url('../images/next.png') left no-repeat;
float: right;
}
}
.loader-image {
bottom: 0;
left: 0;
margin: auto;
position: absolute;
right: 0;
top: 0;
}
.loader-percent {
bottom: 0;
color: $dark-gray;
height: 20px;
left: 0;
margin: auto;
position: absolute;
right: 0;
top: 55px;
}
.modal-button-bar {
@include single-transition(opacity, .6s);
@include border-radius(0 0 3px 3px);
@include opacity(0);
background-color: $black;
bottom: -40px;
left: 0;
line-height: 40px;
padding: 0 10px;
position: absolute;
right: 0;
&.footer--show {
@include opacity(1);
}
.image-links {
a,
span {
float: right;
}
}
.text {
bottom: 0;
color: $white;
margin-left: 5px;
vertical-align: middle;
}
.public-link {
margin-right: 5px;
}
}
}
}
// Invite New Member
.invite {
margin-right: 40px;
}
.row--invite {
@include clearfix;
margin-right: 40px;
.col-sm-6 {
padding: 0 0 0 15px;
&:first-child {
padding-left: 0;
}
}
}
.more-modal {
.user-list {
margin-top: 10px;
overflow-x: hidden;
overflow-y: auto;
position: relative;
}
.modal-body {
overflow-x: hidden;
padding: 10px 0 20px;
}
.filter-row {
.row--invite {
@include clearfix;
margin: 10px 0;
margin-right: 40px;
.col-sm-6 {
padding: 0 0 0 15px;
&:first-child {
padding-left: 0;
}
}
}
.member-count {
@include opacity(.8);
float: right;
margin-top: 5px;
.more-modal {
.user-list {
margin-top: 10px;
overflow-x: hidden;
overflow-y: auto;
position: relative;
}
.modal-body {
overflow-x: hidden;
padding: 10px 0 20px;
}
.filter-row {
@include clearfix;
margin: 10px 0;
}
.member-count {
@include opacity(.8);
float: right;
margin-top: 5px;
}
.more-purpose {
@include opacity(.7);
}
}
.more-purpose {
@include opacity(.7);
}
}
.more-modal__list {
display: flex;
flex-direction: column;
overflow: auto;
.more-modal__list {
display: flex;
flex-direction: column;
overflow: auto;
.popover & {
font-size: .95em;
.popover & {
font-size: .95em;
.more-modal__row {
padding: 5px 10px;
}
.more-modal__row {
padding: 5px 10px;
.more-modal__name {
font-weight: normal;
}
}
.more-modal__image {
@include border-radius(60px);
flex-grow: 0;
flex-shrink: 0;
margin-right: 8px;
}
.more-modal__details {
flex-grow: 1;
flex-shrink: 1;
overflow: hidden;
text-overflow: ellipsis;
}
.more-modal__actions {
flex-grow: 0;
flex-shrink: 0;
padding-left: 20px;
}
.more-modal__name {
font-weight: normal;
font-size: .95em;
font-weight: 600;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.more-modal__description {
@include opacity(.7);
display: block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.more-modal__row {
border-bottom: 1px solid $light-gray;
display: flex;
padding: 8px 15px;
}
p {
@include opacity(.8);
font-size: .9em;
margin: 5px 0;
overflow: hidden;
text-overflow: ellipsis;
}
}
.more-modal__image {
@include border-radius(60px);
flex-grow: 0;
flex-shrink: 0;
margin-right: 8px;
}
.more-modal__details {
flex-grow: 1;
flex-shrink: 1;
overflow: hidden;
text-overflow: ellipsis;
}
.more-modal__actions {
flex-grow: 0;
flex-shrink: 0;
padding-left: 20px;
}
.more-modal__name {
font-size: .95em;
font-weight: 600;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.more-modal__description {
@include opacity(.7);
display: block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.more-modal__row {
border-bottom: 1px solid $light-gray;
.filtered-user-list {
display: flex;
padding: 8px 15px;
flex-direction: column;
.filter-row {
flex-grow: 0;
flex-shrink: 0;
}
.user-list {
flex-grow: 1;
flex-shrink: 1;
}
}
p {
@include opacity(.8);
font-size: .9em;
margin: 5px 0;
overflow: hidden;
text-overflow: ellipsis;
}
}
.filtered-user-list {
display: flex;
flex-direction: column;
.filter-row {
flex-grow: 0;
flex-shrink: 0;
}
.user-list {
flex-grow: 1;
flex-shrink: 1;
}
}

View File

@@ -6,14 +6,6 @@
}
}
.sidebar--right {
&.move--left {
.search-bar__container {
padding-right: 42px;
}
}
}
.search-bar__container {
@include flex(0 0 56px);
padding: 12px 8px 0 0;

View File

@@ -251,138 +251,162 @@
}
}
.modal {
.info__label {
padding-bottom: 5px;
text-align: left;
}
.modal-header {
.modal-action {
margin-top: 10px;
.app__body {
.modal {
.info__label {
padding-bottom: 5px;
text-align: left;
}
button.close {
font-size: 27px;
font-weight: normal;
}
.modal-image {
.modal-button-bar {
line-height: 30px;
padding: 5px;
}
.modal-title {
float: none;
max-width: 90%;
}
.image-wrapper {
> div {
font-size: 12px;
min-width: 250px;
}
.btn {
&.btn-primary {
display: block;
float: none;
margin: 10px 0 6px;
width: 100%;
.modal-close {
@include opacity(1);
}
}
.modal-button-bar {
@include opacity(1);
}
}
}
.settings-modal {
&.display--content {
.modal-header {
display: none;
.modal-header {
.modal-action {
margin-top: 10px;
}
button.close {
font-size: 27px;
font-weight: normal;
}
.modal-title {
float: none;
max-width: 90%;
}
.btn {
&.btn-primary {
display: block;
float: none;
margin: 10px 0 6px;
width: 100%;
}
}
}
.settings-modal {
&.display--content {
.modal-header {
display: none;
}
.settings-table {
display: block;
.settings-content {
&.minimize-settings {
display: block;
}
.section-min:hover {
background: none;
}
.no-padding--left {
padding-left: 15px;
}
}
.settings-links {
display: none;
}
.modal-header {
display: block;
position: absolute;
top: 0;
width: 100%;
z-index: 5;
.modal-title {
text-align: center;
width: 100%;
}
}
.user-settings {
.tab-header {
display: none;
}
.divider-dark.first {
display: none;
}
}
}
}
.settings-table {
display: block;
padding: 0;
.nav {
position: relative;
top: auto;
width: 100%;
&.position--top {
top: auto;
}
}
.settings-content {
.section-edit {
position: absolute;
top: 14px;
right: 0;
padding-right: 0;
.fa {
display: inline-block;
}
}
&.minimize-settings {
display: block;
padding: 0;
display: none;
.user-settings {
padding: 70px 20px 30px;
}
}
.section-min:hover {
background: none;
}
.no-padding--left {
padding-left: 15px;
background: none !important;
}
}
.settings-links {
display: none;
}
.nav {
> li {
> a {
border-top: 1px solid #dddddd;
font-size: 1.1em;
line-height: 2.7;
color: #555555;
.modal-header {
display: block;
position: absolute;
top: 0;
width: 100%;
z-index: 5;
.modal-title {
text-align: center;
width: 100%;
}
}
.user-settings {
.tab-header {
display: none;
}
.divider-dark.first {
display: none;
}
}
}
}
.settings-table {
padding: 0;
.nav {
position: relative;
top: auto;
width: 100%;
&.position--top {
top: auto;
}
}
.settings-content {
.section-edit {
position: absolute;
top: 14px;
right: 0;
padding-right: 0;
.fa {
display: inline-block;
}
}
&.minimize-settings {
padding: 0;
display: none;
.user-settings {
padding: 70px 20px 30px;
}
}
.section-min:hover {
background: none !important;
}
}
.nav {
> li {
> a {
border-top: 1px solid #dddddd;
font-size: 1.1em;
line-height: 2.7;
color: #555555;
.glyphicon {
margin-left: 7px;
.glyphicon {
margin-left: 7px;
}
}
}
}
@@ -752,25 +776,6 @@
}
}
.modal {
.modal-image {
.image-wrapper {
> div {
font-size: 12px;
min-width: 250px;
}
.modal-close {
@include opacity(1);
}
}
.modal-button-bar {
@include opacity(1);
}
}
}
.app__content {
padding-top: 45px;
margin: 0;
@@ -798,36 +803,38 @@
}
@media screen and (max-width: 640px) {
.modal {
.about-modal {
.about-modal__content {
display: block;
}
.app__body {
.modal {
.about-modal {
.about-modal__content {
display: block;
}
.about-modal__hash {
p {
word-break: break-all;
.about-modal__hash {
p {
word-break: break-all;
&:first-child {
float: none;
&:first-child {
float: none;
}
}
}
}
.about-modal__logo {
float: none;
padding: 0;
text-align: center;
width: 100%;
.about-modal__logo {
float: none;
padding: 0;
text-align: center;
width: 100%;
svg {
height: 100px;
width: 100px;
svg {
height: 100px;
width: 100px;
}
}
}
.about-modal__logo + div {
padding: 2em 0 0;
.about-modal__logo + div {
padding: 2em 0 0;
}
}
}
}
@@ -890,15 +897,27 @@
}
}
.modal {
.settings-modal {
.settings-table {
.security-links {
display: block;
margin-bottom: 10px;
.app__body {
.modal {
.settings-modal {
&.display--content {
.modal-body {
max-height: 90%;
}
}
&:last-child {
margin-bottom: 0;
.modal-body {
max-height: 70%;
}
.settings-table {
.security-links {
display: block;
margin-bottom: 10px;
&:last-child {
margin-bottom: 0;
}
}
}
}
@@ -909,20 +928,6 @@
min-height: 350px;
}
.modal {
.modal-body {
max-height: 70%;
}
.settings-modal {
&.display--content {
.modal-body {
max-height: 90%;
}
}
}
}
.member-div {
padding: 8px 0;
@@ -951,15 +956,6 @@
@include translate3d(260px, 0, 0);
}
}
.modal {
.modal-image {
.modal-button-bar {
line-height: 30px;
padding: 5px;
}
}
}
}
@media screen and (max-height: 640px) {

View File

@@ -1,78 +1,82 @@
@charset 'UTF-8';
.modal {
.about-modal {
.modal-header {
background: transparent;
border: none;
color: inherit;
padding: 20px 25px 0;
.app__body {
.close {
.modal {
.about-modal {
.modal-header {
background: transparent;
border: none;
color: inherit;
font-weight: normal;
right: 15px;
padding: 20px 25px 0;
.close {
color: inherit;
font-weight: normal;
right: 15px;
}
.modal-title {
color: inherit;
font-size: 16px;
}
}
.modal-title {
color: inherit;
font-size: 16px;
.modal-body {
padding: 20px 25px 5px;
}
}
.modal-body {
padding: 20px 25px 5px;
}
.about-modal__content {
@include clearfix;
@include display-flex;
@include flex-direction(row);
padding: 1em 0 3em;
}
.about-modal__content {
@include clearfix;
@include display-flex;
@include flex-direction(row);
padding: 1em 0 3em;
}
.about-modal__copyright {
@include opacity(.6);
margin-top: .5em;
}
.about-modal__copyright {
@include opacity(.6);
margin-top: .5em;
}
.about-modal__footer {
font-size: 13.5px;
}
.about-modal__footer {
font-size: 13.5px;
}
.about-modal__title {
line-height: 1.5;
margin: 0 0 10px;
}
.about-modal__title {
line-height: 1.5;
margin: 0 0 10px;
}
.about-modal__subtitle {
@include opacity(.6);
}
.about-modal__subtitle {
@include opacity(.6);
}
.about-modal__hash {
@include opacity(.4);
font-size: .75em;
text-align: right;
.about-modal__hash {
@include opacity(.4);
font-size: .75em;
text-align: right;
p {
&:first-child {
float: left;
}
}
}
p {
&:first-child {
float: left;
.about-modal__logo {
@include opacity(.9);
padding: 0 40px 0 20px;
svg {
height: 125px;
width: 125px;
}
path {
fill: inherit;
}
}
}
.about-modal__logo {
@include opacity(.9);
padding: 0 40px 0 20px;
svg {
height: 125px;
width: 125px;
}
path {
fill: inherit;
}
}
}
}
}