From 55a7e97efe6e8a8357788aa1b767bf1ee7b6fbb9 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Fri, 23 Dec 2016 00:33:05 +0200 Subject: [PATCH] Minor Jade consistency tweaks. (#836) --- views/_partials/csscode.pug | 15 +++++++++------ views/_partials/jscode.pug | 15 +++++++++------ views/alpha.pug | 4 ++-- views/bootlint.pug | 2 +- views/bootswatch.pug | 1 + views/fontawesome.pug | 2 +- views/index.pug | 5 +++-- views/legacy.pug | 6 ++++-- 8 files changed, 30 insertions(+), 20 deletions(-) diff --git a/views/_partials/csscode.pug b/views/_partials/csscode.pug index 0f72d136d..4aa9aa29d 100644 --- a/views/_partials/csscode.pug +++ b/views/_partials/csscode.pug @@ -1,14 +1,17 @@ .well.hidden(id=name) .form-group - label(for='html_' + name) HTML - input.form-control(type='text', id='html_' + name, value='') + - var id = 'html_' + name + label(for=id) HTML + input.form-control(id=id, type='text', value='') .form-group - label(for='jade_' + name) + - var id = 'jade_' + name + label(for=id) a(href='https://pugjs.org/', target='_blank', rel='noopener') Pug - input.form-control(type='text', id='jade_' + name, value='link(href="' + file + '", rel="stylesheet", integrity="' + sri + '", crossorigin="anonymous")') + input.form-control(id=id, type='text', value='link(href="' + file + '", rel="stylesheet", integrity="' + sri + '", crossorigin="anonymous")') .form-group - label(for='haml_' + name) + - var id = 'haml_' + name + label(for=id) a(href='http://haml.info/', target='_blank', rel='noopener') Haml - input.form-control(type='text', id='haml_' + name, value='%link{href: "' + file + '", rel: "stylesheet", integrity: "' + sri + '", crossorigin: "anonymous"}') + input.form-control(id=id, type='text', value='%link{href: "' + file + '", rel: "stylesheet", integrity: "' + sri + '", crossorigin: "anonymous"}') //- vim: ft=pug sw=4 sts=4 et: diff --git a/views/_partials/jscode.pug b/views/_partials/jscode.pug index d251c8193..e4bd78de2 100644 --- a/views/_partials/jscode.pug +++ b/views/_partials/jscode.pug @@ -1,14 +1,17 @@ .well.hidden(id=name) .form-group - label(for='html_' + name) HTML - input.form-control(type='text', id='html_' + name, value='') + - var id = 'html_' + name + label(for=id) HTML + input.form-control(id=id, type='text', value='') .form-group - label(for='jade_' + name) + - var id = 'jade_' + name + label(for=id) a(href='https://pugjs.org/', target='_blank', rel='noopener') Pug - input.form-control(type='text', id='jade_' + name, value='script(src="' + file + '", integrity="' + sri + '", crossorigin="anonymous")') + input.form-control(id=id, type='text', value='script(src="' + file + '", integrity="' + sri + '", crossorigin="anonymous")') .form-group - label(for='haml_' + name) + - var id = 'haml_' + name + label(for=id) a(href='http://haml.info/', target='_blank', rel='noopener') Haml - input.form-control(type='text', id='haml_' + name, value='%script{src: "' + file + '", integrity: "' + sri + '", crossorigin: "anonymous"}') + input.form-control(id=id, type='text', value='%script{src: "' + file + '", integrity: "' + sri + '", crossorigin: "anonymous"}') //- vim: ft=pug sw=4 sts=4 et: diff --git a/views/alpha.pug b/views/alpha.pug index ba99cf592..7957e840d 100644 --- a/views/alpha.pug +++ b/views/alpha.pug @@ -26,7 +26,7 @@ block content .form-group label(for=id) Complete CSS .input-group.input-group-lg - input.form-control(type='text', id=id, value=file) + input.form-control(id=id, type='text', value=file) .input-group-btn button.btn.btn-default.btn-lg(type='button', data-el=name) span.caret @@ -41,7 +41,7 @@ block content .form-group label(for=id) Complete JavaScript .input-group.input-group-lg - input.form-control(type='text', id=id, value=file) + input.form-control(id=id, type='text', value=file) .input-group-btn button.btn.btn-default.btn-lg(type='button', data-el=name) span.caret diff --git a/views/bootlint.pug b/views/bootlint.pug index b1c0a86a7..807add502 100644 --- a/views/bootlint.pug +++ b/views/bootlint.pug @@ -11,7 +11,7 @@ block content .form-group label(for=id) Complete JavaScript .input-group.input-group-lg - input.form-control(type='text', id=id, value=file) + input.form-control(id=id, type='text', value=file) .input-group-btn button.btn.btn-default.btn-lg(type='button', data-el=name) span.caret diff --git a/views/bootswatch.pug b/views/bootswatch.pug index ee8a30887..8a8bfd9e9 100644 --- a/views/bootswatch.pug +++ b/views/bootswatch.pug @@ -7,6 +7,7 @@ block content - var name = config.bootswatch.themes[i].name.toLowerCase() - var sri = config.bootswatch.themes[i].sri - var file = config.bootswatch.bootstrap.replace('SWATCH_NAME', name).replace('SWATCH_VERSION', config.bootswatch.version) + .row .col-md-2 .tryit diff --git a/views/fontawesome.pug b/views/fontawesome.pug index 479698193..0039d21c6 100644 --- a/views/fontawesome.pug +++ b/views/fontawesome.pug @@ -11,7 +11,7 @@ block content .form-group label(for=id) Font Awesome CSS .input-group.input-group-lg - input.form-control(type='text', id=id, value=file) + input.form-control(id=id, type='text', value=file) .input-group-btn button.btn.btn-default.btn-lg(type='button', data-el=name) span.caret diff --git a/views/index.pug b/views/index.pug index 613864932..3f4ddc4c9 100644 --- a/views/index.pug +++ b/views/index.pug @@ -11,7 +11,7 @@ block content .form-group label(for=id) Complete CSS .input-group.input-group-lg - input.form-control(type='text', id=id, value=file) + input.form-control(id=id, type='text', value=file) .input-group-btn button.btn.btn-default.btn-lg(type='button', data-el=name) span.caret @@ -26,12 +26,13 @@ block content .form-group label(for=id) Complete JavaScript .input-group.input-group-lg - input.form-control(type='text', id=id, value=file) + input.form-control(id=id, type='text', value=file) .input-group-btn button.btn.btn-default.btn-lg(type='button', data-el=name) span.caret include _partials/jscode.pug + p a(href='https://www.maxcdn.com/blog/bootstrapcdn-subresource-integrity/', target='_blank', rel='noopener') Why BootstrapCDN believes in Subresource Integrity (SRI) diff --git a/views/legacy.pug b/views/legacy.pug index c973ee6ea..6d44c4ec8 100644 --- a/views/legacy.pug +++ b/views/legacy.pug @@ -11,10 +11,11 @@ block content - var sri = item.stylesheetSri - var name = 'css_complete_' + item.version.replace(/\./g, '_') - var id = name + '_form' + .form-group label(for=id) Complete CSS .input-group - input.form-control(type='text', id=id, value=file) + input.form-control(id=id, type='text', value=file) .input-group-btn button.btn.btn-default(type='button', data-el=name) span.caret @@ -25,10 +26,11 @@ block content - var sri = item.javascriptSri - var name = 'javascript_' + item.version.replace(/\./g, '_') - var id = name + '_form' + .form-group label(for=id) Complete JavaScript .input-group - input.form-control(type='text', id=id, value=file) + input.form-control(id=id, type='text', value=file) .input-group-btn button.btn.btn-default(type='button', data-el=name) span.caret