merge branch heads

scm-ui/ui-components/src/BranchSelector.js

@@ -57,7 +57,7 @@ export default class BranchSelector extends React.Component<Props, State> {
           </ZeroflexFieldLabel>
           <div className="field-body">
             <NoBottomMarginField className={classNames("field", "is-narrow")}>
-              <MinWidthControl classname="control">
+              <MinWidthControl className="control">
                 <DropDown
                   className="is-fullwidth"
                   options={branches.map(b => b.name)}

scm-ui/ui-components/src/CardColumnGroup.js

@@ -73,7 +73,7 @@ export default class CardColumnGroup extends React.Component<Props, State> {
       });
     }
     return (
-      <Container className={classNames("is-clearfix")}>
+      <Container>
         <h2>
           <span
             className={classNames("is-size-4", "has-cursor-pointer")}
@@ -86,6 +86,7 @@ export default class CardColumnGroup extends React.Component<Props, State> {
         <Wrapper className={classNames("columns", "is-multiline")}>
           {content}
         </Wrapper>
+        <div className="is-clearfix" />
       </Container>
     );
   }

scm-ui/ui-components/src/DateFromNow.js

@@ -36,7 +36,8 @@ class DateFromNow extends React.Component<Props> {
   createOptions = () => {
     const locale = this.getLocale();
     return {
-      locale
+      locale,
+      addSuffix: true
     };
   };
 

scm-ui/ui-components/src/Loading.js

@@ -10,12 +10,14 @@ type Props = {
 };
 
 const Wrapper = styled.div`
+  flex-direction: column;
   align-items: center;
   justify-content: center;
   min-height: 256px;
 `;
 
 const FixedSizedImage = styled(Image)`
+  margin-bottom: 0.75rem;
   width: 128px;
   height: 128px;
 `;

scm-ui/ui-components/src/repos/changesets/ChangesetRow.js

@@ -43,6 +43,7 @@ const FixedSizedAvatar = styled.div`
 
 const Metadata = styled.div`
   margin-left: 0;
+  width: 100%;
 `;
 
 const AuthorWrapper = styled.p`