Skip to content

Commit 08e9646

Browse files
committed
Auto merge of #2456 - Turbo87:header, r=pichfl
Shrink page header height ### Before <img width="1032" alt="Bildschirmfoto 2020-04-26 um 20 46 12" src="https://user-images.githubusercontent.com/141300/80316610-0647cb00-87ff-11ea-98c1-618ca5172b8b.png"> ### After <img width="1107" alt="Bildschirmfoto 2020-04-26 um 20 45 50" src="https://user-images.githubusercontent.com/141300/80316612-08118e80-87ff-11ea-8dd5-fbac985187a8.png"> r? @locks
2 parents c5fc716 + 255317a commit 08e9646

File tree

2 files changed

+19
-13
lines changed

2 files changed

+19
-13
lines changed

app/styles/application.module.css

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,9 @@ noscript {
7575
composes: width-limit;
7676

7777
display: grid;
78-
grid-template-columns: auto auto 1fr auto;
78+
grid-template-columns: auto 1fr auto;
7979
align-items: center;
80+
padding: 10px;
8081
color: white;
8182

8283
a {
@@ -85,9 +86,19 @@ noscript {
8586
}
8687
}
8788

88-
.subtitle {
89-
display: block;
90-
font-size: x-small;
89+
.index-link {
90+
display: flex;
91+
align-items: center;
92+
93+
h1 {
94+
font-size: 24px;
95+
}
96+
}
97+
98+
.logo {
99+
width: 60px;
100+
height: auto;
101+
margin-right: 10px;
91102
}
92103

93104
.desktop-search-form {
@@ -119,7 +130,7 @@ input.search {
119130
.mobile-search {
120131
display: none;
121132
grid-row: 2;
122-
grid-column: span 4;
133+
grid-column: span 3;
123134
margin: 0 10px 10px;
124135

125136
input.search {

app/templates/application.hbs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,9 @@
33
{{title "crates.io: Rust Package Registry" separator=' - ' prepend=true}}
44

55
<header local-class="header">
6-
<LinkTo @route="index" @tabindex="-1">
7-
<img src="/assets/Cargo-Logo-Small.png" height="100" width="100" alt="Cargo Logo">
8-
</LinkTo>
9-
<LinkTo @route="index">
10-
<h1>
11-
crates.io
12-
<span local-class="subtitle">Rust Package Registry</span>
13-
</h1>
6+
<LinkTo @route="index" local-class="index-link">
7+
<img src="/assets/Cargo-Logo-Small.png" role="presentation" alt="" local-class="logo">
8+
<h1>crates.io</h1>
149
</LinkTo>
1510

1611
<form local-class="desktop-search-form" action='/search' {{ action "search" on="submit" }} data-test-search-form>

0 commit comments

Comments
 (0)