Merge branch 'pelican' of github.com:pythonbrasil/wiki into pelican

Author: ayharano

README.md

@@ -145,11 +145,11 @@ $ npm install
 Com as dependências instaladas para rodar a montagem do css com live reload basta rodar:
 
 ```
-$ gulp
+$ npm run gulp
 ```
 
 E caso queira rodar sem o live reload, somente para gerar o css para publicação rode:
 
 ```
-$ gulp build
+$ npm run gulp build
 ```

content/pages/web.md

@@ -1,5 +1,3 @@
-
-  
 Title: Python para desenvolvimento Web
 Slug: web
 Template: page
@@ -31,10 +29,12 @@ Descubra as ferramentas e conteúdo para desenvolvimento Web:
 
 
 #### referencias do web2py (pt-BR)
+
 - [web2py.com.br](https://web2py.com.br/) Site Brasileiro do framework (em desenvolvimento).
 - [wiki na Python brasil](https://wiki.python.org.br/web2py/) 
 - [Grupo Telegram](https://t.me/web2pybrasil) Partricipe
 
 #### Cursos de web2py
+
 - [# PASSO-A-PASSO WEB2PY - Julia Rizza](https://juliarizza.wordpress.com/2015/08/03/passo-a-passo-web2py-1o-passo)  ótimo curso da Julia Rizza, com o básico do framework.
-- [# Curso em Video do Bruno Rocha](https://www.youtube.com/playlist?list=PL5CWed0-MqAPLiMS5gJvWKZDBez-vcRuN) Curso Completo em Video do [Bruno Rocha](http://brunorocha.org/)
+- [# Curso em Video do Bruno Rocha](https://www.youtube.com/playlist?list=PL5CWed0-MqAPLiMS5gJvWKZDBez-vcRuN) Curso Completo em Video do [Bruno Rocha](http://brunorocha.org/)

themes/pybr/gulpfile.js

@@ -7,7 +7,7 @@ var gulp      = require('gulp'),
     rename    = require('gulp-rename'),
     sync      = require('browser-sync');
 
-gulp.task('scss', function () {
+gulp.task('scss', gulp.series(function (done) {
   gulp.src('./static/scss/pybr.scss')
     .pipe(sass({ errLogToConsole: true  }))
     .pipe(prefix())
@@ -16,29 +16,33 @@ gulp.task('scss', function () {
     .pipe(gulp.dest('./static/css'))
     .pipe(notify("styles compiled"))
     .pipe(sync.reload({ stream: true }));
-});
+  done();
+}));
 
-gulp.task('js', function () {
+gulp.task('js', gulp.series(function (done) {
   gulp.src(['./node_modules/jquery/dist/jquery.min.js',
             './node_modules/tether/dist/js/tether.min.js',
             './node_modules/bootstrap/dist/js/bootstrap.min.js'])
     .pipe(gulp.dest('./static/js'))
     .pipe(notify("javascript updated"));
-});
+  done();
+}));
 
-gulp.task('fonts', function () {
+gulp.task('fonts', gulp.series(function (done) {
   gulp.src('./node_modules/font-awesome/fonts/*')
     .pipe(gulp.dest('./static/fonts'))
     .pipe(notify("fonts updated"));
-});
+  done();
+}));
 
-gulp.task('sync', function() {
+gulp.task('sync', gulp.series(function(done) {
   sync.init({
     proxy: 'localhost:8000'
   });
-  gulp.watch('./static/scss/**/*.scss', ['scss']);
-  gulp.watch('./static/js/**/*.js', sync.reload);
-});
+  gulp.watch('./static/scss/**/*.scss', gulp.series(['scss']));
+  gulp.watch('./static/js/**/*.js', gulp.series(sync.reload));
+  done();
+}));
 
-gulp.task('build', ['scss', 'js', 'fonts']);
-gulp.task('default', ['build', 'sync']);
+gulp.task('build', gulp.series(['scss', 'js', 'fonts']));
+gulp.task('default', gulp.series(['build', 'sync']));

themes/pybr/package.json

@@ -4,21 +4,26 @@
   "description": "Python.org.br Pelican Theme",
   "main": "gulpfile.js",
   "scripts": {
+    "gulp": "gulp",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "bootstrap": "4.0.0-alpha.6",
+    "bootstrap": "4.1.3",
     "browser-sync": "^2.18.12",
     "ecstatic": "^2.1.0",
     "font-awesome": "^4.7.0",
-    "gulp": "^3.9.1",
+    "gulp": "^4.0.0",
     "gulp-autoprefixer": "^4.0.0",
     "gulp-clean-css": "^3.3.1",
+    "gulp-cli": "^2.0.0",
     "gulp-minify": "^1.0.0",
     "gulp-notify": "^3.0.0",
     "gulp-rename": "^1.2.2",
-    "gulp-sass": "^3.1.0"
+    "gulp-sass": "^3.1.0",
+    "jquery": "^3.3.1",
+    "popper.js": "^1.14.3",
+    "tether": "^1.3.3"
   }
 }

themes/pybr/static/css/pybr.min.css

@@ -54,7 +54,7 @@
 
   footer {
     padding: 60px 0 20px 0;
-    background-color: $gray-dark;
+    background-color: $gray-900;
     color: $white;
     text-align: justify;
 

themes/pybr/static/js/bootstrap.min.js

@@ -10,12 +10,12 @@ pre, code {
   margin: 50px 0;
 
   .thumbnail {
-    border: solid 1px $gray-lighter;
+    border: solid 1px $gray-500;
     min-height: 415px;
     margin-bottom: 30px;
 
     &:hover {
-      border: solid 1px $gray;
+      border: solid 1px $gray-700;
     }
 
     img {

themes/pybr/static/js/tether.min.js

@@ -1,5 +1,5 @@
 .home-background {
-  background-color: $gray-lightest;
+  background-color: $gray-300;
 
   .page-description-link {
     &:hover {
@@ -14,7 +14,7 @@
       vertical-align: top;
 
       &:hover {
-        background-color: $gray-lighter;
+        background-color: $gray-500;
       }
 
       .page-description-title {