Skip to content

Commit

Permalink
Replace Upcoming Events card with newer content (mainmatter#730)
Browse files Browse the repository at this point in the history
* Remove EmberFest 2019 card from upcoming events
* Replace upcoming events card
* Fix Card image aspect ratio
* Fix CardEmberSponsors test
* Update src/ui/components/CardEmberSponsors/template.hbs
* Update src/ui/components/CardEmberSponsors/template.hbs
* Add EmberFest organizer info
* Fix anchor display in figcaption elements
* Update src/ui/components/PageWhySimplabs/template.hbs
* Update src/ui/components/CardEmberSponsors/template.hbs
* Code style fixes

Co-Authored-By: Marco Otte-Witte <[email protected]>
  • Loading branch information
pichfl and marcoow authored Nov 6, 2019
1 parent 1d51437 commit c713f15
Show file tree
Hide file tree
Showing 13 changed files with 35 additions and 22 deletions.
2 changes: 1 addition & 1 deletion lib/generate-blog/lib/templates/list-page/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
</section>
<aside class="layout.side offset.after-21">
<CardTalks />
<CardUpcomingEvents />
<CardEmberSponsors />
</aside>
<Footer />
</div>
4 changes: 4 additions & 0 deletions lib/global-css/css/baseline.css
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,10 @@ figcaption {
margin-top: 1rem;
}

figcaption a {
display: unset;
}

img {
vertical-align: middle;
border-style: none;
Expand Down
Binary file removed public/assets/images/card/emberfest-2019.png
Binary file not shown.
1 change: 1 addition & 0 deletions public/assets/images/card/emberfest.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/ui/components/Card/stylesheet.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}

.image {
height: 25rem;
height: 75%;
}

.caption {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import { setupRenderingTest } from '../../../utils/test-helpers/setup-rendering-

const { module, test } = QUnit;

module('Component: CardUpcomingEvents', function(hooks) {
module('Component: CardEmberSponsors', function(hooks) {
setupRenderingTest(hooks);

test('it renders', async function(assert) {
await render(hbs`<CardUpcomingEvents />`);
await render(hbs`<CardEmberSponsors />`);

assert.ok(this.containerElement.querySelector('figure'));
});
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@block typography from "../../styles/blocks/typography.block.css";

:scope {
block-name: CardUpcomingEvents;
block-name: CardEmberSponsors;
}
17 changes: 17 additions & 0 deletions src/ui/components/CardEmberSponsors/template.hbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<Card
@label="Ember.js"
@src="/assets/images/card/simplabs-sponsoring-ember.png"
@title="Official Ember.js Sponsor"
@alt="simplabs :heart: ember"
>
<p>
We recently have been recognized as an official
<a href="https://emberjs.com/sponsors">
sponsor
</a>
of the Ember.js project along with international brands like LinkedIn and Yahoo.
</p>
<ArrowLink @href="/expertise/ember/">
Learn why we care about Ember.js
</ArrowLink>
</Card>
13 changes: 0 additions & 13 deletions src/ui/components/CardUpcomingEvents/template.hbs

This file was deleted.

2 changes: 1 addition & 1 deletion src/ui/components/PageEmberExpertise/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
</div>
</div>
<div class="layout.side offset.after-21">
<CardUpcomingEvents />
<CardEmberSponsors />
</div>
<ShapeFeatureEmberDocumentary />
<div class="layout.main offset.after-21">
Expand Down
2 changes: 1 addition & 1 deletion src/ui/components/PageHomepage/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
</ArrowLink>
</div>
<aside class="layout.side">
<CardUpcomingEvents />
<CardEmberSponsors />
</aside>
<ShapeAcrossLeadingExperts />
<WorkWithUs />
Expand Down
8 changes: 6 additions & 2 deletions src/ui/components/PageWhySimplabs/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,13 @@
</p>
</div>
<div class="layout.side offset-vertical offset.after-21">
<CardUpcomingEvents />
<Card @label="Conferences" @alt="EmberFest" @src="/assets/images/card/emberfest.svg">
<p>
We co-organize EmberFest, the European Community Ember Conference.
</p>
</Card>
</div>
<div class="layout.side offset.after-16">
<div class="layout.side offset.after-21">
<h3>
Distributed together
</h3>
Expand Down

0 comments on commit c713f15

Please sign in to comment.