Skip to content

ヘッダスタイル調整 & お知らせタイムライン #125

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.

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

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 21 additions & 0 deletions _sass/_base.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// _base.scss
// 共通のスタイル

$emacs-jp-prefix: "emacs-jp";

// 基調カラー
$text-color: #333;
$text-disabled-color: lighten($text-color, 40%);

// 修飾カラー
$primary-color: #00BFFF;
$error-color: #ea222d;
$success-color: #9AC846;
$emacs-brand-color: #7F5AB6;
$fsf-brand-color: maroon;

// フォント & 行
$font-size-base: 14px;
$font-size-lg: $font-size-base + 2px;
$font-size-sm: $font-size-base - 2px;
$line-height-base: 1.5;
13 changes: 13 additions & 0 deletions _sass/_mixins.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// _mixins.scss
// mixin

@import "_base";

@mixin reset-component() {
font-size: $font-size-base;
line-height: $line-height-base;
box-sizing: border-box;
margin: 0;
padding: 0;
list-style: none;
}
13 changes: 10 additions & 3 deletions _sass/_style.scss
Original file line number Diff line number Diff line change
@@ -1,21 +1,28 @@
@charset "UTF-8";
@import "base";

h1, h2, h3 {
margin: 1.5rem 0;
}

h1 {
font-size: 2.0rem;
border-bottom: solid 3px;
padding: 0 0.1rem 1rem 0.1rem;
background-color: $fsf-brand-color;
color: white;
padding: 1rem 0.1rem 1rem 1rem;
}

h2 {
font-size: 1.8rem;
border-bottom: solid 2px;
border-bottom: solid 2px $fsf-brand-color;
padding: 0.7rem 0.1rem;
}

h3 {
padding-left: .8rem;
border-left: 4px solid $fsf-brand-color;
}

footer {
text-align: center;
margin-top: 2.5rem;
Expand Down
82 changes: 82 additions & 0 deletions _sass/_timeline.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
// _timeline.scss
// タイムラインのコンポーネント

@import "_base";
@import "_mixins";

$timeline-color: lighten(black, 91%);
$component-background: white;

.#{$emacs-jp-prefix}-timeline {
@include reset-component();

&-item {
position: relative;
padding: 0 0 20px;
list-style: none;
margin: 0;
font-size: $font-size-base;

&-tail {
position: absolute;
left: 4px;
top: 0.75em;
height: 100%;
border-left: 2px solid $timeline-color;
}

&-pending &-head {
font-size: $font-size-sm;
}

&-pending &-tail {
display: none;
}

&-head {
position: absolute;
width: 10px;
height: 10px;
background-color: $component-background;
border-radius: 100px;
border: 2px solid transparent;

&-blue {
border-color: $primary-color;
color: $primary-color;
}
&-red {
border-color: $error-color;
color: $error-color;
}
&-green {
border-color: $success-color;
color: $success-color;
}
}

&-content {
padding: 0 0 0 18px;
position: relative;
top: -($font-size-base * $line-height-base - $font-size-base) + 1px;
&-date {
font-size: $font-size-sm;
color: $text-disabled-color;
}
}

&:last-child {
.#{$emacs-jp-prefix}-timeline-item-tail {
border-left: 2px dotted $timeline-color;
display: none;
}
.#{$emacs-jp-prefix}-timeline-item-content {
min-height: 48px;
}
}
}

&-item:last-child &-item-tail {
display: block;
}
}
1 change: 1 addition & 0 deletions css/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@

@import "style";
@import "syntax";
@import "timeline";
18 changes: 15 additions & 3 deletions index.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
---
layout: page
layout: default
title: 日本のEmacsユーザーのためのハブサイト
---
{% include JB/setup %}

<div align="center">
<img src="/images/emacs-jp.png" height="150" />
<h1>{{ page.title }}</h1>
</div>

**{{ site.title }}**はEmacsと日本語に関わるあらゆるリソースを集約することを目的としたコミュニティサイトです。
Emacsと{{ site.title }}についての詳細は[このサイトについて](/about.html)をごらんください。

Expand All @@ -26,9 +31,16 @@ Emacsについて、

## お知らせ

<ul class="posts">
<ul class="posts emacs-jp-timeline">
{% for post in site.posts %}
<li><span>{{ post.date | date: "%Y-%m-%d" }}</span> &raquo; <a href="{{ BASE_PATH }}{{ post.url }}">{{ post.title }}</a></li>
<li class="emacs-jp-timeline-item">
<div class="emacs-jp-timeline-item-tail"></div>
<div class="emacs-jp-timeline-item-head emacs-jp-timeline-item-head-red"></div>
<div class="emacs-jp-timeline-item-content">
<a href="{{ BASE_PATH }}{{ post.url }}">{{ post.title }}</a><br/>
<div class="emacs-jp-timeline-item-content-date">{{ post.date | date_to_string }}</div>
</div>
</li>
{% endfor %}
</ul>

Expand Down