Merge commit 'b5fa117265f7e500aedaf3409e9ef47d3c4cfce6' into HEAD

zanata · May 25, 2018 · b3b2f6e · b3b2f6e
2 parents 06d4120 + b5fa117
commit b3b2f6e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/server/zanata-frontend/src/app/containers/UserProfile/index.jsx b/server/zanata-frontend/src/app/containers/UserProfile/index.jsx
@@ -107,11 +107,11 @@ class UserProfile extends Component {
                 {email}
               </li>)}
               {languageTeams &&
-              (<li id='profileLanguages'>
+              (<ul id='profileLanguages'>
                 <Icon name='language' className='s0' title='Spoken languages'
                   parentClassName='iconLanguage u-pullLeft' />
-                {languageTeams}
-              </li>)}
+                <li>{languageTeams}</li>
+              </ul>)}
               {roles && isLoggedIn &&
               (<li className='u-flexCenter' id='profileRoles' title='Roles'>
                 <Icon name='users' className='s0' />

diff --git a/server/zanata-frontend/src/app/containers/UserProfile/index.less b/server/zanata-frontend/src/app/containers/UserProfile/index.less
@@ -66,6 +66,7 @@
   }
   #profileLanguages a {
     display: block;
+    padding-right: @spacing-rq;
   }
   #profileLanguages .iconLanguage {
     padding-right: @spacing-rq;
@@ -91,6 +92,7 @@
     margin-left: auto;
     float: right;
     overflow: hidden;
+    width: 30%;
   }
   .userProfile .userProfile-details-text {
     margin-right: @spacing-rq;
@@ -105,6 +107,7 @@
   }
   ul.largeFontList {
     padding-left: 0;
+    overflow: hidden;
   }
   span.userProfile-email {
     margin-left: @spacing-rh;