Merge pull request #166 from pythonbrasil/update-sec-issue

Update bootstrap requirement to fix CVE-2018-14041 vulnerability

Author: humrochagf

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
 ```

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

@@ -29,21 +29,23 @@
     {% endif %}
 
     <div class="master-wrapper {% if href == 'index' %}yellow-top-border{% else %}blue-top-border{% endif %}">
-      <nav class="navbar navbar-toggleable-md navbar-inverse bg-inverse fixed-top">
+      <nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top">
+
+        <a class="navbar-brand" href="{{ SITEURL }}/">{{ SITENAME }}</a>
+
         <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
           <span class="navbar-toggler-icon"></span>
         </button>
 
-        <a class="navbar-brand" href="{{ SITEURL }}/">{{ SITENAME }}</a>
 
         <div class="collapse navbar-collapse" id="navbar">
-          <div class="navbar-nav mr-auto">
+          <ul class="navbar-nav mr-auto">
             {% for link in NAVBAR_HOME_LINKS[:-1] %}
               <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                <a class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                   {{ link.title }}
                 </a>
-                <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
+                <div class="dropdown-menu" aria-labelledby="navbarDropdown">
                   {% for sublink in link.children %}
                     {% if sublink.href.startswith('http') %}
                       <a class="dropdown-item" href="{{ sublink.href }}">{{ sublink.title }}</a>
@@ -54,22 +56,22 @@
                 </div>
               </li>
             {% endfor %}
-          </div>
+          </ul>
 
-          <div class="navbar-nav">
+          <ul class="navbar-nav">
             {% for link in NAVBAR_HOME_LINKS[-1:] %}
               <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                   {{ link.title }}
                 </a>
-                <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownMenuLink">
+                <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
                   {% for sublink in link.children %}
                     <a class="dropdown-item" href="{{ SITEURL }}/{{ sublink.href }}">{{ sublink.title }}</a>
                   {% endfor %}
                 </div>
               </li>
             {% endfor %}
-          </div>
+          </ul>
         </div>
       </nav>