IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

UI changes for various tickets

Browse Source
This commit is contained in:
Asaad Mahmood
2015-09-08 21:12:36 +05:00
parent 5b3ee66dc3
commit 62940fb72f
7 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web/react/components/setting_upload.jsx
View File

@@ -64,9 +64,9 @@ export default class SettingsUpload extends React.Component {
}
return (
<ul className='section-max'>
<li className='col-xs-12 section-title'>{this.props.title}</li>
<li className='col-xs-offset-3'>{this.props.helpText}</li>
<li className='col-xs-offset-3 col-xs-8'>
<li className='col-sm-12 section-title'>{this.props.title}</li>
<li className='col-sm-offset-3 col-sm-9'>{this.props.helpText}</li>
<li className='col-sm-offset-3 col-sm-9'>
<ul className='setting-list'>
<li className='setting-list-item'>
<span className='btn btn-sm btn-primary btn-file sel-btn'>

6
web/react/components/team_import_tab.jsx
View File

@@ -34,11 +34,7 @@ export default class TeamImportTab extends React.Component {
render() {
var uploadHelpText = (
<div>
<br/>
Slack does not allow you to export files, images, private groups or direct messages stored in Slack. Therefore, Slack import to Mattermost only supports importing of text messages in your Slack team's public channels.
<br/><br/>
The Slack import to Mattermost is in "Preview". Slack bot posts and channels with underscores do not yet import.
<br/><br/>
<p>Slack does not allow you to export files, images, private groups or direct messages stored in Slack. Therefore, Slack import to Mattermost only supports importing of text messages in your Slack team's public channels. </p> <p>The Slack import to Mattermost is in "Preview". Slack bot posts and channels with underscores do not yet import. </p>
</div>
);
var uploadSection = (

4
web/sass-files/sass/partials/_modal.scss
View File

@@ -63,7 +63,6 @@
margin: 0;
}
button.close {
margin: -2px -2px 0 0;
color: #fff;
@include opacity(1);
z-index: 5;
@@ -71,7 +70,8 @@
height: 30px;
line-height: 30px;
@include single-transition(all, 0.25s, ease-in);
position: relative;
position: absolute;
right: 10px;
&:hover {
background: rgba(0, 0, 0, 0.1);
}

2
web/sass-files/sass/partials/_post.scss
View File

@@ -140,7 +140,7 @@ body.ios {
padding: 1em 0 0;
position: relative;
-webkit-overflow-scrolling: touch;
&.hide-scroll::-webkit-scrollbar {
&::-webkit-scrollbar {
width: 0px !important;
}
}

9
web/sass-files/sass/partials/_responsive.scss
View File

@@ -365,6 +365,9 @@
width: 100%;
z-index: 5;
}
.modal-title {
padding-left: 15px;
}
.user-settings {
.tab-header {
display: none;
@@ -513,6 +516,12 @@
height: 45px;
position: relative;
@include single-transition(all, 0.2s, linear);
.glyphicon-refresh-animate {
right: 33px;
top: 15px;
color: #fff;
color: rgba(255,255,255,0.5);
}
.form-control {
border: none;
padding: 0 10px 0 31px;

16
web/sass-files/sass/partials/_settings.scss
View File

@@ -14,13 +14,15 @@
width:800px;
max-width: 100%;
.modal-back {
width: 8px;
height: 13px;
background: url("../images/arrow-left.png");
@include background-size(100% 100%);
margin-right: 10px;
display: inline-block;
width: 40px;
height: 56px;
background: url("../images/arrow-left.png") no-repeat;
@include background-size(8px 13px);
background-position: center;
top: 0;
left: 0;
cursor: pointer;
position: absolute;
}
.modal-body {
padding: 0;
@@ -59,7 +61,7 @@
.section-max {
background: #f2f2f2;
padding: 1em 0;
padding: 1em 0 1.3em;
margin-bottom: 0;
@include clearfix;
.section-title {

4
web/sass-files/sass/partials/_sidebar--left.scss
View File

@@ -10,6 +10,10 @@
&.sidebar--padded {
padding-top: 44px;
}
.dropdown-menu {
max-height: 300px;
overflow: auto;
}
.search__form {
margin: 0;
padding: 1em 1em 0;