Skip to content

spacing on splash page #1576

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
Sep 6, 2017
Merged

spacing on splash page #1576

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
3d53c80
spacing on splash page
rouzbeh84 Sep 5, 2017
5405015
Merge branch 'master' into hotfix/splash-code-spacing
skipjack Sep 6, 2017
30f4206
fix(splash): fix index page code block styling
skipjack Sep 6, 2017
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
34 changes: 34 additions & 0 deletions src/components/Splash/Splash.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,38 @@
display:none;
}
}

&__wrap {
display: block;

@include break {
margin: 0 -30px;
}

&:before,
&:after {
content: " ";
display: table;
}

&:after {
clear: both;
}
}

&__left,
&__right {
width: 100%;
float: left;

@include break {
width: 50%;
padding: 0 15px;
}
}

/* XXX: Hack to fix markown parsing issues */
&__right {
margin-bottom: 1em;
}
}
13 changes: 6 additions & 7 deletions src/content/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ title: webpack

## Write your code

<div class="homepage__wrap">
<div class="homepage__left">
<div class="splash__wrap">
<div class="splash__left">
__app.js__

```js
Expand All @@ -14,7 +14,7 @@ import bar from './bar';
bar();
```
</div>
<div class="homepage__right">
<div class="splash__right">
__bar.js__

```js
Expand All @@ -28,8 +28,8 @@ export default function bar() {

## Bundle with webpack

<div class="homepage__wrap">
<div class="homepage__left">
<div class="splash__wrap">
<div class="splash__left">
__webpack.config.js__

```js
Expand All @@ -41,7 +41,7 @@ module.exports = {
}
```
</div>
<div class="homepage__right">
<div class="splash__right">
__page.html__

```html
Expand All @@ -55,7 +55,6 @@ __page.html__
</body>
</html>
```

</div>

Then run `webpack` on the command-line to create `bundle.js`.
Expand Down
30 changes: 0 additions & 30 deletions src/styles/homepage.scss
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/styles/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,3 @@ details:focus, summary:focus{
}

@import './markdown';
@import './homepage';