Skip to content

Commit 4e31aa6

Browse files
committed
Finished fondling. (C) whatthecommit.com
1 parent 696b473 commit 4e31aa6

File tree

7 files changed

+54
-15
lines changed

7 files changed

+54
-15
lines changed

.travis.yml

+4-9
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,17 @@ git:
66
language: node_js
77
node_js: lts/*
88
python: 3.7
9-
#service: docker
109
os: linux
1110
arch: amd64
1211
addons:
1312
apt:
1413
update: true
1514
packages:
16-
#- jq
15+
- jq
1716
- curl
1817
- sudo
1918
- lsof
20-
#- docker-ce
21-
- python3-pip
19+
- httpie
2220
install: true
2321
before_install:
2422
- export DISPLAY=:99.0
@@ -29,9 +27,6 @@ before_install:
2927
fi
3028
source ${HOME}/.local/daggerok/bash-functions/master/main.bash ;
3129
- stop_any 80 3000 5000 8080 5432
32-
- export PATH=$HOME/.local/bin:$PATH
33-
- pip3 install --user --upgrade pip setuptools
34-
- pip install --user --upgrade httpie
3530
jobs:
3631
include:
3732
- stage: test
@@ -54,8 +49,8 @@ jobs:
5449
- wait_for 8080
5550
script:
5651
- http :8080/
57-
- http :8080/messages
58-
- http :8080/db.json
52+
- http :8080/messages | jq '.'
53+
- http :8080/db.json | jq '.'
5954
after_script: cd $TRAVIS_BUILD_DIR/json-server-forever && npm stop
6055
- stage: test
6156
name: css-grid-display

frontender/package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"build": "parcel build --no-cache src/index.html",
88
"dev": "parcel serve src/index.html",
99
"start": "forever start --minUptime 1000 --spinSleepTime 1000 ./node_modules/.bin/parcel serve src/index.html",
10+
"logs": "forever logs 0",
1011
"stop": "forever stopall --killTree",
1112
"predeploy": "npm-run-all predeploy:*",
1213
"predeploy:rimraf": "rimraf dist",
@@ -23,13 +24,13 @@
2324
"author": "daggerok",
2425
"license": "ISC",
2526
"devDependencies": {
26-
"forever": "1.0.0",
27-
"gh-pages": "2.1.1",
27+
"forever": "2.0.0",
28+
"gh-pages": "2.2.0",
2829
"ncp": "2.0.0",
2930
"npm-run-all": "4.1.5",
3031
"parcel-bundler": "1.12.4",
3132
"rimraf": "3.0.0",
32-
"sass": "^1.24.0",
33+
"sass": "1.25.0",
3334
"webfontloader": "1.6.28"
3435
}
3536
}

frontender/src/box-shadow-neumorphism/index.html

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8">
5-
<meta name="viewport"
6-
content="width=device-width, initial-scale=1.0">
75
<meta http-equiv="X-UA-Compatible" content="ie=edge">
8-
<title>Box Shadow Neumorphism </title>
6+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7+
<title>Box Shadow Neumorphism</title>
98
<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon">
109
<link rel="stylesheet" href="main.css">
1110
</head>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8">
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
6+
<meta http-equiv="X-UA-Compatible" content="ie=edge">
7+
<title>SASS</title>
8+
<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon">
9+
<link rel="stylesheet" href="style.scss">
10+
</head>
11+
<body>
12+
<div id="bg">
13+
14+
</div>
15+
<script src="./main.js"></script>
16+
</body>
17+
</html>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import WebFont from 'webfontloader';
2+
3+
WebFont.load({
4+
google: {
5+
families: [
6+
'Roboto:300,400,500,600,700',
7+
],
8+
},
9+
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
$fonts: (
2+
primary: Roboto sans-serif
3+
);
4+
5+
$colors: (
6+
primary: #3338ff
7+
);
8+
9+
html,
10+
body {
11+
height: 100%;
12+
}
13+
14+
body {
15+
margin: 0;
16+
font-family: map-get($fonts, primary);
17+
}

frontender/src/index.html

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<li><a href="./box-shadow-neumorphism/index.html">box-shadow-neumorphism</a></li>
1717
<li><a href="./nav/index.html">nav</a></li>
1818
<li><a href="./sassy/index.html">sassy</a></li>
19+
<li><a href="./form-bordered-label/index.html">form-bordered-label</a></li>
1920
</ul>
2021
</body>
2122
</html>

0 commit comments

Comments
 (0)