Skip to content

Commit

Permalink
Merge pull request #274 from ember-learn/minor-improvements
Browse files Browse the repository at this point in the history
Minor improvements
  • Loading branch information
mansona authored Jan 30, 2020
2 parents a88228c + 93edb0d commit 6c7a696
Show file tree
Hide file tree
Showing 8 changed files with 82 additions and 14 deletions.
10 changes: 10 additions & 0 deletions addon/styles/background-shapes.css
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,13 @@
background-repeat: no-repeat;
background-position: bottom left;
}

@media (max-width: 1007px) {
.bg-shape-boxes-bottom {
background-size: 300px;
}

.bg-shape-boxes-bottom + * {
background-size: 100px;
}
}
4 changes: 4 additions & 0 deletions addon/styles/components/es-card.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
position: relative;
}

.bg-dark .card {
border-color: var(--color-gray-600);
}

.card[card-link] h1 > a::after,
.card[card-link] h2 > a::after,
.card[card-link] h3 > a::after,
Expand Down
12 changes: 7 additions & 5 deletions addon/templates/components/es-page-header.hbs
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<div class="es-page-header bg-shape-boxes-bottom" ...attributes>
<div class="container">
<h1 class="text-hero-xl">{{@headline}}</h1>
<div class="container layout">
<div class="lg:col-5">
<h1 class="text-hero-xl">{{@headline}}</h1>

<p class="text-hero-base {{if hasBlock "mb-2"}}">{{@detail}}</p>
<p class="text-hero-base {{if hasBlock "mb-2"}}">{{@detail}}</p>

{{yield}}
{{yield}}
</div>
</div>
</div>
</div>
6 changes: 6 additions & 0 deletions docs/components/page-header.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ should use the `<EsPageHeader />` component:
>
<EsButton>Go</EsButton>
</EsPageHeader>
<section>
<div class="container">
<h2>Next Section</h2>
<p>This is here to show how the bg-shape continues onto the next section</p>
</div>
</section>
```

This example is making use of the [`dark` css helper](/css/helpers#dark)
Expand Down
6 changes: 3 additions & 3 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ module.exports = {

svgJar: {
sourceDirs: [
'public',
'node_modules/ember-styleguide/public',
'tests/dummy/public'
'public/images/icons',
'node_modules/ember-styleguide/public/images/icons',
'tests/dummy/public/images/icons'
]
},
},
Expand Down
47 changes: 43 additions & 4 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"babel-eslint": "^8.2.6",
"broccoli-asset-rev": "^3.0.0",
"ember-a11y-landmarks": "^1.0.1",
"ember-array-helper": "^5.0.0",
"ember-array-helper": "^5.1.0",
"ember-cli": "~3.10.1",
"ember-cli-dependency-checker": "^3.1.0",
"ember-cli-eslint": "^5.1.0",
Expand Down
9 changes: 8 additions & 1 deletion public/images/swipe-top.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 6c7a696

Please sign in to comment.