diff --git a/CHANGELOG.md b/CHANGELOG.md index d28b922e..601aa5f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,14 +10,14 @@ * fixes shell command detection on Windows * fixes `.htaccess` auth issues * adds `rust` type and icon -* removes *Install* section from `README.md`, to much trouble -* updates `nl` translation -* updates `pl` translation +* removes *Install* section from `README.md`, caused too much trouble * updates build process to use `node 6.0+`, no need for babel now +* updates `normalize.css` to 4.1.1 * updates `jQuery` to 2.2.4 -* updates `jquery-qrcode` to 0.14.0 +* replaces `jquery-qrcode` with `kjua` 0.1.1 * updates `lodash` to 4.13.1 (removes `contains`) * removes `modulejs` +* language updates and additions (`nl`, `pl`) ## v0.28.0 - *2015-12-19* diff --git a/src/_h5ai/public/css/lib/misc.less b/src/_h5ai/public/css/lib/misc.less index 9074bec0..87d440aa 100644 --- a/src/_h5ai/public/css/lib/misc.less +++ b/src/_h5ai/public/css/lib/misc.less @@ -12,3 +12,18 @@ *:focus { outline: none; } + +code, pre { + font-family: @font-family-mono; + font-size: @font-size-mono; + font-weight: @font-weight; + color: @col-text; +} + +audio, canvas, iframe, img, svg, video { + vertical-align: middle; +} + +textarea { + resize: vertical; +} diff --git a/src/_h5ai/public/css/lib/mixins.less b/src/_h5ai/public/css/lib/mixins.less index db667213..7bd772cb 100644 --- a/src/_h5ai/public/css/lib/mixins.less +++ b/src/_h5ai/public/css/lib/mixins.less @@ -1,3 +1,20 @@ +.hidden { + display: none !important; +} + +.invisible { + visibility: hidden; +} + +.clearfix:before, +.clearfix:after { + content: " "; + display: table; +} +.clearfix:after { + clear: both; +} + .card { box-shadow: 0 1px 1px 0 rgba(0,0,0,0.2); } diff --git a/src/_h5ai/public/css/lib/responsive.less b/src/_h5ai/public/css/lib/responsive.less index 27b70db4..7e601c7d 100644 --- a/src/_h5ai/public/css/lib/responsive.less +++ b/src/_h5ai/public/css/lib/responsive.less @@ -21,8 +21,15 @@ } @media print { - a[href]:after { - content: "" !important; + *, + *:before, + *:after, + *:first-letter, + *:first-line { + background: transparent !important; + color: #000 !important; + box-shadow: none !important; + text-shadow: none !important; } #toolbar, #sidebar, #tree, #info { display: none !important; diff --git a/src/_h5ai/public/css/lib/view/root.less b/src/_h5ai/public/css/lib/view/root.less index 524f1ff4..d15a67bc 100644 --- a/src/_h5ai/public/css/lib/view/root.less +++ b/src/_h5ai/public/css/lib/view/root.less @@ -7,6 +7,7 @@ bottom: 0; overflow: hidden; background: @col-back; + line-height: 1.4; } #root, input, select { @@ -15,10 +16,3 @@ font-weight: @font-weight; color: @col-text; } - -pre, code { - font-family: @font-family-mono; - font-size: @font-size-mono; - font-weight: @font-weight; - color: @col-text; -} diff --git a/src/_h5ai/public/css/styles.less b/src/_h5ai/public/css/styles.less index 01a1162c..eace7b45 100644 --- a/src/_h5ai/public/css/styles.less +++ b/src/_h5ai/public/css/styles.less @@ -1,7 +1,6 @@ @charset "utf-8"; // @include "vendor/normalize.less" -// @include "vendor/h5bp-pre.less" // @include "lib/colors.less" // @include "lib/fonts.less" @@ -11,5 +10,3 @@ // @include "lib/*/*.less" // @include "lib/responsive.less" - -// @include "vendor/h5bp-post.less" diff --git a/src/_h5ai/public/css/vendor/h5bp-post.less b/src/_h5ai/public/css/vendor/h5bp-post.less deleted file mode 100644 index 25cd21d2..00000000 --- a/src/_h5ai/public/css/vendor/h5bp-post.less +++ /dev/null @@ -1,169 +0,0 @@ -/* ========================================================================== - Helper classes - ========================================================================== */ - -/* - * Hide visually and from screen readers - */ - -.hidden { - display: none !important; -} - -/* - * Hide only visually, but have it available for screen readers: - * http://snook.ca/archives/html_and_css/hiding-content-for-accessibility - */ - -.visuallyhidden { - border: 0; - clip: rect(0 0 0 0); - height: 1px; - margin: -1px; - overflow: hidden; - padding: 0; - position: absolute; - width: 1px; -} - -/* - * Extends the .visuallyhidden class to allow the element - * to be focusable when navigated to via the keyboard: - * https://www.drupal.org/node/897638 - */ - -.visuallyhidden.focusable:active, -.visuallyhidden.focusable:focus { - clip: auto; - height: auto; - margin: 0; - overflow: visible; - position: static; - width: auto; -} - -/* - * Hide visually and from screen readers, but maintain layout - */ - -.invisible { - visibility: hidden; -} - -/* - * Clearfix: contain floats - * - * For modern browsers - * 1. The space content is one way to avoid an Opera bug when the - * `contenteditable` attribute is included anywhere else in the document. - * Otherwise it causes space to appear at the top and bottom of elements - * that receive the `clearfix` class. - * 2. The use of `table` rather than `block` is only necessary if using - * `:before` to contain the top-margins of child elements. - */ - -.clearfix:before, -.clearfix:after { - content: " "; /* 1 */ - display: table; /* 2 */ -} - -.clearfix:after { - clear: both; -} - -/* ========================================================================== - EXAMPLE Media Queries for Responsive Design. - These examples override the primary ('mobile first') styles. - Modify as content requires. - ========================================================================== */ - -// @media only screen and (min-width: 35em) { -// /* Style adjustments for viewports that meet the condition */ -// } - -// @media print, -// (-webkit-min-device-pixel-ratio: 1.25), -// (min-resolution: 1.25dppx), -// (min-resolution: 120dpi) { -// /* Style adjustments for high resolution devices */ -// } - -/* ========================================================================== - Print styles. - Inlined to avoid the additional HTTP request: - http://www.phpied.com/delay-loading-your-print-css/ - ========================================================================== */ - -@media print { - *, - *:before, - *:after, - *:first-letter, - *:first-line { - background: transparent !important; - color: #000 !important; /* Black prints faster: - http://www.sanbeiji.com/archives/953 */ - box-shadow: none !important; - text-shadow: none !important; - } - - a, - a:visited { - text-decoration: underline; - } - - a[href]:after { - content: " (" attr(href) ")"; - } - - abbr[title]:after { - content: " (" attr(title) ")"; - } - - /* - * Don't show links that are fragment identifiers, - * or use the `javascript:` pseudo protocol - */ - - a[href^="#"]:after, - a[href^="javascript:"]:after { - content: ""; - } - - pre, - blockquote { - border: 1px solid #999; - page-break-inside: avoid; - } - - /* - * Printing Tables: - * http://css-discuss.incutio.com/wiki/Printing_Tables - */ - - thead { - display: table-header-group; - } - - tr, - img { - page-break-inside: avoid; - } - - img { - max-width: 100% !important; - } - - p, - h2, - h3 { - orphans: 3; - widows: 3; - } - - h2, - h3 { - page-break-after: avoid; - } -} diff --git a/src/_h5ai/public/css/vendor/h5bp-pre.less b/src/_h5ai/public/css/vendor/h5bp-pre.less deleted file mode 100644 index 6910f8b4..00000000 --- a/src/_h5ai/public/css/vendor/h5bp-pre.less +++ /dev/null @@ -1,96 +0,0 @@ -/* HTML5 Boilerplate v5.2.0 | MIT License | https://html5boilerplate.com/ */ - -/* - * What follows is the result of much research on cross-browser styling. - * Credit left inline and big thanks to Nicolas Gallagher, Jonathan Neal, - * Kroc Camen, and the H5BP dev community and team. - */ - -/* ========================================================================== - Base styles: opinionated defaults - ========================================================================== */ - -html { - color: #222; - font-size: 1em; - line-height: 1.4; -} - -/* - * Remove text-shadow in selection highlight: - * https://twitter.com/miketaylr/status/12228805301 - * - * These selection rule sets have to be separate. - * Customize the background color to match your design. - */ - -::-moz-selection { - background: #b3d4fc; - text-shadow: none; -} - -::selection { - background: #b3d4fc; - text-shadow: none; -} - -/* - * A better looking default horizontal rule - */ - -hr { - display: block; - height: 1px; - border: 0; - border-top: 1px solid #ccc; - margin: 1em 0; - padding: 0; -} - -/* - * Remove the gap between audio, canvas, iframes, - * images, videos and the bottom of their containers: - * https://github.com/h5bp/html5-boilerplate/issues/440 - */ - -audio, -canvas, -iframe, -img, -svg, -video { - vertical-align: middle; -} - -/* - * Remove default fieldset styles. - */ - -fieldset { - border: 0; - margin: 0; - padding: 0; -} - -/* - * Allow only vertical resizing of textareas. - */ - -textarea { - resize: vertical; -} - -/* ========================================================================== - Browser Upgrade Prompt - ========================================================================== */ - -// .browserupgrade { -// margin: 0.2em 0; -// background: #ccc; -// color: #000; -// padding: 0.2em 0; -// } - -/* ========================================================================== - Author's custom styles - ========================================================================== */ diff --git a/src/_h5ai/public/css/vendor/normalize.less b/src/_h5ai/public/css/vendor/normalize.less index a16bdf0a..12987c72 100644 --- a/src/_h5ai/public/css/vendor/normalize.less +++ b/src/_h5ai/public/css/vendor/normalize.less @@ -1,9 +1,8 @@ -/* normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ +/* normalize.css v4.1.1 | MIT License | github.com/necolas/normalize.css */ /** - * 1. Set default font family to sans-serif. - * 2. Prevent iOS and IE text size adjust after device orientation change, - * without disabling user zoom. + * 1. Change the default font family in all browsers (opinionated). + * 2. Prevent adjustments of font size after orientation changes in IE and iOS. */ html { @@ -13,7 +12,7 @@ html { } /** - * Remove default margin. + * Remove the margin in all browsers (opinionated). */ body { @@ -24,44 +23,39 @@ body { ========================================================================== */ /** - * Correct `block` display not defined for any HTML5 element in IE 8/9. - * Correct `block` display not defined for `details` or `summary` in IE 10/11 - * and Firefox. - * Correct `block` display not defined for `main` in IE 11. + * Add the correct display in IE 9-. + * 1. Add the correct display in Edge, IE, and Firefox. + * 2. Add the correct display in IE. */ article, aside, -details, +details, /* 1 */ figcaption, figure, footer, header, -hgroup, -main, +main, /* 2 */ menu, nav, section, -summary { +summary { /* 1 */ display: block; } /** - * 1. Correct `inline-block` display not defined in IE 8/9. - * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. + * Add the correct display in IE 9-. */ audio, canvas, progress, video { - display: inline-block; /* 1 */ - vertical-align: baseline; /* 2 */ + display: inline-block; } /** - * Prevent modern browsers from displaying `audio` without controls. - * Remove excess height in iOS 5 devices. + * Add the correct display in iOS 4-7. */ audio:not([controls]) { @@ -70,12 +64,20 @@ audio:not([controls]) { } /** - * Address `[hidden]` styling not present in IE 8/9/10. - * Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22. + * Add the correct vertical alignment in Chrome, Firefox, and Opera. */ -[hidden], -template { +progress { + vertical-align: baseline; +} + +/** + * Add the correct display in IE 10-. + * 1. Add the correct display in IE. + */ + +template, /* 1 */ +[hidden] { display: none; } @@ -83,45 +85,59 @@ template { ========================================================================== */ /** - * Remove the gray background color from active links in IE 10. + * 1. Remove the gray background on active links in IE 10. + * 2. Remove gaps in links underline in iOS 8+ and Safari 8+. */ a { - background-color: transparent; + background-color: transparent; /* 1 */ + -webkit-text-decoration-skip: objects; /* 2 */ } /** - * Improve readability of focused elements when they are also in an - * active/hover state. + * Remove the outline on focused links when they are also active or hovered + * in all browsers (opinionated). */ a:active, a:hover { - outline: 0; + outline-width: 0; } /* Text-level semantics ========================================================================== */ /** - * Address styling not present in IE 8/9/10/11, Safari, and Chrome. + * 1. Remove the bottom border in Firefox 39-. + * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. */ abbr[title] { - border-bottom: 1px dotted; + border-bottom: none; /* 1 */ + text-decoration: underline; /* 2 */ + text-decoration: underline dotted; /* 2 */ } /** - * Address style set to `bolder` in Firefox 4+, Safari, and Chrome. + * Prevent the duplicate application of `bolder` by the next rule in Safari 6. */ b, strong { - font-weight: bold; + font-weight: inherit; } /** - * Address styling not present in Safari and Chrome. + * Add the correct font weight in Chrome, Edge, and Safari. + */ + +b, +strong { + font-weight: bolder; +} + +/** + * Add the correct font style in Android 4.3-. */ dfn { @@ -129,8 +145,8 @@ dfn { } /** - * Address variable `h1` font-size and margin within `section` and `article` - * contexts in Firefox 4+, Safari, and Chrome. + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. */ h1 { @@ -139,16 +155,30 @@ h1 { } /** - * Address styling not present in IE 8/9. + * Correct the line-height for all headings in Chrome mobile, Firefox, + * iOS Safari, Microsoft Edge and IE. + */ + +h1, +h2, +h3, +h4, +h5, +h6 { + line-height: 1.15; +} + +/** + * Add the correct background and color in IE 9-. */ mark { - background: #ff0; + background-color: #ff0; color: #000; } /** - * Address inconsistent and variable font size in all browsers. + * Add the correct font size in all browsers. */ small { @@ -156,7 +186,8 @@ small { } /** - * Prevent `sub` and `sup` affecting `line-height` in all browsers. + * Prevent `sub` and `sup` elements from affecting the line height in + * all browsers. */ sub, @@ -167,27 +198,27 @@ sup { vertical-align: baseline; } -sup { - top: -0.5em; -} - sub { bottom: -0.25em; } +sup { + top: -0.5em; +} + /* Embedded content ========================================================================== */ /** - * Remove border when inside `a` element in IE 8/9/10. + * Remove the border on images inside links in IE 10-. */ img { - border: 0; + border-style: none; } /** - * Correct overflow not hidden in IE 9/10/11. + * Hide the overflow in IE. */ svg:not(:root) { @@ -198,7 +229,20 @@ svg:not(:root) { ========================================================================== */ /** - * Address margin not present in IE 8/9 and Safari. + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +code, +kbd, +pre, +samp { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/** + * Add the correct margin in IE 8. */ figure { @@ -206,47 +250,22 @@ figure { } /** - * Address differences between Firefox and other browsers. + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. */ hr { - box-sizing: content-box; - height: 0; -} - -/** - * Contain overflow in all browsers. - */ - -pre { - overflow: auto; -} - -/** - * Address odd `em`-unit font size rendering in all browsers. - */ - -code, -kbd, -pre, -samp { - font-family: monospace, monospace; - font-size: 1em; + box-sizing: content-box; /* 1 */ + height: 0; /* 1 */ + overflow: visible; /* 2 */ } /* Forms ========================================================================== */ /** - * Known limitation: by default, Chrome and Safari on OS X allow very limited - * styling of `select`, unless a `border` property is set. - */ - -/** - * 1. Correct color not being inherited. - * Known issue: affects color of disabled elements. - * 2. Correct font properties not being inherited. - * 3. Address margins set differently in Firefox 4+, Safari, and Chrome. + * 1. Change font properties to `inherit` in all browsers (opinionated). + * 2. Remove the margin in Firefox and Safari. */ button, @@ -254,123 +273,76 @@ input, optgroup, select, textarea { - color: inherit; /* 1 */ - font: inherit; /* 2 */ - margin: 0; /* 3 */ + font: inherit; /* 1 */ + margin: 0; /* 2 */ } /** - * Address `overflow` set to `hidden` in IE 8/9/10/11. + * Restore the font weight unset by the previous rule. */ -button { +optgroup { + font-weight: bold; +} + +/** + * Show the overflow in IE. + * 1. Show the overflow in Edge. + */ + +button, +input { /* 1 */ overflow: visible; } /** - * Address inconsistent `text-transform` inheritance for `button` and `select`. - * All other form control elements do not inherit `text-transform` values. - * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. - * Correct `select` style inheritance in Firefox. + * Remove the inheritance of text transform in Edge, Firefox, and IE. + * 1. Remove the inheritance of text transform in Firefox. */ button, -select { +select { /* 1 */ text-transform: none; } /** - * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` - * and `video` controls. - * 2. Correct inability to style clickable `input` types in iOS. - * 3. Improve usability and consistency of cursor style between image-type - * `input` and others. + * 1. Prevent a WebKit bug where (2) destroys native `audio` and `video` + * controls in Android 4. + * 2. Correct the inability to style clickable types in iOS and Safari. */ button, -html input[type="button"], /* 1 */ -input[type="reset"], -input[type="submit"] { +html [type="button"], /* 1 */ +[type="reset"], +[type="submit"] { -webkit-appearance: button; /* 2 */ - cursor: pointer; /* 3 */ } /** - * Re-set default cursor for disabled elements. - */ - -button[disabled], -html input[disabled] { - cursor: default; -} - -/** - * Remove inner padding and border in Firefox 4+. + * Remove the inner border and padding in Firefox. */ button::-moz-focus-inner, -input::-moz-focus-inner { - border: 0; +[type="button"]::-moz-focus-inner, +[type="reset"]::-moz-focus-inner, +[type="submit"]::-moz-focus-inner { + border-style: none; padding: 0; } /** - * Address Firefox 4+ setting `line-height` on `input` using `!important` in - * the UA stylesheet. + * Restore the focus styles unset by the previous rule. */ -input { - line-height: normal; +button:-moz-focusring, +[type="button"]:-moz-focusring, +[type="reset"]:-moz-focusring, +[type="submit"]:-moz-focusring { + outline: 1px dotted ButtonText; } /** - * It's recommended that you don't attempt to style these elements. - * Firefox's implementation doesn't respect box-sizing, padding, or width. - * - * 1. Address box sizing set to `content-box` in IE 8/9/10. - * 2. Remove excess padding in IE 8/9/10. - */ - -input[type="checkbox"], -input[type="radio"] { - box-sizing: border-box; /* 1 */ - padding: 0; /* 2 */ -} - -/** - * Fix the cursor style for Chrome's increment/decrement buttons. For certain - * `font-size` values of the `input`, it causes the cursor style of the - * decrement button to change from `default` to `text`. - */ - -input[type="number"]::-webkit-inner-spin-button, -input[type="number"]::-webkit-outer-spin-button { - height: auto; -} - -/** - * 1. Address `appearance` set to `searchfield` in Safari and Chrome. - * 2. Address `box-sizing` set to `border-box` in Safari and Chrome. - */ - -input[type="search"] { - -webkit-appearance: textfield; /* 1 */ - box-sizing: content-box; /* 2 */ -} - -/** - * Remove inner padding and search cancel button in Safari and Chrome on OS X. - * Safari (but not Chrome) clips the cancel button when the search input has - * padding (and `textfield` appearance). - */ - -input[type="search"]::-webkit-search-cancel-button, -input[type="search"]::-webkit-search-decoration { - -webkit-appearance: none; -} - -/** - * Define consistent border, margin, and padding. + * Change the border, margin, and padding in all browsers (opinionated). */ fieldset { @@ -380,17 +352,23 @@ fieldset { } /** - * 1. Correct `color` not being inherited in IE 8/9/10/11. - * 2. Remove padding so people aren't caught out if they zero out fieldsets. + * 1. Correct the text wrapping in Edge and IE. + * 2. Correct the color inheritance from `fieldset` elements in IE. + * 3. Remove the padding so developers are not caught out when they zero out + * `fieldset` elements in all browsers. */ legend { - border: 0; /* 1 */ - padding: 0; /* 2 */ + box-sizing: border-box; /* 1 */ + color: inherit; /* 2 */ + display: table; /* 1 */ + max-width: 100%; /* 1 */ + padding: 0; /* 3 */ + white-space: normal; /* 1 */ } /** - * Remove default vertical scrollbar in IE 8/9/10/11. + * Remove the default vertical scrollbar in IE. */ textarea { @@ -398,27 +376,59 @@ textarea { } /** - * Don't inherit the `font-weight` (applied by a rule above). - * NOTE: the default cannot safely be changed in Chrome and Safari on OS X. + * 1. Add the correct box sizing in IE 10-. + * 2. Remove the padding in IE 10-. */ -optgroup { - font-weight: bold; +[type="checkbox"], +[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ } -/* Tables - ========================================================================== */ - /** - * Remove most spacing between table cells. + * Correct the cursor style of increment and decrement buttons in Chrome. */ -table { - border-collapse: collapse; - border-spacing: 0; +[type="number"]::-webkit-inner-spin-button, +[type="number"]::-webkit-outer-spin-button { + height: auto; } -td, -th { - padding: 0; +/** + * 1. Correct the odd appearance in Chrome and Safari. + * 2. Correct the outline style in Safari. + */ + +[type="search"] { + -webkit-appearance: textfield; /* 1 */ + outline-offset: -2px; /* 2 */ +} + +/** + * Remove the inner padding and cancel buttons in Chrome and Safari on OS X. + */ + +[type="search"]::-webkit-search-cancel-button, +[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * Correct the text style of placeholders in Chrome, Edge, and Safari. + */ + +::-webkit-input-placeholder { + color: inherit; + opacity: 0.54; +} + +/** + * 1. Correct the inability to style clickable types in iOS and Safari. + * 2. Change font properties to `inherit` in Safari. + */ + +::-webkit-file-upload-button { + -webkit-appearance: button; /* 1 */ + font: inherit; /* 2 */ }