diff --git a/.eleventy.js b/.eleventy.js index 3d50ffb8dc7..0fc7b5e9b15 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -1,4 +1,13 @@ module.exports = function (eleventyConfig) { eleventyConfig.addPassthroughCopy("assets"); eleventyConfig.addPassthroughCopy("images"); + + eleventyConfig.addNunjucksFilter("color", function(value) { + if (value < 50) { + return "#c60c0c45"; + } + // TODO complete with all values available in Mozilla Observatory + // and use "grade" (A, B, etc) instead of the numeric "score". + return "inherit"; + }); }; diff --git a/assets/css/main.css b/assets/css/main.css index ab030e77275..4c774b60bb1 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -1,10 +1,9 @@ @import url(fontawesome-all.min.css); -@import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,700,900"); -/* - Phantom by HTML5 UP - html5up.net | @ajlkn - Free for personal and commercial use under the CCA 3.0 license (html5up.net/license) +/* + Phantom by HTML5 UP + html5up.net | @ajlkn + Free for personal and commercial use under the CCA 3.0 license (html5up.net/license) */ html, body, div, span, applet, object, @@ -117,7 +116,7 @@ input, select, textarea { body, input, select, textarea { color: #585858; - font-family: "Source Sans Pro", Helvetica, sans-serif; + font-family: Helvetica, sans-serif; font-size: 16pt; font-weight: 300; line-height: 1.75; @@ -2388,10 +2387,6 @@ input, select, textarea { border-right: 0; } - table tbody tr:nth-child(2n + 1) { - background-color: rgba(144, 144, 144, 0.075); - } - table td { padding: 0.75em 0.75em; } @@ -2411,32 +2406,6 @@ input, select, textarea { border-top: solid 2px #c9c9c9; } - table.alt { - border-collapse: separate; - } - - table.alt tbody tr td { - border: solid 1px #c9c9c9; - border-left-width: 0; - border-top-width: 0; - } - - table.alt tbody tr td:first-child { - border-left-width: 1px; - } - - table.alt tbody tr:first-child td { - border-top-width: 1px; - } - - table.alt thead { - border-bottom: 0; - } - - table.alt tfoot { - border-top: 0; - } - /* Button */ input[type="submit"], diff --git a/assets/sass/components/_table.scss b/assets/sass/components/_table.scss index d6e872865cf..a87163c5c61 100644 --- a/assets/sass/components/_table.scss +++ b/assets/sass/components/_table.scss @@ -20,10 +20,6 @@ border: solid _size(border-width) _palette(border); border-left: 0; border-right: 0; - - &:nth-child(2n + 1) { - background-color: _palette(border-bg); - } } } @@ -46,36 +42,4 @@ tfoot { border-top: solid (_size(border-width) * 2) _palette(border); } - - &.alt { - border-collapse: separate; - - tbody { - tr { - td { - border: solid _size(border-width) _palette(border); - border-left-width: 0; - border-top-width: 0; - - &:first-child { - border-left-width: _size(border-width); - } - } - - &:first-child { - td { - border-top-width: _size(border-width); - } - } - } - } - - thead { - border-bottom: 0; - } - - tfoot { - border-top: 0; - } - } } \ No newline at end of file diff --git a/assets/sass/libs/_vars.scss b/assets/sass/libs/_vars.scss index 9cea5e96635..e9cc3cfafe0 100644 --- a/assets/sass/libs/_vars.scss +++ b/assets/sass/libs/_vars.scss @@ -23,7 +23,7 @@ // Font. $font: ( - family: ('Source Sans Pro', Helvetica, sans-serif), + family: (Helvetica, sans-serif), family-fixed: ('Courier New', monospace), weight: 300, weight-bold: 900, diff --git a/assets/sass/main.scss b/assets/sass/main.scss index 27343649534..76adacf4a8d 100644 --- a/assets/sass/main.scss +++ b/assets/sass/main.scss @@ -5,7 +5,6 @@ @import 'libs/breakpoints'; @import 'libs/html-grid'; @import 'fontawesome-all.min.css'; -@import url('https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,700,900'); /* Phantom by HTML5 UP diff --git a/crawl.sh b/crawl.sh index 1aa9eb89ef5..8d8c8954edc 100755 --- a/crawl.sh +++ b/crawl.sh @@ -7,7 +7,7 @@ for site in $SITES; do curl -s -X POST "https://http-observatory.security.mozilla.org/api/v1/analyze?host=$site&rescan=true" done -sleep 60 +sleep 60 # XXX polling until mozilla finishes scanning the site might be more elegant rm _data/results/*.json for site in $SITES; do diff --git a/index.njk b/index.njk index fcb92809995..985fc90708a 100644 --- a/index.njk +++ b/index.njk @@ -6,16 +6,11 @@ --> - Web segura + Web Segura. Obsrevatorio de seguridad web de Valladolid. - + - + @@ -25,11 +20,11 @@
- - Puntuación + Nota Sitio web - Perfiles {% for web, json in results %} - - {{json.grade}} - {{web | replace("!", ".")}} - + + {{ json.grade }} + {{ web | replace("!", ".") }} {% endfor %} @@ -88,89 +82,34 @@
- - --> diff --git a/sites.csv b/sites.csv index 05d3489488b..968ee18881c 100644 --- a/sites.csv +++ b/sites.csv @@ -1,5 +1,8 @@ www.auvasa.es,AUVASA -www.valladolid.es,Ayuntamiento de Valladolid +www.casadelaindia.org,Casa de la India +www.centroculturalmigueldelibes.com,Centro Cultural Miguel Delibes +feriavalladolid.com,Feria de Valladolid +www.fmdva.org,Fundación Municipal de Deportes www.museocienciavalladolid.es,Museo de la Ciencia www.uva.es,Universidad de Valladolid -www.casadelaindia.org,Casa de la India +www.valladolid.es,Ayuntamiento de Valladolid