Skip to content

Commit 284da9e

Browse files
committed
Some CSS fixes to display the content in a single page
1 parent 1f73c27 commit 284da9e

File tree

5 files changed

+42
-30
lines changed

5 files changed

+42
-30
lines changed

_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# you will see them accessed via {{ site.title }}, {{ site.email }}, and so on.
1414
# You can create any custom variable you would like, and they will be accessible
1515
# in the templates via {{ site.myvariable }}.
16-
title: Code of Conduct
16+
title: TC39 Code of Conduct
1717
1818
description: >
1919
The JS community is awesome.

_includes/header.html

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

33
<div class="wrapper">
44

5-
<a class="site-title" href="{{ "/" | relative_url}}">{{ site.title | escape }}</a>
5+
<h1><a class="site-title" href="{{ "/" | relative_url}}">{{ site.title | escape }}</a></h1>
66

77
<nav class="site-nav">
88
<span class="menu-icon">

_includes/nav.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<a class="page-link" href="{{ "/" | relative_url }}">Home</a>
33
<a class="page-link" href="{{ "#enforcement-manual" | relative_url }}">Enforcement</a>
44
<a class="page-link" href="{{ "#code-of-conduct-committee" | relative_url }}">Committee</a>
5-
<a class="page-link" href="{{ "#reporting-guidelines" | relative_url }}">Reporting Guidelines</a>
5+
<a class="page-link" href="{{ "#reporting-guidelines" | relative_url }}">Reporting</a>
66
<a class="page-link" href="{{ "#frequently-asked-questions" | relative_url }}">FAQ</a>
77
</div>

_sass/minima/_layout.scss

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66
border-bottom: 1px solid $grey-color-light;
77
min-height: 56px;
88

9-
// Positioning context for the mobile navigation icon
10-
position: relative;
9+
position: fixed;
10+
width: 100%;
11+
background-color: white;
12+
top: 0;
1113
}
1214

1315
.site-title {
@@ -163,6 +165,7 @@
163165
* Page content
164166
*/
165167
.page-content {
168+
margin-top: 56px;
166169
padding: $spacing-unit 0;
167170
}
168171

@@ -189,7 +192,18 @@
189192
font-size: 24px;
190193
}
191194

195+
hr {
196+
margin-top: 44px;
197+
}
198+
199+
h1 {
200+
display: inline;
201+
margin: 0;
202+
}
192203

204+
h2:not(:first-child) {
205+
padding-top: 66px
206+
}
193207

194208
/**
195209
* Posts

index.md

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ layout: home
33
title: TC39 Code of Conduct
44
---
55

6-
# TC39 Code of Conduct
7-
8-
### Introduction
6+
## Introduction
97

108
Like the technical community as a whole, TC39 is made up of a mixture of professionals and volunteers from all over the world. To ensure a fair and balanced standards process, to avoid communication issues and unhappiness, and to promote inclusiveness, we have a few ground rules that we ask people to adhere to.
119

@@ -50,14 +48,14 @@ Disagreements, both social and technical, happen all the time. It is important t
5048

5149
(Original text courtesy of [JSFoundation][], [Speak Up! project][], and [Django Project][].)
5250

53-
## Questions?
51+
### Questions?
5452

5553
If you have questions, please see the [FAQ][]. If that doesn't answer your questions, feel free to [email us][tc39-conduct].
5654

5755
---
5856

5957

60-
# Reporting Guidelines
58+
## Reporting Guidelines
6159

6260
If you believe someone is violating the Code of Conduct, we ask that you report it by emailing [[email protected]][tc39-conduct]. All reports will be kept confidential. Only members of the [Code of Conduct Committee][], and possibly the Ecma ExeCom, will receive the reports. No identity will be made public before the individuals concerned have agreed to it.
6361

@@ -84,7 +82,7 @@ To appeal a decision of the Code of Conduct Committee, contact the [Ecma Secreta
8482
---
8583

8684

87-
# Enforcement Manual
85+
## Enforcement Manual
8886

8987
All responses to reports of conduct violations will be managed by a [Code of Conduct Committee][] (“the Committee”).
9088

@@ -121,26 +119,9 @@ The Committee will never publicly discuss the issue; all public statements, if
121119

122120
In the event of any conflict of interest - i.e., members who are personally connected to a situation, a Committee member must immediately notify the other members, and recuse themselves.
123121

124-
## References
125-
126-
### Ecma Bylaws Article 5.1 (extract):
127-
128-
> Membership of a company shall be terminated in the following cases:
129-
> ...
130-
> - by expulsion for violation of Bylaws and Rules or for any other conduct prejudicial to the interest and correct functioning of the Association.
131-
132-
### Ecma Bylaws, Articles 5.3, 5.4 5.5:
133-
134-
> 5.3 Any proposal to expel an Ecma member shall be backed by at least one-fifth of all the ordinary members. The proposal to expel shall be on the agenda for the General Assembly at which is it going to be discussed so as to give the member the opportunity to present its case.
135-
> 5.4 A two-thirds majority of all the ordinary members is necessary to expel an Ecma member. Such expulsion will become effective 15 days after notification by registered mail.
136-
> 5.5 An Ecma member which had been expelled can only be re-admitted by the General Assembly with a two-thirds majority of all ordinary members.
137-
138-
TC39 has specified further the terms of “prejudicial conduct” and has expanded on how to deal with incidents that can lead to it, in the TC39 Code of Conduct below. Other committees may want to have similar codes.
139-
140122
---
141123

142-
143-
# Code of Conduct Committee
124+
## Code of Conduct Committee
144125

145126
The Code of Conduct Committee deals with violations in the [TC39 Code of Conduct][].
146127

@@ -156,7 +137,7 @@ You can contact [tc39-conduct][]. For more details please see the [Reporting Gui
156137

157138
---
158139

159-
# Frequently Asked Questions
140+
## Frequently Asked Questions
160141

161142
This FAQ attempts to address common questions and concerns around the [TC39 Code of Conduct][]. If you still have questions after reading it, please feel free to [contact us][tc39-conduct].
162143

@@ -194,6 +175,23 @@ However, even if everyone were kind, compassionate, and familiar with codes of c
194175

195176
You do -- in _your_ space. If you'd like to hang out in _our_ spaces (as clarified above), we have some simple guidelines to follow. If you want to, for example, form a group where TC39 proposals are discussed using language inappropriate for general channels then nobody's stopping you. We respect your right to establish whatever codes of conduct you want in the spaces that belong to you. Please honor this Code of Conduct in our spaces.
196177

178+
## References
179+
180+
### Ecma Bylaws Article 5.1 (extract):
181+
182+
> Membership of a company shall be terminated in the following cases:
183+
> ...
184+
> - by expulsion for violation of Bylaws and Rules or for any other conduct prejudicial to the interest and correct functioning of the Association.
185+
186+
### Ecma Bylaws, Articles 5.3, 5.4 5.5:
187+
188+
> 5.3 Any proposal to expel an Ecma member shall be backed by at least one-fifth of all the ordinary members. The proposal to expel shall be on the agenda for the General Assembly at which is it going to be discussed so as to give the member the opportunity to present its case.
189+
> 5.4 A two-thirds majority of all the ordinary members is necessary to expel an Ecma member. Such expulsion will become effective 15 days after notification by registered mail.
190+
> 5.5 An Ecma member which had been expelled can only be re-admitted by the General Assembly with a two-thirds majority of all ordinary members.
191+
192+
TC39 has specified further the terms of “prejudicial conduct” and has expanded on how to deal with incidents that can lead to it, in the TC39 Code of Conduct below. Other committees may want to have similar codes.
193+
194+
197195
[TC39 Code of Conduct]: /code-of-conduct/
198196
[Code of Conduct Committee]: #code-of-conduct-committee
199197
[Enforcement Manual]: #enforcement-manual

0 commit comments

Comments
 (0)