Skip to content

fix(ui): sentry 9 polish pass #2 #8388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
May 10, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class ProjectHeader extends React.Component {

return (
<div className="sub-header flex flex-container flex-vertically-centered">
<div className="project-header p-t-1">
<div className="project-header">
<div className="project-header-main">
<div className="project-select-wrapper">
<ProjectSelector organization={org} projectId={project.slug} />
Expand Down Expand Up @@ -123,6 +123,7 @@ class ProjectHeader extends React.Component {
<MenuItem
onClick={clearActiveEnvironment}
className={activeEnvironment === null && 'active'}
linkClassName="truncate"
>
{allEnvironmentsLabel}
</MenuItem>
Expand All @@ -135,6 +136,7 @@ class ProjectHeader extends React.Component {
activeEnvironment.name === env.name &&
'active'
}
linkClassName="truncate"
>
{env.displayName}
</MenuItem>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -272,11 +272,7 @@ const ProjectSelector = createReactClass({
let orgId = org.slug;
let projectId = project.slug;

return (
<span>
<Link to={`/${orgId}/${projectId}/`}>{label}</Link>
</span>
);
return <Link to={`/${orgId}/${projectId}/`}>{label}</Link>;
},

renderProjectList({organization: org, projects, filter, hasProjectWrite}) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,8 @@ const StyledAvatar = styled(Avatar)`
margin-top: 2px;
margin-bottom: 2px;
margin-right: ${p => (p.collapsed ? '0' : '12px')};
box-shadow: 0 2px 0 rgba(0, 0, 0, 0.08);
border-radius: 4px;
`;

const OrgAndUserMenu = styled('div')`
Expand Down
10 changes: 7 additions & 3 deletions src/sentry/static/sentry/less/layout.less
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,8 @@ body.auth {

.project-header {
display: flex;
margin-top: 18px;

&-main {
flex-grow: 1;
}
Expand All @@ -240,6 +242,7 @@ body.auth {
font-weight: normal;
display: block;
margin-top: 8px;
margin-bottom: 8px;
}
}
}
Expand All @@ -251,7 +254,7 @@ body.auth {

.project-select-bookmark {
border-left: 1px solid @gray-lightest;
padding-left: 10px;
padding-left: 15px;
margin-left: 10px;
color: @40;
&.active {
Expand All @@ -265,6 +268,7 @@ body.auth {

+ .dropdown-menu {
z-index: @zindex-sticky-bar + 2;
width: 172px;
}
}

Expand Down Expand Up @@ -294,14 +298,14 @@ body.auth {
z-index: 2;

a {
padding-bottom: 13px;
padding-bottom: 10px;
}
}
}

.project-select-wrapper + .nav-tabs,
#blk_projectselect + .nav-tabs {
margin-top: 10px;
margin-top: 12px;
}

.align-right {
Expand Down
7 changes: 4 additions & 3 deletions src/sentry/static/sentry/less/shared-components.less
Original file line number Diff line number Diff line change
Expand Up @@ -1158,8 +1158,8 @@ table.integrations {
h3 {
font-size: 20px;
margin: 0;
position: relative;
top: 2px;
display: flex;
align-items: center;

a {
color: @gray-dark;
Expand Down Expand Up @@ -1188,6 +1188,7 @@ table.integrations {

.project-dropdown {
position: static;
height: 24px;

.dropdown-toggle {
height: 23px;
Expand Down Expand Up @@ -2419,7 +2420,7 @@ header + .alert {
margin: 0;
border: 0;
background: none;
color: @gray;
color: @60;
min-width: 30px;
text-align: center;

Expand Down
7 changes: 3 additions & 4 deletions src/sentry/static/sentry/less/stream.less
Original file line number Diff line number Diff line change
Expand Up @@ -896,7 +896,7 @@

.dropdown-menu {
max-width: 350px;
min-width: 250px;
min-width: 275px;

.row {
margin: 8px 5px 5px;
Expand Down Expand Up @@ -940,10 +940,10 @@

.dropdown-toggle {
.btn-default;
width: 168px;
width: 176px;
font-size: 14px;
border: 1px solid lighten(@gray-lighter, 7);
padding: 6px 12px;
padding: 6px 8px;
border-radius: 3px;

display: block;
Expand Down Expand Up @@ -989,7 +989,6 @@
*/

.stream-header {
margin-top: -2px;
margin-bottom: 15px;
}

Expand Down