Skip to content

Commit dee8df8

Browse files
author
allythy
committed
add sass
1 parent 8f7360c commit dee8df8

12 files changed

+110
-139
lines changed

Diff for: ‎assets/css/main.css

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

Diff for: ‎assets/css/main.min.css

-1
This file was deleted.

Diff for: ‎assets/css/sass/components/_contato.sass

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#contato h2
2+
&::after
3+
content: ''
4+
border-top: solid 4px rgb(189, 121, 68)
5+
width: 10%
6+
display: block
7+
margin: 25px auto
8+
9+
.substitulo-contato
10+
font-weight: lighter
11+
font-style: italic
12+
font-size: 1.1rem
13+
14+
.contato-social
15+
margin-left: 10px
16+
17+
.contato-nome
18+
font-size: 1.2rem
19+
font-weight: bolder
20+
21+
.card
22+
li
23+
display: inline
24+
color: black
25+
a
26+
padding: 0 3px
27+
font-size: 0.75rem
28+
color: rgba(46, 46, 46, 0.7)
29+
&:hover
30+
color: rgb(30, 30, 31)

Diff for: ‎assets/css/sass/components/_header.sass

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
.container-header
2+
height: 100vh
3+
background:
4+
image: url(https://allythy.github.io/Minicurso-de-git-e-Github/assets/img/fundo.jpg)
5+
position: center
6+
repeat: no-repeat
7+
size: cover
8+
attachment: fixed
9+
filter: opacity(80%)
10+
11+
.sub-text
12+
color: white
13+
font-size: 1.5rem
14+
font-weight: lighter
15+
16+
.h1-header
17+
font-weight: bold
18+
font-size: 4rem
19+
color: white
20+
&::before
21+
content: ''
22+
border-top: solid 4px rgba(255, 255, 255, 100)
23+
width: 100%
24+
display: block
25+
margin: 15px auto
26+
&::after
27+
content: ''
28+
border-top: solid 4px rgba(255, 255, 255, 100)
29+
width: 100%
30+
display: block
31+
margin: 15px auto
32+
33+
nav
34+
background-color: #1A1F21
35+
36+
.navbar-fixed
37+
position: absolute
38+
z-index: 999999999
39+
40+
41+
.substitulo
42+
color: rgb(69, 66, 66)

Diff for: ‎assets/css/sass/components/_participantes.sass

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#participantes h2
2+
&::after
3+
content: ''
4+
border-top: solid 4px rgb(189, 121, 68)
5+
width: 15%
6+
display: block
7+
margin: 25px 0

Diff for: ‎assets/css/sass/components/_sobre.sass

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#sobre
2+
font-size: 1.2rem
3+
h2
4+
&::after
5+
content: ''
6+
border-top: solid 4px rgb(169, 133, 105)
7+
width: 10%
8+
display: block
9+
margin: 20px 0
10+
p
11+
text-align: justify

Diff for: ‎assets/css/sass/components/footer.sass

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
.page-footer
2+
font-size: 0.75rem
3+
margin: 0
4+
padding: 0

Diff for: ‎assets/css/sass/main.sass

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
@import "components/header"
2+
@import "components/participantes"
3+
@import "components/sobre"
4+
@import "components/contato"
5+
@import "components/footer"

Diff for: ‎assets/css/style.css

-117
This file was deleted.

Diff for: ‎gulpfile.js

+7-16
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,14 @@
11
var gulp = require( 'gulp' );
2-
var minifycss = require( 'gulp-minify-css' );
3-
var concat = require( 'gulp-concat' );
4-
var rename = require( 'gulp-rename' );
2+
var sass = require('gulp-sass');
53

6-
gulp.task('copy:pasta',function() {
7-
gulp.src('node_modules/materialize-css/dist/**/*')
8-
.pipe(gulp.dest('vendor'));
9-
});
10-
11-
gulp.task( 'css', function() {
12-
gulp.src( './assets/css/*.css' )
13-
.pipe(concat('concat.js'))
14-
.pipe(rename('main.min.css'))
15-
.pipe( minifycss() )
16-
.pipe( gulp.dest( './assets/css/' ) );
4+
gulp.task('sass', function () {
5+
return gulp.src('assets/css/sass/*.sass')
6+
.pipe(sass({outputStyle: 'compressed'}).on('error', sass.logError))
7+
.pipe(gulp.dest('./assets/css'));
178
});
189

1910
gulp.task( 'watch', function() {
20-
gulp.watch( './assets/css/*.css', [ 'css' ] );
11+
gulp.watch( './assets/css/**/*.sass', [ 'sass' ] );
2112
});
2213

23-
gulp.task('default', ['watch' , 'css', 'copy:pasta']);
14+
gulp.task('default', ['watch' , 'sass']);

Diff for: ‎index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<!--Import materialize.css-->
1111
<link rel="stylesheet" href="vendor/css/materialize.min.css" />
1212
<!-- Import my css -->
13-
<link rel="stylesheet" href="assets/css/style.css">
13+
<link rel="stylesheet" href="assets/css/main.css">
1414
<!--Let browser know website is optimized for mobile-->
1515
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
1616
<title>Curso de git e Github</title>

Diff for: ‎package.json

+2-4
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,13 @@
88
"server": "lite-server"
99
},
1010
"author": "allythy",
11-
"license": "ISC",
11+
"license": "GPL-3.0",
1212
"dependencies": {
1313
"materialize-css": "^0.100.2"
1414
},
1515
"devDependencies": {
1616
"gulp": "^3.9.1",
17-
"gulp-concat": "^2.6.1",
18-
"gulp-minify-css": "^1.2.4",
19-
"gulp-rename": "^1.2.2",
17+
"gulp-sass": "^3.1.0",
2018
"lite-server": "^2.3.0"
2119
}
2220
}

0 commit comments

Comments
 (0)