Skip to content

Commit 034a545

Browse files
committed
stylin' the blog, editing layout classes
1 parent 3e2f8c3 commit 034a545

File tree

7 files changed

+78
-65
lines changed

7 files changed

+78
-65
lines changed

_layouts/blog.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
{% include header.html %}
99
<div class="page">
1010
<div class="wrapper">
11-
<div id="blog-header"></div>
12-
<div class="page-content">
13-
<div class="page-box">
14-
{{ content }}
11+
<div class="blog-wrapper">
12+
<div class="page-content">
13+
<div class="page-box">
14+
{{ content }}
15+
</div>
1516
</div>
1617
</div>
1718
</div>

_sass/_blog.scss

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
1-
#blog-header {
2-
padding-top: 80px;
3-
}
1+
.blog-wrapper {
2+
padding: 7em 0;
43

5-
.page-box {
6-
width: 60%;
7-
}
4+
h1 {
5+
@extend .page-title;
6+
@extend .pink-highlight;
7+
}
8+
9+
h2 {
10+
@extend .page-heading;
11+
}
12+
13+
p, ol, ul {
14+
@extend .description;
15+
}
16+
17+
}

_sass/_contributing.scss

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
.contributing-wrapper {
22
padding: 7em 0;
33
.description {
4-
padding: 1em 0;
4+
padding: 0.5em 0;
55
}
6-
}
6+
#description--main {
7+
@extend .description;
8+
font-weight: 600;
9+
font-size: 1.2em;
10+
padding: 1em 0 0;
11+
}
12+
}

_sass/_landing.scss

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,6 @@
4444

4545
}
4646

47-
.pink-highlight {
48-
background-color: $pink-color;
49-
display: inline;
50-
}
51-
52-
.description {
53-
font-family: $sans-font-family;
54-
color: $blue-color;
55-
font-size: $base-font-size;
56-
}
57-
5847
.instructions {
5948
@extend .description;
6049
display: inline;

_sass/_layout.scss

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,20 @@
130130
justify-content: space-between;
131131
}
132132

133+
.pink-highlight {
134+
background-color: $pink-color;
135+
display: inline;
136+
}
137+
138+
.description {
139+
font-family: $sans-font-family;
140+
color: $blue-color;
141+
font-size: $base-font-size;
142+
}
133143

134144
/**
135145
* Site footer
136-
*/
146+
*
137147
138148
.footer-items {
139149
font-family: $base-font-family;

contributing/index.html

Lines changed: 37 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -11,63 +11,60 @@
1111
Contributing to Yargs
1212
</div>
1313

14-
<div class="description">
14+
<p id="description--main">
1515
Me hearties, we would love to have you contribute to yargs!
16-
</div>
16+
</p>
1717

18-
<div class="page-heading pink-highlight">
18+
<div class="page-heading">
1919
Contributing
2020
</div>
2121

22-
<div class="description">
22+
<ol class="description">
2323

24-
<ol>
24+
<li> Look through the existing issues and see if your idea is something new. </li>
25+
<li> Create a <a href="https://github.com/bcoe/yargs/issues"> new issue </a>, or comment on an existing issue that you would like to help solve: </li>
2526

26-
<li> Look through the existing issues and see if your idea is something new. </li>
27-
<li> Create a <a href="https://github.com/bcoe/yargs/issues"> new issue </a>, or comment on an existing issue that you would like to help solve: </li>
28-
29-
<ul>
30-
<li> it's usually best to get some feedback before proceeding to write code. ,</li>
31-
</ul>
27+
<ul>
28+
<li> it's usually best to get some feedback before proceeding to write code. ,</li>
29+
</ul>
3230

33-
<li> fork the yargs repo, and clone it to your computer: </li>
31+
<li> fork the yargs repo, and clone it to your computer: </li>
3432

35-
<ul>
36-
<li> GitHub has <a href="https://help.github.com/articles/using-pull-requests/"> great documentation </a> regarding writing your first pull request. </li>
37-
</ul>
33+
<ul>
34+
<li> GitHub has <a href="https://help.github.com/articles/using-pull-requests/"> great documentation </a> regarding writing your first pull request. </li>
35+
</ul>
3836

39-
<li> make sure that you write unit-test for any code that you write for yargs: </li>
37+
<li> make sure that you write unit-test for any code that you write for yargs: </li>
4038

41-
<ul>
42-
<li> we use <a href="https://github.com/feross/standard"> standard </a> coding style, which will validate your style when you run tests </li>
39+
<ul>
40+
<li> we use <a href="https://github.com/feross/standard"> standard </a> coding style, which will validate your style when you run tests </li>
4341

44-
<li> look through our extensive test suite in <a href="https://github.com/bcoe/yargs/issues"> /test </a> to get an idea for how to write unit-tests for this codebase. </li>
45-
</ul>
46-
<li> make sure you are comfortable with the Code of Conduct outlined below. </li>
47-
</ol>
48-
</div>
42+
<li> look through our extensive test suite in <a href="https://github.com/bcoe/yargs/issues"> /test </a> to get an idea for how to write unit-tests for this codebase. </li>
43+
</ul>
44+
<li> make sure you are comfortable with the Code of Conduct outlined below. </li>
45+
</ol>
4946

50-
<div class="page-heading pink-highlight">
47+
<div class="page-heading">
5148
Contributor Code of Conduct
5249
</div>
5350

54-
<div class="description">
51+
<p class="description">
5552
As contributors and maintainers of this project, and in the interest of
5653
fostering an open and welcoming community, we pledge to respect all people who
5754
contribute through reporting issues, posting feature requests, updating
5855
documentation, submitting pull requests or patches, and other activities.
5956

60-
</div>
61-
<div class="description">
57+
</p>
58+
<p class="description">
6259
We are committed to making participation in this project a harassment-free
6360
experience for everyone, regardless of level of experience, gender, gender
6461
identity and expression, sexual orientation, disability, personal appearance,
6562
body size, race, ethnicity, age, religion, or nationality.
66-
</div>
63+
</p>
6764

68-
<div class="description">
65+
<p class="description">
6966
Examples of unacceptable behavior by participants include:
70-
</div>
67+
</p >
7168

7269
<ol class="description">
7370
<li> The use of sexualized language or imagery </li>
@@ -78,40 +75,40 @@
7875
<li> Other unethical or unprofessional conduct </li>
7976
</ol>
8077

81-
<div class="description">
78+
<p class="description">
8279
Project maintainers have the right and responsibility to remove, edit, or
8380
reject comments, commits, code, wiki edits, issues, and other contributions
8481
that are not aligned to this Code of Conduct, or to ban temporarily or
8582
permanently any contributor for other behaviors that they deem inappropriate,
8683
threatening, offensive, or harmful.
87-
</div>
84+
</p>
8885

89-
<div class="description">
86+
<p class="description">
9087
By adopting this Code of Conduct, project maintainers commit themselves to
9188
fairly and consistently applying these principles to every aspect of managing
9289
this project. Project maintainers who do not follow or enforce the Code of
9390
Conduct may be permanently removed from the project team.
94-
</div>
91+
</p>
9592

96-
<div class="description">
93+
<p class="description">
9794
This Code of Conduct applies both within project spaces and in public spaces
9895
when an individual is representing the project or its community.
99-
</div>
96+
</p>
10097

101-
<div class="description">
98+
<p class="description">
10299
Instances of abusive, harassing, or otherwise unacceptable behavior may be
103100
reported by contacting a project maintainer at [email protected]. All
104101
complaints will be reviewed and investigated and will result in a response that
105102
is deemed necessary and appropriate to the circumstances. Maintainers are
106103
obligated to maintain confidentiality with regard to the reporter of an
107104
incident.
108-
</div>
105+
</p>
109106

110-
<div class="description">
107+
<p class="description">
111108
This Code of Conduct is adapted from the <a href="http://contributor-covenant.org">Contributor Covenant</a>, version 1.3.0, available at <a href="http://contributor-covenant.org/version/1/3/0/">http://contributor-covenant.org/version/1/3/0/</a>
112109

113110

114-
</div>
111+
</p>
115112

116113
</div>
117114

css/main.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
// Our variables
99
$base-font-family: "PT Serif", serif;
10-
$base-font-size: 1em;
10+
$base-font-size: 1.1em;
1111
$small-font-size: $base-font-size * 0.875;
1212
$base-line-height: 1.5;
1313

0 commit comments

Comments
 (0)