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

Merge pull request #2266 from asaadmahmoodspin/ui-improvements

Browse Source 
PLT-2151 - Fixing tutorial for other language
This commit is contained in:
Corey Hulen
2016-02-26 11:46:00 -08:00
parent ce5ea641aa a2f3d3f64f
commit 3925e7cac2
3 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
web/react/components/tutorial/tutorial_intro_screens.jsx
View File

@@ -211,26 +211,28 @@ export default class TutorialIntroScreens extends React.Component {
<div className='tutorial__content'>
<div className='tutorial__steps'>
{screen}
<button
className='btn btn-primary'
tabIndex='1'
onClick={this.handleNext}
>
<FormattedMessage
id='tutorial_intro.next'
defaultMessage='Next'
/>
</button>
<a
className='tutorial-skip'
href='#'
onClick={this.skipTutorial}
>
<FormattedMessage
id='tutorial_intro.skip'
defaultMessage='Skip tutorial'
/>
</a>
<div className='tutorial__footer'>
<button
className='btn btn-primary'
tabIndex='1'
onClick={this.handleNext}
>
<FormattedMessage
id='tutorial_intro.next'
defaultMessage='Next'
/>
</button>
<a
className='tutorial-skip'
href='#'
onClick={this.skipTutorial}
>
<FormattedMessage
id='tutorial_intro.skip'
defaultMessage='Skip tutorial'
/>
</a>
</div>
</div>
</div>
</div>

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

@@ -46,7 +46,6 @@
}
td {
width: 100%;
white-space: nowrap;
@include legacy-pie-clearfix;
text-overflow: ellipsis;
padding: 8px 8px 8px 15px;

17
web/sass-files/sass/partials/_tutorial.scss
View File

@@ -32,7 +32,7 @@
&.tip-overlay--sidebar {
max-width: 75%;
margin: 50px 0 0 10px;
min-height: 310px;
min-height: 330px;
.tutorial__footer {
position: absolute;
width: 100%;
@@ -165,17 +165,16 @@
.tutorial__steps {
position: relative;
max-width: 310px;
min-height: 350px;
min-height: 370px;
margin-bottom: 50px;
text-align: left;
display: inline-block;
padding-bottom: 30px;
}
.btn-primary {
position: absolute;
bottom: 0px;
}
}
.tutorial__footer {
position: absolute;
bottom: 0;
}
h1 {
font-size: em(40px);
margin: -20px 0 30px;
@@ -191,9 +190,7 @@
bottom: 40px;
}
.tutorial-skip {
position: absolute;
bottom: 7px;
left: 80px;
margin-left: 13px;
}
}