Skip to content
This repository was archived by the owner on Mar 19, 2020. It is now read-only.

Commit 39052fe

Browse files
author
Yuma Soga
committed
#35 Update Pages Desgin and add links
1 parent f6419a3 commit 39052fe

File tree

3 files changed

+20
-127
lines changed

3 files changed

+20
-127
lines changed

app/assets/stylesheets/pages.scss

Lines changed: 15 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -1,131 +1,7 @@
11
// // Place all the styles related to the pages controller here.
22
// // They will automatically be included in application.css.
33
// // You can use Sass (SCSS) here: http://sass-lang.com/
4-
// .pages-layout {
5-
// .pages-layout__header {
6-
// background-image: linear-gradient(rgba(0, 0, 0, .3), rgba(0, 0, 0, .3)), image-url('coderdojo-konan-header-image-1.jpg');
7-
// background-size: cover;
8-
// background-position: center;
9-
// .mdl-layout__header-row {
10-
// margin-top: 0.5rem;
11-
// margin-bottom: 0.5rem;
12-
// }
13-
// }
14-
// article {
15-
// margin: 0.5rem;
16-
// #pages-section {
17-
// padding: 0.8rem;
18-
// .pages-section-card {
19-
// width: 100%;
20-
// height: 100%;
21-
// padding: 0.5rem;
22-
// }
23-
// }
24-
// .pages-section {
25-
// padding: 0.8rem;
26-
// .pages-section-card {
27-
// width: 100%;
28-
// height: 100%;
29-
// padding: 0.5rem;
30-
// }
31-
// }
32-
// }
33-
// .mdl-layout__content {
34-
// #pages-section {
35-
// .docs-list {
36-
// ul {
37-
// font-size: 1.3rem;
38-
// }
39-
// }
40-
// }
41-
// .pages-contents {
42-
// h1 {
43-
// font-size: 2.0rem;
44-
// color: black;
45-
// line-height: 2.2rem;
46-
// }
47-
// h2 {
48-
// font-size: 1.75rem;
49-
// color: black;
50-
// line-height: 1.8rem;
51-
// }
52-
// h3 {
53-
// font-size: 1.65rem;
54-
// color: black;
55-
// line-height: 1.7rem;
56-
// }
57-
// h4 {
58-
// font-size: 1.5rem;
59-
// line-height: 1.6rem;
60-
// color: black;
61-
// }
62-
// p {
63-
// font-size: 1rem;
64-
// }
65-
// .pages-col {
66-
// display: inline-block;
67-
// vertical-align: middle;
68-
// margin: 1rem;
69-
// }
70-
//
71-
// .ninjas-works-video {
72-
// iframe {
73-
// width: 400px;
74-
// height: 300px;
75-
// }
76-
// }
77-
//
78-
// .ninjas-works-impressions {
79-
// background: aliceblue;
80-
// -webkit-box-shadow: 2px 2px 0px 0px #777;
81-
// -moz-box-shadow: 2px 2px 0px 0px #777;
82-
// box-shadow: 2px 2px 0px 0px #777;
83-
// border-radius: 10px;
84-
// p {
85-
// color: black;
86-
// }
87-
// .ninjas-works-container {
88-
// padding: 0.3rem;
89-
// width: 100%;
90-
// height: 100%;
91-
// .pages-col {
92-
// display: inline-block;
93-
// padding: 0.3rem;
94-
// margin: 0.5rem;
95-
// margin-top: 1rem;
96-
// h4 {
97-
// margin-top: 0;
98-
// margin-bottom: 0;
99-
// line-height: 1.5rem;
100-
// }
101-
// }
102-
// img {
103-
// margin: auto;
104-
// border-radius: 50%;
105-
// width: 5rem;
106-
// height: 5rem;
107-
// }
108-
// .ninjas-icon {
109-
// p {
110-
// text-align: center;
111-
// margin: 0.1rem;
112-
// }
113-
// }
114-
// }
115-
// }
116-
// .twitter-share-button-style {
117-
// vertical-align: top;
118-
// display: inline-block;
119-
// margin: 0.5rem;
120-
// }
121-
// .fb-share-button-style {
122-
// vertical-align: top;
123-
// display: inline-block;
124-
// margin: 0.5rem;
125-
// }
126-
// }
127-
// }
128-
// }
4+
1295
#page-content {
1306
.page-title {
1317
border-bottom: 0.3rem dotted $primary;
@@ -134,5 +10,19 @@
13410
max-width: 100%;
13511
border-width: 100%;
13612
border-color: $primary;
13+
margin-bottom: 1.3rem;
14+
}
15+
h2 {
16+
margin-top: 1.5rem;
17+
}
18+
h3 {
19+
margin-top: 1rem;
20+
margin-bottom: 1rem;
21+
font-size: 1.5rem;
22+
}
23+
table {
24+
@extend .table;
25+
@extend .table-striped;
26+
@extend .table-bordered;
13727
}
13828
}

app/controllers/application_controller.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ def put_ver_link
1010
@first_link = { :url => "#{root_url}", :text => "ROOT" }
1111
@second_link = { :url => "#{root_url}", :text => "ROOT" }
1212
@third_link = { :url => "#{root_url}visit-interview", :text => "見学・取材について" }
13-
@fourth_link = { :url => "#{root_url}f-and-q", :text => "よくある質問 (F&Q)" }
13+
@fourth_link = { :url => "#{root_url}f-and-q", :text => "よくある質問 (F&Q)" }
14+
@first_link_footer = { url: "#{root_url}pages", text: "ページ一覧" }
15+
@second_link_footer = { url: "#{root_url}regulation", text: "会則" }
1416
end
1517
end

app/helpers/markdown_helper.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ def md_to_html(md_text)
88
extensions = {
99
autolink: true,
1010
no_intra_emphasis: true,
11-
fenced_code_blocks: true
11+
fenced_code_blocks: true,
12+
tables: true
1213
}
1314
unless @markdown
1415
renderer = Redcarpet::Render::OriginalHTML.new(options)

0 commit comments

Comments
 (0)