Skip to content

Adjust styling of the "main" section #2455

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.

Sign up for GitHub

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 3 commits into from
Apr 26, 2020
Merged

Adjust styling of the "main" section #2455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b4601ab
Use `<header>` for the header and `<nav>` for the navigation
Turbo87 Apr 26, 2020
ca91568
Use CSS grid for the `header` element
Turbo87 Apr 26, 2020
93d707b
Span `main` area horizontally across the whole page
Turbo87 Apr 26, 2020
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
38 changes: 22 additions & 16 deletions app/styles/application.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,20 +64,20 @@ noscript {
padding: 10px 0;
}

.application {
.width-limit {
width: 960px;
@media only screen and (max-width: 960px) {
width: 100%;
}
}

.header {
color: white;
position: relative;
height: 100px;
display: flex;
composes: width-limit;

display: grid;
grid-template-columns: auto auto 1fr auto;
align-items: center;
justify-content: space-between;
color: white;

a {
color: white; text-decoration: none;
Expand Down Expand Up @@ -118,9 +118,9 @@ input.search {

.mobile-search {
display: none;
margin-bottom: 10px;
margin-left: 5px;
margin-right: 5px;
grid-row: 2;
grid-column: span 4;
margin: 0 10px 10px;

input.search {
margin: 0;
Expand Down Expand Up @@ -192,19 +192,24 @@ input.search {

.main {
display: flex;
flex-direction: column;

margin-bottom: 10px;
justify-content: center;
width: 100%;
background-color: var(--main-bg);
padding: 15px;
border-radius: 10px;
box-shadow: 0px 0px 5px 2px #3b6837;
border: 5px solid #62865f;
color: var(--main-color);
}

.inner-main {
composes: width-limit;
display: flex;
flex-direction: column;
margin: 15px;
}

.after-main-links {
composes: width-limit;

margin: 40px;
text-align: center;

a { color: white; }
a:hover { color: darken(white, 10%); }
Expand All @@ -214,6 +219,7 @@ input.search {
.sep { display: none; }
display: flex;
flex-direction: column;
align-items: center;

a {
width: 50%;
Expand Down
226 changes: 113 additions & 113 deletions app/templates/application.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,107 +2,105 @@

{{title "crates.io: Rust Package Registry" separator=' - ' prepend=true}}

<div local-class="application">
<nav local-class="header">
<LinkTo @route="index" @tabindex="-1">
<img src="/assets/Cargo-Logo-Small.png" height="100" width="100" alt="Cargo Logo">
</LinkTo>
<LinkTo @route="index">
<h1>
crates.io
<span local-class="subtitle">Rust Package Registry</span>
</h1>
</LinkTo>

<form local-class="desktop-search-form" action='/search' {{ action "search" on="submit" }} data-test-search-form>
<input
type="text"
local-class="search"
name="q"
id="cargo-desktop-search"
placeholder="Click or press 'S' to search..."
value={{this.searchQuery}}
oninput={{action (mut this.searchQuery) value="target.value"}}
autocorrect="off"
autocapitalize="off"
autofocus="autofocus"
spellcheck="false"
required
data-test-search-input
>
<label for="cargo-desktop-search" local-class="search-label">Search</label>
</form>

<div local-class='nav'>
<LinkTo @route="crates" @query={{hash letter=null page=1}} data-test-all-crates-link>
Browse All Crates
</LinkTo>
<span local-class="sep">|</span>
<Dropdown as |dd|>
<dd.Trigger local-class="dropdown-button">
Docs
</dd.Trigger>
<header local-class="header">
<LinkTo @route="index" @tabindex="-1">
<img src="/assets/Cargo-Logo-Small.png" height="100" width="100" alt="Cargo Logo">
</LinkTo>
<LinkTo @route="index">
<h1>
crates.io
<span local-class="subtitle">Rust Package Registry</span>
</h1>
</LinkTo>

<dd.Menu local-class="doc-links" as |menu|>
<menu.Item><a href='https://doc.rust-lang.org/cargo/getting-started/'>Getting Started</a></menu.Item>
<menu.Item><a href='https://doc.rust-lang.org/cargo/guide/'>Guide</a></menu.Item>
<menu.Item><a href='https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html'>Specifying Dependencies</a></menu.Item>
<menu.Item><a href='https://doc.rust-lang.org/cargo/reference/publishing.html'>Publishing on crates.io</a></menu.Item>
<menu.Item><a href='https://doc.rust-lang.org/cargo/faq.html'>FAQ</a></menu.Item>
<menu.Item><a href='https://doc.rust-lang.org/cargo/reference/manifest.html'>Cargo.toml Format</a></menu.Item>
<menu.Item><a href='https://doc.rust-lang.org/cargo/reference/build-scripts.html'>Build Scripts</a></menu.Item>
<menu.Item><a href='https://doc.rust-lang.org/cargo/reference/config.html'>Configuration</a></menu.Item>
<menu.Item><a href='https://doc.rust-lang.org/cargo/reference/pkgid-spec.html'>Package ID specs</a></menu.Item>
<menu.Item><a href='https://doc.rust-lang.org/cargo/reference/environment-variables.html'>Environment Variables</a></menu.Item>
<menu.Item><a href='https://doc.rust-lang.org/cargo/reference/source-replacement.html'>Source Replacement</a></menu.Item>
<menu.Item><a href='https://doc.rust-lang.org/cargo/reference/external-tools.html'>External Tools</a></menu.Item>
<menu.Item><LinkTo @route="policies">Policies</LinkTo></menu.Item>
<menu.Item><LinkTo @route="category-slugs">List of category slugs</LinkTo></menu.Item>
</dd.Menu>
</Dropdown>
<span local-class="sep">|</span>
{{#if this.session.currentUser}}
<Dropdown data-test-user-menu as |dd|>
<dd.Trigger local-class="dropdown-button" data-test-toggle>
<UserAvatar @user={{this.session.currentUser}} @size="small" data-test-avatar />
{{ this.session.currentUser.name }}
</dd.Trigger>
<form local-class="desktop-search-form" action='/search' {{ action "search" on="submit" }} data-test-search-form>
<input
type="text"
local-class="search"
name="q"
id="cargo-desktop-search"
placeholder="Click or press 'S' to search..."
value={{this.searchQuery}}
oninput={{action (mut this.searchQuery) value="target.value"}}
autocorrect="off"
autocapitalize="off"
autofocus="autofocus"
spellcheck="false"
required
data-test-search-input
>
<label for="cargo-desktop-search" local-class="search-label">Search</label>
</form>

<dd.Menu local-class="current-user-links" as |menu|>
<menu.Item><LinkTo @route="dashboard">Dashboard</LinkTo></menu.Item>
<menu.Item><LinkTo @route="me">Account Settings</LinkTo></menu.Item>
<menu.Item><LinkTo @route="me.pending-invites">Owner Invites</LinkTo></menu.Item>
<menu.Item local-class="menu-item-with-separator"><LinkTo @route="logout">Sign Out</LinkTo></menu.Item>
</dd.Menu>
</Dropdown>
{{else}}
<LinkTo @route="login" data-test-login-link>
{{svg-jar "lock"}}
Log in with GitHub
</LinkTo>
{{/if}}
</div>
<nav local-class='nav'>
<LinkTo @route="crates" @query={{hash letter=null page=1}} data-test-all-crates-link>
Browse All Crates
</LinkTo>
<span local-class="sep">|</span>
<Dropdown as |dd|>
<dd.Trigger local-class="dropdown-button">
Docs
</dd.Trigger>

<div local-class='menu'>
<Dropdown as |dd|>
<dd.Trigger local-class="dropdown-button">
Menu
<dd.Menu local-class="doc-links" as |menu|>
<menu.Item><a href='https://doc.rust-lang.org/cargo/getting-started/'>Getting Started</a></menu.Item>
<menu.Item><a href='https://doc.rust-lang.org/cargo/guide/'>Guide</a></menu.Item>
<menu.Item><a href='https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html'>Specifying Dependencies</a></menu.Item>
<menu.Item><a href='https://doc.rust-lang.org/cargo/reference/publishing.html'>Publishing on crates.io</a></menu.Item>
<menu.Item><a href='https://doc.rust-lang.org/cargo/faq.html'>FAQ</a></menu.Item>
<menu.Item><a href='https://doc.rust-lang.org/cargo/reference/manifest.html'>Cargo.toml Format</a></menu.Item>
<menu.Item><a href='https://doc.rust-lang.org/cargo/reference/build-scripts.html'>Build Scripts</a></menu.Item>
<menu.Item><a href='https://doc.rust-lang.org/cargo/reference/config.html'>Configuration</a></menu.Item>
<menu.Item><a href='https://doc.rust-lang.org/cargo/reference/pkgid-spec.html'>Package ID specs</a></menu.Item>
<menu.Item><a href='https://doc.rust-lang.org/cargo/reference/environment-variables.html'>Environment Variables</a></menu.Item>
<menu.Item><a href='https://doc.rust-lang.org/cargo/reference/source-replacement.html'>Source Replacement</a></menu.Item>
<menu.Item><a href='https://doc.rust-lang.org/cargo/reference/external-tools.html'>External Tools</a></menu.Item>
<menu.Item><LinkTo @route="policies">Policies</LinkTo></menu.Item>
<menu.Item><LinkTo @route="category-slugs">List of category slugs</LinkTo></menu.Item>
</dd.Menu>
</Dropdown>
<span local-class="sep">|</span>
{{#if this.session.currentUser}}
<Dropdown data-test-user-menu as |dd|>
<dd.Trigger local-class="dropdown-button" data-test-toggle>
<UserAvatar @user={{this.session.currentUser}} @size="small" data-test-avatar />
{{ this.session.currentUser.name }}
</dd.Trigger>

<dd.Menu local-class="current-user-links" as |menu|>
<menu.Item><LinkTo @route="crates">Browse All Crates</LinkTo></menu.Item>
{{#if this.session.currentUser}}
<menu.Item><LinkTo @route="dashboard">Dashboard</LinkTo></menu.Item>
<menu.Item><LinkTo @route="me" data-test-me-link>Account Settings</LinkTo></menu.Item>
<menu.Item><LinkTo @route="me.pending-invites">Owner Invites</LinkTo></menu.Item>
<menu.Item local-class="menu-item-with-separator"><LinkTo @route="logout">Sign Out</LinkTo></menu.Item>
{{else}}
<menu.Item><LinkTo @route="login">Log in with GitHub</LinkTo></menu.Item>
{{/if}}
<menu.Item><LinkTo @route="dashboard">Dashboard</LinkTo></menu.Item>
<menu.Item><LinkTo @route="me">Account Settings</LinkTo></menu.Item>
<menu.Item><LinkTo @route="me.pending-invites">Owner Invites</LinkTo></menu.Item>
<menu.Item local-class="menu-item-with-separator"><LinkTo @route="logout">Sign Out</LinkTo></menu.Item>
</dd.Menu>
</Dropdown>
</div>
{{else}}
<LinkTo @route="login" data-test-login-link>
{{svg-jar "lock"}}
Log in with GitHub
</LinkTo>
{{/if}}
</nav>

<div local-class='menu'>
<Dropdown as |dd|>
<dd.Trigger local-class="dropdown-button">
Menu
</dd.Trigger>
<dd.Menu local-class="current-user-links" as |menu|>
<menu.Item><LinkTo @route="crates">Browse All Crates</LinkTo></menu.Item>
{{#if this.session.currentUser}}
<menu.Item><LinkTo @route="dashboard">Dashboard</LinkTo></menu.Item>
<menu.Item><LinkTo @route="me" data-test-me-link>Account Settings</LinkTo></menu.Item>
<menu.Item><LinkTo @route="me.pending-invites">Owner Invites</LinkTo></menu.Item>
<menu.Item local-class="menu-item-with-separator"><LinkTo @route="logout">Sign Out</LinkTo></menu.Item>
{{else}}
<menu.Item><LinkTo @route="login">Log in with GitHub</LinkTo></menu.Item>
{{/if}}
</dd.Menu>
</Dropdown>
</div>

<form local-class='mobile-search' action='/search' {{ action "search" on="submit" }} >
<input
type="text"
Expand All @@ -117,30 +115,32 @@
>
<label for="cargo-mobile-search" local-class="search-label">Search</label>
</form>
</header>

<main local-class="main">
<main local-class="main">
<div local-class="inner-main">
<FlashMessage @message={{this.flashMessages.message}} />

{{outlet}}
</main>
</div>
</main>

<footer local-class='after-main-links'>
<a href='https://doc.rust-lang.org/cargo/getting-started/installation.html'>Install</a>
<span local-class="sep">|</span>
<a href='https://doc.rust-lang.org/cargo/'>Getting Started</a>
<span local-class="sep">|</span>
<a href='https://doc.rust-lang.org/cargo/guide/'>Guide</a>
<span local-class="sep">|</span>
<a href='mailto:[email protected]'>Send us an email</a>
<span local-class="sep">|</span>
<a href='https://www.rust-lang.org/policies/security'>Report a security issue</a>
<span local-class="sep">|</span>
<a href='https://www.rust-lang.org/policies/privacy'>Privacy notice</a>
<span local-class="sep">|</span>
<LinkTo @route="policies">Policies</LinkTo>
</footer>
<footer local-class='after-main-links'>
<a href='https://doc.rust-lang.org/cargo/getting-started/installation.html'>Install</a>
<span local-class="sep">|</span>
<a href='https://doc.rust-lang.org/cargo/'>Getting Started</a>
<span local-class="sep">|</span>
<a href='https://doc.rust-lang.org/cargo/guide/'>Guide</a>
<span local-class="sep">|</span>
<a href='mailto:[email protected]'>Send us an email</a>
<span local-class="sep">|</span>
<a href='https://www.rust-lang.org/policies/security'>Report a security issue</a>
<span local-class="sep">|</span>
<a href='https://www.rust-lang.org/policies/privacy'>Privacy notice</a>
<span local-class="sep">|</span>
<LinkTo @route="policies">Policies</LinkTo>
</footer>

<a href='https://github.com/rust-lang/crates.io' local-class='fork-me'>
<img src='/assets/forkme.png' alt="Fork me on GitHub">
</a>
</div>
<a href='https://github.com/rust-lang/crates.io' local-class='fork-me'>
<img src='/assets/forkme.png' alt="Fork me on GitHub">
</a>