Skip to content
This repository was archived by the owner on Jun 8, 2022. It is now read-only.

Commit 121cf5b

Browse files
authored
Merge pull request #13 from SebKay/front-end
Front end styling
2 parents fd3764a + 4393deb commit 121cf5b

24 files changed

+839
-215
lines changed

composer.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
"spatie/ray": "^1.19"
3737
},
3838
"scripts": {
39-
"refresh": "git clean -xffd && composer install --ansi",
39+
"build": "git clean -xff -e .env && composer install && yarn install && yarn run dev",
40+
"build:prod": "git clean -xffd -e .env && composer install --no-dev && yarn install && yarn run prod",
4041
"lint:php": "./vendor/bin/phpcs --standard=PSR12 src",
4142
"fix:php": "./vendor/bin/phpcbf --standard=PSR12 src",
4243
"analyse:php": "./vendor/bin/psalm --show-info=true",

composer.lock

+31-36
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+10-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
{
2+
"browserslist": [
3+
"> 1%",
4+
"last 1 version",
5+
"not dead"
6+
],
27
"dependencies": {
3-
"vue": "^3.0.5"
4-
},
5-
"devDependencies": {
8+
"autoprefixer": "^10.2.5",
69
"css-loader": "^5.0.2",
710
"mini-css-extract-plugin": "^1.3.6",
11+
"postcss-loader": "^5.1.0",
812
"sass": "^1.32.7",
913
"sass-loader": "^11.0.1",
14+
"vue": "^3.0.5",
1015
"webpack": "^5.21.2",
11-
"webpack-cli": "^4.5.0"
16+
"webpack-cli": "^4.5.0",
17+
"webpack-notifier": "^1.13.0"
1218
},
1319
"scripts": {
1420
"dev": "webpack --mode=development",

postcss.config.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
module.exports = {
2+
plugins: [
3+
require('autoprefixer')
4+
]
5+
}

resources/assets/js/app.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@ const App = createApp({
44
name: 'App',
55
data() {
66
return {
7-
test: 'yas'
7+
name: 'Slim Starter'
88
}
99
},
10-
mounted() {
11-
console.log('yas');
12-
}
1310
});
1411

1512
App.mount('#app');

resources/assets/scss/_config.scss

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
/**
2+
* Fonts
3+
*/
4+
$font-size-base: 16px;
5+
$font-family-1: 'DM Sans', 'Arial', sans-serif;
6+
7+
$h1: 38px;
8+
$h2: 32px;
9+
$h3: 28px;
10+
$h4: 22px;
11+
$h5: 20px;
12+
$h6: 18px;
13+
14+
/**
15+
* Colors
16+
*/
17+
$ui-color-1: #000;
18+
$ui-color-success: #4BC18B;
19+
$ui-color-error: #D66A6A;
20+
21+
$text-color-1: #2a2a2a;
22+
$text-color-2: #666666;
23+
24+
/**
25+
* Spacing
26+
*/
27+
$spacing: (
28+
1 : (
29+
tiny : 15px,
30+
small : 30px,
31+
medium : 60px,
32+
large : 90px,
33+
),
34+
);
35+
36+
/**
37+
* Other
38+
*/
39+
$border-radius-1: 5px;
40+
41+
$border-1: 1px solid #707070;
42+
$border-2: 1px solid #cccccc;
43+
44+
$transition-speed: .35s;
45+
46+
$z-index: (
47+
1: 900,
48+
2: 800,
49+
3: 700,
50+
);

resources/assets/scss/app.scss

+13
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
1+
@import 'config';
2+
3+
@import 'helpers/functions';
4+
@import 'helpers/mixins';
5+
@import 'helpers/placeholders';
6+
17
@import 'common/reset';
28
@import 'common/typography';
9+
@import 'common/forms';
10+
@import 'common/utilities';
311
@import 'common/general';
412

13+
@import 'elements/button';
14+
15+
@import 'components/forms/form-notice';
16+
@import 'components/forms/form-row';
17+
518
@import 'components/site/wrap';
619
@import 'components/site/header';
720
@import 'components/site/main';
+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
input,
2+
textarea,
3+
select {
4+
@extend %txt-regular;
5+
width: 100%;
6+
padding-right: 15px;
7+
padding-left: 15px;
8+
border-radius: $border-radius-1;
9+
border: $border-2;
10+
background: #fff;
11+
}
12+
13+
input,
14+
select {
15+
height: 50px;
16+
}
17+
18+
textarea {
19+
padding-top: 15px;
20+
padding-bottom: 15px;
21+
// Type
22+
line-height: 140%;
23+
}
24+
25+
label {
26+
@extend %txt-large;
27+
// Type
28+
font-weight: bold;
29+
}
30+
31+
button {
32+
@extend .btn;
33+
}
+6-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
$test: #e2e2e2;
2-
1+
html,
32
body {
4-
background: $test;
3+
background: #fff;
4+
}
5+
6+
[v-cloak] {
7+
display: none;
58
}

0 commit comments

Comments
 (0)