Skip to content

Commit

Permalink
Issue #12 - Update styles. Add transition to featurelist. Add prettie…
Browse files Browse the repository at this point in the history
…r & stylelint-order.
  • Loading branch information
Christian Stuff committed May 30, 2018
1 parent 5db2881 commit 6b6ccd2
Show file tree
Hide file tree
Showing 21 changed files with 192 additions and 187 deletions.
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
assets/css/
1 change: 1 addition & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
2 changes: 1 addition & 1 deletion .stylelintignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
assets/css
assets/css/
13 changes: 12 additions & 1 deletion .stylelintrc.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
{
"extends": "stylelint-config-standard"
"extends": [
"stylelint-config-standard",
"stylelint-config-prettier"
],
"plugins": [
"stylelint-order"
],
"rules": {
"at-rule-empty-line-before": null,
"declaration-empty-line-before": null,
"order/properties-alphabetical-order": true
}
}
27 changes: 16 additions & 11 deletions _includes/contribute.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
<section id="contribute">
<div class="g-row">
<h2 class="section-headline g-col-4">Contribute</h2>
<div class="g-col-8">
<p>
TC39 welcomes contributions from the JavaScript community, whether it is feedback on existing proposals, improved documentation, testing, implementations, or even language feature ideas. <!-- TODO: Make each of the things in the preceding sentence links to the appropriate guides -->
See our <a href="https://github.com/tc39/ecma262/blob/master/CONTRIBUTING.md">contributor guide</a> for details.
</p>
<p>
To participate in TC39 meetings, <a href="https://ecma-international.org/memento/join.htm">join Ecma</a> and sign our <a href="https://ecma-international.org/memento/Policies/Registration%20Form%20for%20the%20Ecma%20Royalty%20Free%20(RF)%20Task%20Group%20(TG).pdf">patent agreement</a>.
</p>
</div>
<div class="g-row">
<h2 class="section-headline g-col-4">Contribute</h2>
<div class="g-col-8">
<p>
TC39 welcomes contributions from the JavaScript community, whether it is feedback on existing proposals, improved documentation,
testing, implementations, or even language feature ideas.
<!-- TODO: Make each of the things in the preceding sentence links to the appropriate guides -->
See our
<a href="https://github.com/tc39/ecma262/blob/master/CONTRIBUTING.md">contributor guide</a> for details.
</p>
<p>
To participate in TC39 meetings,
<a href="https://ecma-international.org/memento/join.htm">join Ecma</a> and sign our
<a href="https://ecma-international.org/memento/Policies/Registration%20Form%20for%20the%20Ecma%20Royalty%20Free%20(RF)%20Task%20Group%20(TG).pdf">patent agreement</a>.
</p>
</div>
</div>
</section>
88 changes: 44 additions & 44 deletions _includes/proposals.html
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
<div class="featurelist">
<h2>Stage 3</h2>

{% for proposal in site.data.stage3 %}
<section class="featurelist__item">
<header class="featurelist__item__intro">
<h2>{{ proposal.title }}</h2>
<p>{{ proposal.description }}</p>
</header>
<section class="featurelist__item__info">
<div>
<section id="proposals">
<h2 class="section-headline">State of Proposals</h2>
<div class="featurelist">
<h3>Stage 3</h3>
{% for proposal in site.data.stage3 %}
<section class="featurelist__item">
<header class="featurelist__item__intro">
<h4>{{ proposal.title }}</h4>
<p>{{ proposal.description }}</p>
</header>
<section class="featurelist__item__info">
<div>
<h3>Status</h3>
<ul class="featurelist__item__status">
<li class="featurelist__item__owner">
<p>Author(s)</p>
<p>{% for name in proposal.authors %}{{ name }}{% endfor %}</p>
</li>
<li class="featurelist__item__owner">
<p>Champion(s)</p>
<p>{% for name in proposal.champions %}{{ name }}{% endfor %}</p>
</li>
<li class="featurelist__item__tests">
<p>Test(s)</p>
<p>{% for url in proposal.tests %}<a href="{{ url }}">{{ url }}</a>{% endfor %}</p>
</li>
<li class="featurelist__item__spec">
<p>Specification</p>
<a href="{{ proposal.specification }}">{{ proposal.specification }}</a>
</li>
</ul>
<div>
<h5>Status</h5>
<ul class="featurelist__item__status">
<li class="featurelist__item__owner">
<p>Author(s)</p>
<p>{% for name in proposal.authors %}{{ name }}{% endfor %}</p>
</li>
<li class="featurelist__item__owner">
<p>Champion(s)</p>
<p>{% for name in proposal.champions %}{{ name }}{% endfor %}</p>
</li>
<li class="featurelist__item__tests">
<p>Test(s)</p>
<p>{% for url in proposal.tests %}<a href="{{ url }}">{{ url }}</a>{% endfor %}</p>
</li>
<li class="featurelist__item__spec">
<p>Specification</p>
<a href="{{ proposal.specification }}">{{ proposal.specification }}</a>
</li>
</ul>
</div>
</div>

<div>
<h3>Example</h3>
<pre><code class="js">{{ proposal.example }}</code></pre>
</div>
</div>
<h3>Developer Resources</h3>
<ul>
{% for url in proposal.resources %}<li><a href="{{ url }}">{{ url }}</a></li>{% endfor %}
</ul>
<h5>Developer Resources</h5>
<ul>
{% for url in proposal.resources %}
<li>
<a href="{{ url }}">{{ url }}</a>
</li>
{% endfor %}
</ul>
</section>
</section>
</section>
{% endfor %}

</div>
{% endfor %}
</div>
</section>
7 changes: 6 additions & 1 deletion _includes/specs.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@
<h2 class="section-headline g-col-4">The Specs</h2>
<div class="g-col-8">
<p>
We develop the JavaScript (formally, ECMAScript) specification <a href="https://github.com/tc39/ecma262/">on GitHub</a> and at meetings every two months. We follow a <a href="https://tc39.github.io/process-document/">four stage process</a> for new <a href="https://github.com/tc39/proposals/">language feature proposals</a>. See our <a href="https://github.com/tc39/agendas/">meeting agendas</a> and <a href="https://github.com/tc39/tc39-notes/">minutes</a> to learn more.
We develop the JavaScript (formally, ECMAScript) specification
<a href="https://github.com/tc39/ecma262/">on GitHub</a> and at meetings every two months. We follow a
<a href="https://tc39.github.io/process-document/">four stage process</a> for new
<a href="https://github.com/tc39/proposals/">language feature proposals</a>. See our
<a href="https://github.com/tc39/agendas/">meeting agendas</a> and
<a href="https://github.com/tc39/tc39-notes/">minutes</a> to learn more.
</p>
</div>
</div>
Expand Down
4 changes: 3 additions & 1 deletion _includes/tc39.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
<h2 class="section-headline g-col-4">About the TC39</h2>
<div class="g-col-8">
<p>
TC39 is a group of JavaScript developers, implementers, academics, and more, collaborating with the community to maintain and evolve the definition of JavaScript. We are part of <a href="http://www.ecma-international.org/">Ecma International</a>.
TC39 is a group of JavaScript developers, implementers, academics, and more, collaborating with the community to maintain
and evolve the definition of JavaScript. We are part of
<a href="http://www.ecma-international.org/">Ecma International</a>.
</p>
</div>
</div>
Expand Down
5 changes: 2 additions & 3 deletions _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600|Source+Sans+Pro:300,400,600" rel="stylesheet">
<link rel="stylesheet" href="/assets/css/normalize.css">
<link rel="stylesheet" href="{{ '/assets/css/style.css?v=' | append: site.github.build_revision | relative_url }}">
<script defer src="{{ '/assets/js/main.js?v=' | append: site.github.build_revision | relative_url }}" />
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css">
<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
<script defer src="{{ '/assets/js/main.js?v=' | append: site.github.build_revision | relative_url }}" type="text/javascript"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" type="text/javascript"></script>
<script>hljs.initHighlightingOnLoad();</script>
</head>
<body>
Expand All @@ -20,7 +20,6 @@
{% include tc39.html %}
{% include specs.html %}
{% include contribute.html %}
<!-- {{ content }} -->
{% include proposals.html %}
</section>
<section class="footer">
Expand Down
32 changes: 0 additions & 32 deletions _layouts/menu.html
Original file line number Diff line number Diff line change
@@ -1,47 +1,15 @@
<ul class="menu">
<li class="menu-item">
<a href="#tc39" class="menu-link">TC39</a>
<!--
<span class="sub-menu">
<a href="https://github.com/tc39/proposals" class="menu-link">Active Proposals</a>
<a href="https://github.com/tc39/proposals/blob/master/inactive-proposals.md" class="menu-link">Inactive Proposals</a>
<a href="https://github.com/tc39/proposals/blob/master/finished-proposals.md" class="menu-link">Finished Proposals</a>
</span>
-->
</li>
<li class="menu-item">
<a href="#specs" class="menu-link">Specs</a>
<!--
<span class="sub-menu">
<a href="https://timothygu.me/es-howto/" class="menu-link">Reading the spec</a>
<a href="./guides/first-proposal" class="menu-link">Making your first Proposal</a>
<a href="" class="menu-link">Implementing a Proposal</a>
<a href="" class="menu-link">Giving meaningful feedback</a>
<a href="" class="menu-link">Running the tests</a>
<a href="" class="menu-link">Joining the TC39 as a member organization</a>
<a href="" class="menu-link">More Guides</a>
</span>
-->
</li>
<li class="menu-item">
<a href="#contribute" class="menu-link">Contribute</a>
<!--
<span class="sub-menu">
<a href="https://tc39.github.io/process-document/" class="menu-link">Overview</a>
</span>
-->
</li>
<li class="menu-item">
<a href="#proposals" class="menu-link">State of Proposals</a>
<!--
<span class="sub-menu">
<a href="https://github.com/tc39/agendas/blob/master/2018/03.md" class="menu-link">Upcoming Agenda</a>
<a href="https://github.com/tc39/tc39-notes/blob/master/es8/2018-01/jan-25.md" class="menu-link">Recent Meeting Notes</a>
<a href="https://github.com/tc39/" class="menu-link">Github Directory</a>
<a href="https://esdiscuss.org/" class="menu-link">ES Discuss</a>
<a href="./discussion/irc" class="menu-link">IRC</a>
</span>
-->
</li>
</ul>

10 changes: 7 additions & 3 deletions _sass/_content.scss
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
.main-content {
font-size: 1rem;
padding: 130px 0;

h1,
h2,
h3,
h4,
h5,
h6 {
color: $color-text;
font-weight: $font-weight-semi-bold;
}
h3 {
background-color: $color-primary;
margin-left: -40px;
margin-right: -40px;
padding: 10px 40px;
}

.section-headline {
font-size: 2rem;
font-weight: $font-weight-semi-bold;
margin-top: 0;
}

p {
margin: 0 0 $spacing-paragraph;
}
Expand Down
46 changes: 46 additions & 0 deletions _sass/_featurelist.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
.featurelist {
&__item {
border-bottom: 1px solid $color-spacer;
margin-bottom: 1.125rem;
&__intro {
cursor: pointer;
h4::after {
background: url(/assets/img/menu-down.svg) no-repeat 50%;
background-size: 1.5rem;
content: "";
display: block;
float: right;
height: 1.5rem;
transition: transform 600ms ease;
width: 1.5rem;
.open & {
transform: rotateX(180deg);
}
}
}
&__info {
max-height: 0;
overflow: hidden;
transition: max-height 600ms ease;
// .open & {
// max-height: 600px;
// }
}
&__status {
list-style: none;
padding-left: 0;
li {
align-items: flex-start;
display: flex;
justify-content: space-between;
padding: 0.5rem;
&:nth-of-type(odd) {
background: #eee;
}
}
p {
margin: 0;
}
}
}
}
6 changes: 1 addition & 5 deletions _sass/_grid.scss
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
.g-row {
margin: 0 ($spacing-paragraph / -2) (2 * $spacing-paragraph);

[class*=g-col-] {
[class*="g-col-"] {
padding: 0 $spacing-paragraph / 2;
}

@media (min-width: $bp-tablet) {
display: flex;
flex-direction: row;

.g-col-4 {
flex: 0 0 percentage(4/12);
}

.g-col-8 {
flex: 0 0 percentage(8/12);
}
Expand Down
1 change: 0 additions & 1 deletion _sass/_logo-box.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
.logo-box {
flex-shrink: 0;

img {
display: block;
height: 120px;
Expand Down
8 changes: 2 additions & 6 deletions _sass/_page-header.scss
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
.page-header {
$spacing: 90px;

align-items: flex-start;
background: inherit;
display: flex;
flex-direction: row;
padding: 0;

.page-menu {
margin-left: $spacing;

[dir=rtl] & {
[dir="rtl"] & {
margin-left: 0;
margin-right: $spacing;
}

@supports (margin-block-start: $spacing) {
margin-left: 0;
margin-block-start: $spacing;
margin-left: 0;
}
}
}
4 changes: 0 additions & 4 deletions _sass/_page-menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,22 @@
font-size: 24px;
margin-top: 10px;
width: 100%;

.menu {
display: flex;
justify-content: space-around;
list-style-type: none;
margin: 0;
padding: 0;

&-item {
display: block;
}

&-link {
border-bottom: 4px solid transparent;
color: $color-nav;
display: block;
font-weight: normal;
padding: 10px 10px;
text-decoration: none;

&:hover,
&:focus {
border-bottom-color: $color-primary;
Expand Down
Loading

0 comments on commit 6b6ccd2

Please sign in to comment.