Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit71588db

Browse files
committed
Fix getbase installation and npm scripts, watch doesn't work yet
1 parenta1f2021 commit71588db

File tree

2 files changed

+32
-28
lines changed

2 files changed

+32
-28
lines changed

‎package.json‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@
1212
},
1313
"scripts": {
1414
"build:scripts":"babel src/js --out-dir static/compiled --minified --no-comments",
15-
"build:style-coder":"sass src/scss/coder.scssstatic/compiled/coder.css --style compressed",
16-
"build:style-main":"sass src/scss/style.scssstatic/compiled/style.css --style compressed",
15+
"build:style-coder":"sass src/scss/coder.scss:static/compiled/coder.css --style compressed",
16+
"build:style-main":"sass src/scss/style.scss:static/compiled/style.css --style compressed",
1717
"watch:scripts":"nodemon -e js -w src/js -x 'npm run build:scripts'",
18-
"watch:styles":"nodemon -e css -w src/scss -x 'npm run build:style-coder; npm run build:style-main'",
18+
"watch:style-coder":"nodemon -e css -w src/scss -x 'npm run build:style-coder'",
19+
"watch:style-main":"nodemon -e css -w src/scss -x 'npm run build:style-main'",
1920
"build":"run-p build:*",
2021
"watch":"run-p watch:*"
2122
},
@@ -30,15 +31,6 @@
3031
"sass":"^1.52.3"
3132
},
3233
"dependencies": {
33-
"@getbase/base":"^5.2.0",
34-
"@getbase/buttons":"^4.1.0",
35-
"@getbase/containers":"^4.2.1",
36-
"@getbase/forms":"^4.1.0",
37-
"@getbase/grid":"^4.1.0",
38-
"@getbase/layout-helpers":"^4.1.0",
39-
"@getbase/layout-spacers":"^4.1.0",
40-
"@getbase/tables":"^4.1.0",
41-
"@getbase/typography":"^4.1.1",
42-
"@getbase/typography-helpers":"^4.1.0"
34+
"@getbase/base":"^5.2.0"
4335
}
4436
}

‎src/scss/style.scss‎

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,26 @@ $base-heading-font-family: Arial Black;
44
$base-link-color:#0000ee;
55
$base-link-hover-color:#0000ff;
66

7-
// Import Base & Modules
8-
@import"../../node_modules/@getbase/base/scss/index";
9-
@import"../../node_modules/@getbase/buttons/scss/index";
10-
@import"../../node_modules/@getbase/containers/scss/index";
11-
@import"../../node_modules/@getbase/forms/scss/index";
12-
@import"../../node_modules/@getbase/grid/scss/index";
13-
@import"../../node_modules/@getbase/tables/scss/index";
14-
@import"../../node_modules/@getbase/typography/scss/index";
7+
/* Import Base*/
8+
@import"../../node_modules/@getbase/base/scss/_mixins";
9+
@import"../../node_modules/@getbase/base/scss/core";
1510

16-
// Base Typography and Layout Helpers
17-
@import"../../node_modules/@getbase/typography-helpers/scss/index";
18-
@import"../../node_modules/@getbase/layout-helpers/scss/index";
19-
@import"../../node_modules/@getbase/layout-spacers/scss/index";
11+
/* Import Base Common*/
12+
@import"../../node_modules/@getbase/base/scss/code";
13+
@import"../../node_modules/@getbase/base/scss/forms";
14+
@import"../../node_modules/@getbase/base/scss/tables";
15+
@import"../../node_modules/@getbase/base/scss/typography";
16+
@import"../../node_modules/@getbase/base/scss/headings";
2017

2118
@import'palette';
2219
@import'blockquote';
2320

21+
// Additional Modules
22+
@import"../../node_modules/@getbase/base/scss/containers";
23+
@import"../../node_modules/@getbase/base/scss/grid";
24+
@import"../../node_modules/@getbase/base/scss/typography-helpers";
25+
@import"../../node_modules/@getbase/base/scss/display-helpers";
26+
2427
a {
2528
cursor:pointer;
2629
text-decoration:none;
@@ -47,6 +50,7 @@ img {
4750
.box-searchinput,.box-searchbutton {
4851
font-size:1.8rem;
4952
min-height:4rem;
53+
width:100%;
5054
}
5155
.box-searchbutton {
5256
min-width:12rem;
@@ -66,28 +70,36 @@ img {
6670
display:inline-block;
6771
}
6872

73+
.container,.container-full {
74+
padding-left:15px;
75+
padding-right:15px;
76+
margin-left:auto;
77+
margin-right:auto;
78+
}
79+
6980
.main {
7081
background-color:#fff;
7182
}
72-
7383
.mainh2 {
7484
margin:1rem0;
7585
}
7686

7787
.padb {
7888
padding-bottom:1em;
7989
}
80-
8190
.padh {
8291
padding-left:1em;
8392
padding-right:1em;
8493
}
85-
8694
.padv {
8795
padding-top:1em;
8896
padding-bottom:1em;
8997
}
9098

99+
.right {
100+
float:right;
101+
}
102+
91103
.user {
92104
width:9%;
93105
margin-right:1%;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp