Skip to content

Commit

Permalink
Merge commit '2121b0f6edf152788de2ada6a9b833ffd70e552b' into HEAD
Browse files Browse the repository at this point in the history
  • Loading branch information
Zanata Build Server committed Jul 25, 2018
2 parents 3ff4418 + 2121b0f commit dd267b7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -133,17 +133,17 @@ class ViewHeader extends Component {
permission.canUpdateEntry || permission.canDeleteEntry)
const icon = isReadOnly && (
<span title='read-only'>
<Icon type='lock' className='s1 lock' />
<Icon type='lock' className='s1 lock mr3' />
</span>)
const showDeleteAll = permission.canDeleteEntry && !isEmptyTerms

const projectUrl = project && getProjectUrl(project.id)

const projectLink = project && (
<div className='projectLink'>
<div className='ml3 projectLink'>
<Link icon='project' link={projectUrl} useHref>
<Row>
<Icon type='folder-open' className='iconProject' />
<Icon type='folder-open' className='txt-muted mr1' />
<span className='hidden-lesm'>{project.name}</span>
</Row>
</Link>
Expand Down
4 changes: 4 additions & 0 deletions server/zanata-frontend/src/app/containers/Glossary/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@
margin-right: @spacing-sm;
width: 4.5rem;
}
.innerView h1 .ant-row {
display: flex;
align-items: center;
}
.glossarySelect {
position: relative;
z-index: 999;
Expand Down

0 comments on commit dd267b7

Please sign in to comment.