Skip to content

Commit

Permalink
Merge pull request #2437 from rhamilto/page-header
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue.

Fix bugs with headings

More cleanup of bugs I made with #2389.  I should have caught these the first two times.  But on the up side, that's one more commit for the leaderboard.  ;-)

Before:
![screen shot 2017-11-02 at 12 12 59 pm](https://user-images.githubusercontent.com/895728/32337087-6e285c56-bfc7-11e7-853f-0c0246f86aee.PNG)
![screen shot 2017-11-02 at 12 12 48 pm](https://user-images.githubusercontent.com/895728/32337088-6e34ffe2-bfc7-11e7-8019-a27fd057f58e.PNG)
![screen shot 2017-11-02 at 12 12 41 pm](https://user-images.githubusercontent.com/895728/32337089-6e3e7e5a-bfc7-11e7-8b39-0c897aa8e702.PNG)


After:
![screen shot 2017-11-02 at 12 12 06 pm](https://user-images.githubusercontent.com/895728/32337079-687fd8b0-bfc7-11e7-8054-ad158a64ddf1.PNG)
![screen shot 2017-11-02 at 12 12 14 pm](https://user-images.githubusercontent.com/895728/32337080-688ff8da-bfc7-11e7-8ac1-0d19e71fd6e5.PNG)
![screen shot 2017-11-02 at 12 12 20 pm](https://user-images.githubusercontent.com/895728/32337081-689ba860-bfc7-11e7-89d9-9540e5bcbc51.PNG)
  • Loading branch information
openshift-merge-robot authored Nov 2, 2017
2 parents dfd3293 + 6a62d55 commit 424cf01
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
19 changes: 8 additions & 11 deletions app/styles/_sidebar-right.less
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@
}
}
.events-sidebar-collapse {
font-size: 16px;
margin-right: 10px;
margin-left: 3px;
margin-right: 8px;

a {
text-decoration: none;
Expand All @@ -140,10 +140,11 @@
justify-content: space-between;
// So that sidebar bottom border aligns with main content header bottom border.
margin-top: 0;
padding-bottom: 21px;
padding-top: 24px;
padding-bottom: 22px;
padding-top: 27px;
h2 {
font-size: 14px;
line-height: 1;
margin-bottom: 0;
margin-top: 0;
}
Expand All @@ -155,7 +156,7 @@
}
}
.event-details-link {
.small();
font-size: 11px;
line-height: 1;
margin-right: 20px;
}
Expand Down Expand Up @@ -221,10 +222,6 @@
}
}

.events-sidebar-expand {
font-size: 16px;

a {
text-decoration: none;
}
.events-sidebar-expand a {
text-decoration: none;
}
3 changes: 3 additions & 0 deletions app/styles/_typography.less
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Page header
// --------------------------------------------------
.console-os {
breadcrumbs + .page-header {
padding-top: 0;
}
.page-header {
border-color: @page-header-border-color;
margin-bottom: 0;
Expand Down
10 changes: 5 additions & 5 deletions dist/styles/main.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 424cf01

Please sign in to comment.