diff --git a/package.json b/package.json index b505eb0649..3f33eeeea5 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "gulp-uglify": "^1.4.2", "gulp-util": "^3.0.7", "gulp-watch": "^4.3.5", - "jake": "latest", + "jake": "^8.0.16", "js-fixtures": "^1.5.3", "mocha": "^4.1.0", "path": "^0.12.7", diff --git a/resources/gulp/components/common.js b/resources/gulp/components/common.js index 2f7a0f8edd..8fe777b941 100644 --- a/resources/gulp/components/common.js +++ b/resources/gulp/components/common.js @@ -13,7 +13,12 @@ gulp.task('copy-common-fonts',function(){ .pipe(gulp.dest(config.paths.build + 'common/fonts')); }); -gulp.task('build-common-font-css', ['copy-common-fonts'],function(){ +gulp.task('copy-common-roboto-fonts', function () { + return gulp.src([config.paths.src + 'common/styles/fonts/**']) + .pipe(gulp.dest(config.paths.build + 'common/fonts')); +}); + +gulp.task('build-common-font-css', ['copy-common-fonts', 'copy-common-roboto-fonts'], function () { return gulp.src([config.paths.nodes + 'font-awesome/css/font-awesome.min.css']) .pipe(gulp.dest( config.paths.build + 'common/css')); }); diff --git a/resources/www/common/styles/font-sass/_Black.scss b/resources/www/common/styles/font-sass/_Black.scss new file mode 100755 index 0000000000..b33f62c693 --- /dev/null +++ b/resources/www/common/styles/font-sass/_Black.scss @@ -0,0 +1,9 @@ +/* BEGIN Black */ +@font-face { + font-family: Roboto; + @include fontdef-woff($FontPath, $FontName, $FontVersion, "Black"); + font-weight: 900; + font-style: normal; +} + +/* END Black */ diff --git a/resources/www/common/styles/font-sass/_BlackItalic.scss b/resources/www/common/styles/font-sass/_BlackItalic.scss new file mode 100755 index 0000000000..a87a046f90 --- /dev/null +++ b/resources/www/common/styles/font-sass/_BlackItalic.scss @@ -0,0 +1,9 @@ +/* BEGIN Black Italic */ +@font-face { + font-family: Roboto; + @include fontdef-woff($FontPath, $FontName, $FontVersion, "BlackItalic"); + font-weight: 900; + font-style: italic; +} + +/* END Black Italic */ diff --git a/resources/www/common/styles/font-sass/_Bold.scss b/resources/www/common/styles/font-sass/_Bold.scss new file mode 100755 index 0000000000..dbab747c2a --- /dev/null +++ b/resources/www/common/styles/font-sass/_Bold.scss @@ -0,0 +1,16 @@ +/* BEGIN Bold */ +@font-face { + font-family: Roboto; + @include fontdef-woff($FontPath, $FontName, $FontVersion, "Bold"); + font-weight: 700; + font-style: normal; +} + +@font-face { + font-family: Roboto; + @include fontdef-woff($FontPath, $FontName, $FontVersion, "Bold"); + font-weight: bold; + font-style: normal; +} + +/* END Bold */ diff --git a/resources/www/common/styles/font-sass/_BoldItalic.scss b/resources/www/common/styles/font-sass/_BoldItalic.scss new file mode 100755 index 0000000000..7fc116c27d --- /dev/null +++ b/resources/www/common/styles/font-sass/_BoldItalic.scss @@ -0,0 +1,16 @@ +/* BEGIN Bold Italic */ +@font-face { + font-family: Roboto; + @include fontdef-woff($FontPath, $FontName, $FontVersion, "BoldItalic"); + font-weight: 700; + font-style: italic; +} + +@font-face { + font-family: Roboto; + @include fontdef-woff($FontPath, $FontName, $FontVersion, "BoldItalic"); + font-weight: bold; + font-style: italic; +} + +/* END Bold Italic */ diff --git a/resources/www/common/styles/font-sass/_Italic.scss b/resources/www/common/styles/font-sass/_Italic.scss new file mode 100755 index 0000000000..ea62b696e1 --- /dev/null +++ b/resources/www/common/styles/font-sass/_Italic.scss @@ -0,0 +1,16 @@ +/* BEGIN Italic */ +@font-face { + font-family: Roboto; + @include fontdef-woff($FontPath, $FontName, $FontVersion, "Italic"); + font-weight: 400; + font-style: italic; +} + +@font-face { + font-family: Roboto; + @include fontdef-woff($FontPath, $FontName, $FontVersion, "Italic"); + font-weight: normal; + font-style: italic; +} + +/* END Italic */ diff --git a/resources/www/common/styles/font-sass/_Light.scss b/resources/www/common/styles/font-sass/_Light.scss new file mode 100755 index 0000000000..43743ea4d8 --- /dev/null +++ b/resources/www/common/styles/font-sass/_Light.scss @@ -0,0 +1,9 @@ +/* BEGIN Light */ +@font-face { + font-family: Roboto; + @include fontdef-woff($FontPath, $FontName, $FontVersion, "Light"); + font-weight: 300; + font-style: normal; +} + +/* END Light */ diff --git a/resources/www/common/styles/font-sass/_LightItalic.scss b/resources/www/common/styles/font-sass/_LightItalic.scss new file mode 100755 index 0000000000..e9ea4af4c7 --- /dev/null +++ b/resources/www/common/styles/font-sass/_LightItalic.scss @@ -0,0 +1,9 @@ +/* BEGIN Light Italic */ +@font-face { + font-family: Roboto; + @include fontdef-woff($FontPath, $FontName, $FontVersion, "LightItalic"); + font-weight: 300; + font-style: italic; +} + +/* END Light Italic */ diff --git a/resources/www/common/styles/font-sass/_Medium.scss b/resources/www/common/styles/font-sass/_Medium.scss new file mode 100755 index 0000000000..aab0cb7201 --- /dev/null +++ b/resources/www/common/styles/font-sass/_Medium.scss @@ -0,0 +1,9 @@ +/* BEGIN Medium */ +@font-face { + font-family: Roboto; + @include fontdef-woff($FontPath, $FontName, $FontVersion, "Medium"); + font-weight: 500; + font-style: normal; +} + +/* END Medium */ diff --git a/resources/www/common/styles/font-sass/_MediumItalic.scss b/resources/www/common/styles/font-sass/_MediumItalic.scss new file mode 100755 index 0000000000..c84866b67c --- /dev/null +++ b/resources/www/common/styles/font-sass/_MediumItalic.scss @@ -0,0 +1,9 @@ +/* BEGIN Medium Italic */ +@font-face { + font-family: Roboto; + @include fontdef-woff($FontPath, $FontName, $FontVersion, "MediumItalic"); + font-weight: 500; + font-style: italic; +} + +/* END Medium Italic */ diff --git a/resources/www/common/styles/font-sass/_Regular.scss b/resources/www/common/styles/font-sass/_Regular.scss new file mode 100755 index 0000000000..243476febf --- /dev/null +++ b/resources/www/common/styles/font-sass/_Regular.scss @@ -0,0 +1,16 @@ +/* BEGIN Regular */ +@font-face { + font-family: Roboto; + @include fontdef-woff($FontPath, $FontName, $FontVersion, "Regular"); + font-weight: 400; + font-style: normal; +} + +@font-face { + font-family: Roboto; + @include fontdef-woff($FontPath, $FontName, $FontVersion, "Regular"); + font-weight: normal; + font-style: normal; +} + +/* END Regular */ diff --git a/resources/www/common/styles/font-sass/_Thin.scss b/resources/www/common/styles/font-sass/_Thin.scss new file mode 100755 index 0000000000..4aa62328ef --- /dev/null +++ b/resources/www/common/styles/font-sass/_Thin.scss @@ -0,0 +1,9 @@ +/* BEGIN Thin */ +@font-face { + font-family: Roboto; + @include fontdef-woff($FontPath, $FontName, $FontVersion, "Thin"); + font-weight: 100; + font-style: normal; +} + +/* END Thin */ diff --git a/resources/www/common/styles/font-sass/_ThinItalic.scss b/resources/www/common/styles/font-sass/_ThinItalic.scss new file mode 100755 index 0000000000..b35ea59db1 --- /dev/null +++ b/resources/www/common/styles/font-sass/_ThinItalic.scss @@ -0,0 +1,9 @@ +/* BEGIN Thin Italic */ +@font-face { + font-family: Roboto; + @include fontdef-woff($FontPath, $FontName, $FontVersion, "ThinItalic"); + font-weight: 100; + font-style: italic; +} + +/* END Thin Italic */ diff --git a/resources/www/common/styles/font-sass/_mixins.scss b/resources/www/common/styles/font-sass/_mixins.scss new file mode 100755 index 0000000000..96af5dabd1 --- /dev/null +++ b/resources/www/common/styles/font-sass/_mixins.scss @@ -0,0 +1,4 @@ +@mixin fontdef-woff($FontPath, $FontName, $FontVersion:"1.0.0", $FontType:"Regular") { + src: url('#{$FontPath}/#{$FontType}/#{$FontName}-#{$FontType}.woff2?v=#{$FontVersion}') format('woff2'), + url('#{$FontPath}/#{$FontType}/#{$FontName}-#{$FontType}.woff?v=#{$FontVersion}') format('woff'); +} diff --git a/resources/www/common/styles/font-sass/_variables.scss b/resources/www/common/styles/font-sass/_variables.scss new file mode 100755 index 0000000000..1b2c876ceb --- /dev/null +++ b/resources/www/common/styles/font-sass/_variables.scss @@ -0,0 +1,3 @@ +$FontPath: "../fonts" !default; +$FontName: "Roboto" !default; +$FontVersion: "2.137" !default; diff --git a/resources/www/common/styles/font-sass/roboto.scss b/resources/www/common/styles/font-sass/roboto.scss new file mode 100755 index 0000000000..aaec00856f --- /dev/null +++ b/resources/www/common/styles/font-sass/roboto.scss @@ -0,0 +1,14 @@ +@import "variables"; +@import "mixins"; +@import "Thin"; +@import "ThinItalic"; +@import "Light"; +@import "LightItalic"; +@import "Regular"; +@import "Italic"; +@import "Medium"; +@import "MediumItalic"; +@import "Bold"; +@import "BoldItalic"; +@import "Black"; +@import "BlackItalic"; diff --git a/resources/www/common/styles/fonts/Black/Roboto-Black.ttf b/resources/www/common/styles/fonts/Black/Roboto-Black.ttf new file mode 100755 index 0000000000..689fe5cb3c Binary files /dev/null and b/resources/www/common/styles/fonts/Black/Roboto-Black.ttf differ diff --git a/resources/www/common/styles/fonts/Black/Roboto-Black.woff b/resources/www/common/styles/fonts/Black/Roboto-Black.woff new file mode 100755 index 0000000000..1fe59bab31 Binary files /dev/null and b/resources/www/common/styles/fonts/Black/Roboto-Black.woff differ diff --git a/resources/www/common/styles/fonts/Black/Roboto-Black.woff2 b/resources/www/common/styles/fonts/Black/Roboto-Black.woff2 new file mode 100755 index 0000000000..41186d078e Binary files /dev/null and b/resources/www/common/styles/fonts/Black/Roboto-Black.woff2 differ diff --git a/resources/www/common/styles/fonts/BlackItalic/Roboto-BlackItalic.ttf b/resources/www/common/styles/fonts/BlackItalic/Roboto-BlackItalic.ttf new file mode 100755 index 0000000000..0b4e0ee108 Binary files /dev/null and b/resources/www/common/styles/fonts/BlackItalic/Roboto-BlackItalic.ttf differ diff --git a/resources/www/common/styles/fonts/BlackItalic/Roboto-BlackItalic.woff b/resources/www/common/styles/fonts/BlackItalic/Roboto-BlackItalic.woff new file mode 100755 index 0000000000..532150fce9 Binary files /dev/null and b/resources/www/common/styles/fonts/BlackItalic/Roboto-BlackItalic.woff differ diff --git a/resources/www/common/styles/fonts/BlackItalic/Roboto-BlackItalic.woff2 b/resources/www/common/styles/fonts/BlackItalic/Roboto-BlackItalic.woff2 new file mode 100755 index 0000000000..df3c3f4472 Binary files /dev/null and b/resources/www/common/styles/fonts/BlackItalic/Roboto-BlackItalic.woff2 differ diff --git a/resources/www/common/styles/fonts/Bold/Roboto-Bold.ttf b/resources/www/common/styles/fonts/Bold/Roboto-Bold.ttf new file mode 100755 index 0000000000..d3f01ad245 Binary files /dev/null and b/resources/www/common/styles/fonts/Bold/Roboto-Bold.ttf differ diff --git a/resources/www/common/styles/fonts/Bold/Roboto-Bold.woff b/resources/www/common/styles/fonts/Bold/Roboto-Bold.woff new file mode 100755 index 0000000000..83a333ad47 Binary files /dev/null and b/resources/www/common/styles/fonts/Bold/Roboto-Bold.woff differ diff --git a/resources/www/common/styles/fonts/Bold/Roboto-Bold.woff2 b/resources/www/common/styles/fonts/Bold/Roboto-Bold.woff2 new file mode 100755 index 0000000000..76817cc761 Binary files /dev/null and b/resources/www/common/styles/fonts/Bold/Roboto-Bold.woff2 differ diff --git a/resources/www/common/styles/fonts/BoldItalic/Roboto-BoldItalic.ttf b/resources/www/common/styles/fonts/BoldItalic/Roboto-BoldItalic.ttf new file mode 100755 index 0000000000..41cc1e7531 Binary files /dev/null and b/resources/www/common/styles/fonts/BoldItalic/Roboto-BoldItalic.ttf differ diff --git a/resources/www/common/styles/fonts/BoldItalic/Roboto-BoldItalic.woff b/resources/www/common/styles/fonts/BoldItalic/Roboto-BoldItalic.woff new file mode 100755 index 0000000000..7f8c135d12 Binary files /dev/null and b/resources/www/common/styles/fonts/BoldItalic/Roboto-BoldItalic.woff differ diff --git a/resources/www/common/styles/fonts/BoldItalic/Roboto-BoldItalic.woff2 b/resources/www/common/styles/fonts/BoldItalic/Roboto-BoldItalic.woff2 new file mode 100755 index 0000000000..45c9ef7328 Binary files /dev/null and b/resources/www/common/styles/fonts/BoldItalic/Roboto-BoldItalic.woff2 differ diff --git a/resources/www/common/styles/fonts/COPYRIGHT.txt b/resources/www/common/styles/fonts/COPYRIGHT.txt new file mode 100755 index 0000000000..a7ef69930c --- /dev/null +++ b/resources/www/common/styles/fonts/COPYRIGHT.txt @@ -0,0 +1 @@ +Copyright 2011 Google Inc. All Rights Reserved. \ No newline at end of file diff --git a/resources/www/common/styles/fonts/DESCRIPTION.en_us.html b/resources/www/common/styles/fonts/DESCRIPTION.en_us.html new file mode 100755 index 0000000000..cca3687e66 --- /dev/null +++ b/resources/www/common/styles/fonts/DESCRIPTION.en_us.html @@ -0,0 +1,16 @@ +

+ Roboto has a dual nature. + It has a mechanical skeleton and the forms are largely geometric. + At the same time, the font features friendly and open curves. + While some grotesks distort their letterforms to force a rigid rhythm, Roboto doesn’t compromise, allowing letters + to be settled into their natural width. + This makes for a more natural reading rhythm more commonly found in humanist and serif types. +

+

+ This is the regular family, which can be used alongside the Roboto Condensed family and the Roboto Slab family. +

+

+ To contribute, see github.com/google/roboto +

diff --git a/resources/www/common/styles/fonts/Italic/Roboto-Italic.ttf b/resources/www/common/styles/fonts/Italic/Roboto-Italic.ttf new file mode 100755 index 0000000000..6a1cee5b29 Binary files /dev/null and b/resources/www/common/styles/fonts/Italic/Roboto-Italic.ttf differ diff --git a/resources/www/common/styles/fonts/Italic/Roboto-Italic.woff b/resources/www/common/styles/fonts/Italic/Roboto-Italic.woff new file mode 100755 index 0000000000..6e4197d44d Binary files /dev/null and b/resources/www/common/styles/fonts/Italic/Roboto-Italic.woff differ diff --git a/resources/www/common/styles/fonts/Italic/Roboto-Italic.woff2 b/resources/www/common/styles/fonts/Italic/Roboto-Italic.woff2 new file mode 100755 index 0000000000..e7f173b7ed Binary files /dev/null and b/resources/www/common/styles/fonts/Italic/Roboto-Italic.woff2 differ diff --git a/resources/www/common/styles/fonts/LICENSE.txt b/resources/www/common/styles/fonts/LICENSE.txt new file mode 100755 index 0000000000..d645695673 --- /dev/null +++ b/resources/www/common/styles/fonts/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/resources/www/common/styles/fonts/Light/Roboto-Light.ttf b/resources/www/common/styles/fonts/Light/Roboto-Light.ttf new file mode 100755 index 0000000000..219063a578 Binary files /dev/null and b/resources/www/common/styles/fonts/Light/Roboto-Light.ttf differ diff --git a/resources/www/common/styles/fonts/Light/Roboto-Light.woff b/resources/www/common/styles/fonts/Light/Roboto-Light.woff new file mode 100755 index 0000000000..d0158be692 Binary files /dev/null and b/resources/www/common/styles/fonts/Light/Roboto-Light.woff differ diff --git a/resources/www/common/styles/fonts/Light/Roboto-Light.woff2 b/resources/www/common/styles/fonts/Light/Roboto-Light.woff2 new file mode 100755 index 0000000000..ddbf4a9250 Binary files /dev/null and b/resources/www/common/styles/fonts/Light/Roboto-Light.woff2 differ diff --git a/resources/www/common/styles/fonts/LightItalic/Roboto-LightItalic.ttf b/resources/www/common/styles/fonts/LightItalic/Roboto-LightItalic.ttf new file mode 100755 index 0000000000..0e81e876fc Binary files /dev/null and b/resources/www/common/styles/fonts/LightItalic/Roboto-LightItalic.ttf differ diff --git a/resources/www/common/styles/fonts/LightItalic/Roboto-LightItalic.woff b/resources/www/common/styles/fonts/LightItalic/Roboto-LightItalic.woff new file mode 100755 index 0000000000..f20dfa7955 Binary files /dev/null and b/resources/www/common/styles/fonts/LightItalic/Roboto-LightItalic.woff differ diff --git a/resources/www/common/styles/fonts/LightItalic/Roboto-LightItalic.woff2 b/resources/www/common/styles/fonts/LightItalic/Roboto-LightItalic.woff2 new file mode 100755 index 0000000000..ba70c2a396 Binary files /dev/null and b/resources/www/common/styles/fonts/LightItalic/Roboto-LightItalic.woff2 differ diff --git a/resources/www/common/styles/fonts/METADATA.pb b/resources/www/common/styles/fonts/METADATA.pb new file mode 100755 index 0000000000..a4d2bb221f --- /dev/null +++ b/resources/www/common/styles/fonts/METADATA.pb @@ -0,0 +1,121 @@ +name: "Roboto" +designer: "Christian Robertson" +license: "APACHE2" +category: "SANS_SERIF" +date_added: "2013-01-09" +fonts { + name: "Roboto" + style: "normal" + weight: 100 + filename: "Roboto-Thin.ttf" + post_script_name: "Roboto-Thin" + full_name: "Roboto Thin" + copyright: "Copyright 2011 Google Inc. All Rights Reserved." +} +fonts { + name: "Roboto" + style: "italic" + weight: 100 + filename: "Roboto-ThinItalic.ttf" + post_script_name: "Roboto-ThinItalic" + full_name: "Roboto Thin Italic" + copyright: "Copyright 2011 Google Inc. All Rights Reserved." +} +fonts { + name: "Roboto" + style: "normal" + weight: 300 + filename: "Roboto-Light.ttf" + post_script_name: "Roboto-Light" + full_name: "Roboto Light" + copyright: "Copyright 2011 Google Inc. All Rights Reserved." +} +fonts { + name: "Roboto" + style: "italic" + weight: 300 + filename: "Roboto-LightItalic.ttf" + post_script_name: "Roboto-LightItalic" + full_name: "Roboto Light Italic" + copyright: "Copyright 2011 Google Inc. All Rights Reserved." +} +fonts { + name: "Roboto" + style: "normal" + weight: 400 + filename: "Roboto-Regular.ttf" + post_script_name: "Roboto-Regular" + full_name: "Roboto" + copyright: "Copyright 2011 Google Inc. All Rights Reserved." +} +fonts { + name: "Roboto" + style: "italic" + weight: 400 + filename: "Roboto-Italic.ttf" + post_script_name: "Roboto-Italic" + full_name: "Roboto Italic" + copyright: "Copyright 2011 Google Inc. All Rights Reserved." +} +fonts { + name: "Roboto" + style: "normal" + weight: 500 + filename: "Roboto-Medium.ttf" + post_script_name: "Roboto-Medium" + full_name: "Roboto Medium" + copyright: "Copyright 2011 Google Inc. All Rights Reserved." +} +fonts { + name: "Roboto" + style: "italic" + weight: 500 + filename: "Roboto-MediumItalic.ttf" + post_script_name: "Roboto-MediumItalic" + full_name: "Roboto Medium Italic" + copyright: "Copyright 2011 Google Inc. All Rights Reserved." +} +fonts { + name: "Roboto" + style: "normal" + weight: 700 + filename: "Roboto-Bold.ttf" + post_script_name: "Roboto-Bold" + full_name: "Roboto Bold" + copyright: "Copyright 2011 Google Inc. All Rights Reserved." +} +fonts { + name: "Roboto" + style: "italic" + weight: 700 + filename: "Roboto-BoldItalic.ttf" + post_script_name: "Roboto-BoldItalic" + full_name: "Roboto Bold Italic" + copyright: "Copyright 2011 Google Inc. All Rights Reserved." +} +fonts { + name: "Roboto" + style: "normal" + weight: 900 + filename: "Roboto-Black.ttf" + post_script_name: "Roboto-Black" + full_name: "Roboto Black" + copyright: "Copyright 2011 Google Inc. All Rights Reserved." +} +fonts { + name: "Roboto" + style: "italic" + weight: 900 + filename: "Roboto-BlackItalic.ttf" + post_script_name: "Roboto-BlackItalic" + full_name: "Roboto Black Italic" + copyright: "Copyright 2011 Google Inc. All Rights Reserved." +} +subsets: "menu" +subsets: "cyrillic" +subsets: "cyrillic-ext" +subsets: "greek" +subsets: "greek-ext" +subsets: "latin" +subsets: "latin-ext" +subsets: "vietnamese" diff --git a/resources/www/common/styles/fonts/Medium/Roboto-Medium.ttf b/resources/www/common/styles/fonts/Medium/Roboto-Medium.ttf new file mode 100755 index 0000000000..1a7f3b0bba Binary files /dev/null and b/resources/www/common/styles/fonts/Medium/Roboto-Medium.ttf differ diff --git a/resources/www/common/styles/fonts/Medium/Roboto-Medium.woff b/resources/www/common/styles/fonts/Medium/Roboto-Medium.woff new file mode 100755 index 0000000000..cbac5e5dd9 Binary files /dev/null and b/resources/www/common/styles/fonts/Medium/Roboto-Medium.woff differ diff --git a/resources/www/common/styles/fonts/Medium/Roboto-Medium.woff2 b/resources/www/common/styles/fonts/Medium/Roboto-Medium.woff2 new file mode 100755 index 0000000000..6a88805fed Binary files /dev/null and b/resources/www/common/styles/fonts/Medium/Roboto-Medium.woff2 differ diff --git a/resources/www/common/styles/fonts/MediumItalic/Roboto-MediumItalic.ttf b/resources/www/common/styles/fonts/MediumItalic/Roboto-MediumItalic.ttf new file mode 100755 index 0000000000..003029527c Binary files /dev/null and b/resources/www/common/styles/fonts/MediumItalic/Roboto-MediumItalic.ttf differ diff --git a/resources/www/common/styles/fonts/MediumItalic/Roboto-MediumItalic.woff b/resources/www/common/styles/fonts/MediumItalic/Roboto-MediumItalic.woff new file mode 100755 index 0000000000..3e635c1a20 Binary files /dev/null and b/resources/www/common/styles/fonts/MediumItalic/Roboto-MediumItalic.woff differ diff --git a/resources/www/common/styles/fonts/MediumItalic/Roboto-MediumItalic.woff2 b/resources/www/common/styles/fonts/MediumItalic/Roboto-MediumItalic.woff2 new file mode 100755 index 0000000000..cf21729c6b Binary files /dev/null and b/resources/www/common/styles/fonts/MediumItalic/Roboto-MediumItalic.woff2 differ diff --git a/resources/www/common/styles/fonts/Regular/Roboto-Regular.ttf b/resources/www/common/styles/fonts/Regular/Roboto-Regular.ttf new file mode 100755 index 0000000000..2c97eeadff Binary files /dev/null and b/resources/www/common/styles/fonts/Regular/Roboto-Regular.ttf differ diff --git a/resources/www/common/styles/fonts/Regular/Roboto-Regular.woff b/resources/www/common/styles/fonts/Regular/Roboto-Regular.woff new file mode 100755 index 0000000000..f43dd1b5fe Binary files /dev/null and b/resources/www/common/styles/fonts/Regular/Roboto-Regular.woff differ diff --git a/resources/www/common/styles/fonts/Regular/Roboto-Regular.woff2 b/resources/www/common/styles/fonts/Regular/Roboto-Regular.woff2 new file mode 100755 index 0000000000..9a0064ec27 Binary files /dev/null and b/resources/www/common/styles/fonts/Regular/Roboto-Regular.woff2 differ diff --git a/resources/www/common/styles/fonts/Thin/Roboto-Thin.ttf b/resources/www/common/styles/fonts/Thin/Roboto-Thin.ttf new file mode 100755 index 0000000000..b74a4fd1a2 Binary files /dev/null and b/resources/www/common/styles/fonts/Thin/Roboto-Thin.ttf differ diff --git a/resources/www/common/styles/fonts/Thin/Roboto-Thin.woff b/resources/www/common/styles/fonts/Thin/Roboto-Thin.woff new file mode 100755 index 0000000000..c95f7b3863 Binary files /dev/null and b/resources/www/common/styles/fonts/Thin/Roboto-Thin.woff differ diff --git a/resources/www/common/styles/fonts/Thin/Roboto-Thin.woff2 b/resources/www/common/styles/fonts/Thin/Roboto-Thin.woff2 new file mode 100755 index 0000000000..2fb9b5f68c Binary files /dev/null and b/resources/www/common/styles/fonts/Thin/Roboto-Thin.woff2 differ diff --git a/resources/www/common/styles/fonts/ThinItalic/Roboto-ThinItalic.ttf b/resources/www/common/styles/fonts/ThinItalic/Roboto-ThinItalic.ttf new file mode 100755 index 0000000000..dd0ddb8526 Binary files /dev/null and b/resources/www/common/styles/fonts/ThinItalic/Roboto-ThinItalic.ttf differ diff --git a/resources/www/common/styles/fonts/ThinItalic/Roboto-ThinItalic.woff b/resources/www/common/styles/fonts/ThinItalic/Roboto-ThinItalic.woff new file mode 100755 index 0000000000..6284128b83 Binary files /dev/null and b/resources/www/common/styles/fonts/ThinItalic/Roboto-ThinItalic.woff differ diff --git a/resources/www/common/styles/fonts/ThinItalic/Roboto-ThinItalic.woff2 b/resources/www/common/styles/fonts/ThinItalic/Roboto-ThinItalic.woff2 new file mode 100755 index 0000000000..67c4240666 Binary files /dev/null and b/resources/www/common/styles/fonts/ThinItalic/Roboto-ThinItalic.woff2 differ diff --git a/resources/www/common/styles/main.scss b/resources/www/common/styles/main.scss index ab2daf5800..ad1e9e34cd 100644 --- a/resources/www/common/styles/main.scss +++ b/resources/www/common/styles/main.scss @@ -2,7 +2,7 @@ * Common stylesheet, builded into assets/common/styles/common.css */ @import '../../../../node_modules/font-awesome/scss/font-awesome.scss'; -@import url('https://fonts.googleapis.com/css?family=Roboto:300,400,500,700'); +@import './roboto.scss'; @import '../../_shared/styles/variables'; @import '../../vendors/bootstrap/bootstrap'; @import '../../vendors/bootstrap/responsive'; diff --git a/resources/www/common/styles/roboto.scss b/resources/www/common/styles/roboto.scss new file mode 100755 index 0000000000..4b832c14d7 --- /dev/null +++ b/resources/www/common/styles/roboto.scss @@ -0,0 +1,15 @@ +@import "font-sass/variables"; +@import "font-sass/mixins"; +@import "font-sass/Thin"; +@import "font-sass/ThinItalic"; +@import "font-sass/Light"; +@import "font-sass/LightItalic"; +@import "font-sass/Regular"; +@import "font-sass/Italic"; +@import "font-sass/Medium"; +@import "font-sass/MediumItalic"; +@import "font-sass/Bold"; +@import "font-sass/BoldItalic"; +@import "font-sass/Black"; +@import "font-sass/BlackItalic"; + diff --git a/templates/web/prod/actions/Tools/index.html.twig b/templates/web/prod/actions/Tools/index.html.twig index f208b07d3a..3d4cb6029c 100644 --- a/templates/web/prod/actions/Tools/index.html.twig +++ b/templates/web/prod/actions/Tools/index.html.twig @@ -91,108 +91,6 @@ - {% if selectionLength == 1 %} - {% for record in records %} - {% if record.get_type() == 'video' %} -
-
- - {{ "screenshot video" | trans }} -
-
-
- -
- {% set outputFormats = record.getSubdfefByDeviceAndMime(null, ['image/jpeg', 'image/png']) %} - {% set previewHtml5 = record.getSubdfefByDeviceAndMime(constant('\\databox_subdef::DEVICE_SCREEN'), ['video/ogg', 'video/mp4', 'video/webm']) %} - {% set dataW = constant('media_subdef::TC_DATA_WIDTH') %} - {% set dataH = constant('media_subdef::TC_DATA_HEIGHT') %} - - {% set technical_info = record.get_technical_infos %} - {% set width = technical_info[dataW].value %} - {% set height = technical_info[dataH].value %} - - {% if width and height %} - {% set rawRatio = (width / height)|number_format(3, '.') %} - {% set rawRatioLength = rawRatio|length %} - {% set ratio = rawRatio|slice(0,rawRatioLength-1) %} - {% else %} - {% set ratio = '' %} - {% endif %} - - -
- -
-
- -
- {{ 'take a screenshot' | trans }} -
- -
-
- -
-
- -
-

{{ 'To take a screenshot click on camera' | trans }}

- - - -
-
-
-
-
-
- - - - -
-
-
-
- - {{ "video range extractor" | trans }} -
-
-
-
-
Ratio
{{ ratio }}
-
Type
{{ record.get_mime() }}
- {% if record.exif[constant('media_subdef::TC_DATA_FRAMERATE')] is defined %} -
{{ 'Images par secondes' | trans }}
-
{{ record.exif[constant('media_subdef::TC_DATA_FRAMERATE')] | round(2) }} ips
- {% endif %} - {% if record.exif[constant('media_subdef::TC_DATA_AUDIOCODEC')] is defined %} -
{{ 'Codec Audio' | trans }}
-
{{ record.exif[constant('media_subdef::TC_DATA_AUDIOCODEC')] }}
- {% endif %} -
{{ 'Size' | trans }}
{% set width = record.exif[constant('media_subdef::TC_DATA_WIDTH')]|default - (null) %} - {% set height = record.exif[constant('media_subdef::TC_DATA_HEIGHT')]|default(null) %} - {% if width is not none and height is not none %} - {{ width ~ " x " ~ height }} - {% endif %}
-
-
-
- {% endif %} - {% endfor %} - {% endif %} -
{% trans %}Changes for rotation will be applied only on