Skip to content

Translate 20201116 #1

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.

Sign up for GitHub

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

Open
tuanth-1803 wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Translate 20201116 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0b24344
continue
Nov 15, 2020
d28aac1
20201115
Nov 15, 2020
76acadc
20201115214600
Nov 15, 2020
af26319
20201115214900
Nov 15, 2020
0e2c2fc
20201115215200
Nov 15, 2020
c5f4619
20201115215500
Nov 15, 2020
47c2c1e
202011161000
Nov 16, 2020
a4abcd4
20201116132800
Nov 16, 2020
97a1b93
20201116161400
tuanth-1803 Nov 16, 2020
5f1d73d
20201116162000
tuanth-1803 Nov 16, 2020
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
10 changes: 7 additions & 3 deletions sample_static/dist/assets/css/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,11 @@ html {
body {
position: relative;
width: 100%;
color: #1a1a1a;
color: #101e2a;
font-family: "Helvetica Neue", Arial, "Hiragino Kaku Gothic ProN", "Hiragino Sans", Meiryo, sans-serif;
font-size: 1.4rem;
line-height: 1.5;
word-break: break-all;
}

a {
Expand Down Expand Up @@ -164,8 +165,7 @@ a {
border-radius: 3px;
background-color: #d0d6dc;
box-shadow: inset 0 -2px 0 0 rgba(0, 0, 0, 0.2);
color: color(#101e2a);
color: #314257;
color: #101e2a;
font-size: 1.4rem;
font-weight: bold;
line-height: 54px;
Expand Down Expand Up @@ -226,6 +226,10 @@ a {
background-color: #ddf;
}

.p-gnav {
background-color: #eee;
}

.p-gnav_list {
display: flex;
align-items: flex-end;
Expand Down
Empty file removed sample_static/dist/assets/css/page_xxx.css
View file
Open in desktop
Empty file.
5 changes: 4 additions & 1 deletion sample_static/dist/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@
</head>

<body>
<a href="layout1.html">Layout1</a>
<h1>ARCHIPELAGO HTML/CSS スタイルガイド</h1>
<p>Hello World!</p>
<br>
<a href="layout1.html"> Responsible Sample</a><br>
</body>

</html>
2 changes: 1 addition & 1 deletion sample_static/src/assets/style/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// Layout
// ==========================================================================

@import "layout/_layout";
@import "layout/_layoutSample";
// @import "layout/_header";
// @import "layout/_main";
// @import "layout/_sidebar";
Expand Down
2 changes: 1 addition & 1 deletion sample_static/src/assets/style/foundation/base/_base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ html {
body {
position: relative;
width: 100%;
color: #1a1a1a;
color: $color_primary;
font-family: "Helvetica Neue", Arial, "Hiragino Kaku Gothic ProN", "Hiragino Sans", Meiryo, sans-serif;
font-size: 1.4rem;
line-height: 1.5;
Expand Down
2 changes: 2 additions & 0 deletions sample_static/src/assets/style/foundation/mixin/_responsive.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
// min-width
$breakpoint_up: (
"pc": "screen and (min-width: #{$bp_sp_max_width+1}px)"
"tab": "screen and (min-width: #{$bp_tab_max_width+1}px)"
) !default;

// max-width
$breakpoint_down: (
"tab": "screen and (max-width: #{$bp_tab_max_width}px)"
"sp": "screen and (max-width: #{$bp_sp_max_width}px)"
) !default;

Expand Down
8 changes: 4 additions & 4 deletions sample_static/src/assets/style/foundation/variable/_variable.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ $max_width_pc: 1200px;
$min_width_pc: 1000px;

// color
$primary: #101e2a;
$error: #ff1f00;
$color_primary: #101e2a;
$color_error: #ff1f00;

$color-font-base: #232323;
$color_font_base: #232323;

$color-bg-content: #eee;
$color_bg_content: #eee;
2 changes: 1 addition & 1 deletion ...atic/src/assets/style/layout/_layout.scss → ...rc/assets/style/layout/_layoutSample.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
margin-right: auto;
margin-left: auto;
padding: 20px;
background-color: $color-bg-content;
background-color: $color_bg_content;

@include mq_down(sp) {
min-width: auto;
Expand Down
3 changes: 1 addition & 2 deletions sample_static/src/assets/style/object/component/_button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
border-radius: 3px;
background-color: #d0d6dc;
box-shadow: inset 0 -2px 0 0 rgba(0, 0, 0, 0.2);
color: color($primary);
color: #314257;
color: $color_primary;
font-size: 1.4rem;
font-weight: bold;
line-height: 54px;
Expand Down
2 changes: 2 additions & 0 deletions sample_static/src/assets/style/object/component/_pageHeading.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
.c-pageHeading {
margin-bottom: 30px;

&_title {
font-size: 30px;
font-weight: bold;
Expand Down
2 changes: 2 additions & 0 deletions sample_static/src/assets/style/object/project/_gnav.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
.p-gnav {
background-color: #eee;

&_list {
display: flex;
align-items: flex-end;
Expand Down
Empty file removed sample_static/src/assets/style/page_xxx.scss
View file
Open in desktop
Empty file.
Loading