diff options
author | Corey Hulen <corey@hulen.com> | 2016-02-26 11:46:00 -0800 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-02-26 11:46:00 -0800 |
commit | 3925e7cac2c552d911afeed208d2eb865fdb2ad3 (patch) | |
tree | 835839d88f701623740a908e6cc5e09702a8915f /web | |
parent | ce5ea641aafa269aad44d1d3dd31db30e8fc2b04 (diff) | |
parent | a2f3d3f64f8e23354d09f4faed7999afccaf096c (diff) | |
download | chat-3925e7cac2c552d911afeed208d2eb865fdb2ad3.tar.gz chat-3925e7cac2c552d911afeed208d2eb865fdb2ad3.tar.bz2 chat-3925e7cac2c552d911afeed208d2eb865fdb2ad3.zip |
Merge pull request #2266 from asaadmahmoodspin/ui-improvements
PLT-2151 - Fixing tutorial for other language
Diffstat (limited to 'web')
-rw-r--r-- | web/react/components/tutorial/tutorial_intro_screens.jsx | 42 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_modal.scss | 1 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_tutorial.scss | 17 |
3 files changed, 29 insertions, 31 deletions
diff --git a/web/react/components/tutorial/tutorial_intro_screens.jsx b/web/react/components/tutorial/tutorial_intro_screens.jsx index 2bacdeb28..45ebceb28 100644 --- a/web/react/components/tutorial/tutorial_intro_screens.jsx +++ b/web/react/components/tutorial/tutorial_intro_screens.jsx @@ -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> diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index 2136b9ffb..09c366c77 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -46,7 +46,6 @@ } td { width: 100%; - white-space: nowrap; @include legacy-pie-clearfix; text-overflow: ellipsis; padding: 8px 8px 8px 15px; diff --git a/web/sass-files/sass/partials/_tutorial.scss b/web/sass-files/sass/partials/_tutorial.scss index 1f93fc6a9..b21a2b7c3 100644 --- a/web/sass-files/sass/partials/_tutorial.scss +++ b/web/sass-files/sass/partials/_tutorial.scss @@ -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; } } |