Skip to content
Snippets Groups Projects
Commit f3a36dbe authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

- Logo: add a white&transparent version without ticks 

 - Logo: remove unused version
 - Menu : Add active item hightlight - Fix #72
 - Home & Menu : add a background image
 - Gulp: integrate image into CSS, as base64 image
parent 75246020
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 46 additions and 140 deletions
gulpfile.js
+ 12
− 4
View file @ f3a36dbe
...@@ -6,7 +6,8 @@ var bower = require('bower'); ...@@ -6,7 +6,8 @@ var bower = require('bower');
var concat = require('gulp-concat'); var concat = require('gulp-concat');
var path = require("path"); var path = require("path");
var sass = require('gulp-sass'); var sass = require('gulp-sass');
var minifyCss = require('gulp-minify-css'); var cleanCss = require('gulp-clean-css');
var base64 = require('gulp-base64');
var rename = require('gulp-rename'); var rename = require('gulp-rename');
var sh = require('shelljs'); var sh = require('shelljs');
var ngConstant = require('gulp-ng-constant'); var ngConstant = require('gulp-ng-constant');
...@@ -31,6 +32,7 @@ var clean = require('gulp-clean'); ...@@ -31,6 +32,7 @@ var clean = require('gulp-clean');
var htmlmin = require('gulp-htmlmin'); var htmlmin = require('gulp-htmlmin');
var deleteEmpty = require('delete-empty'); var deleteEmpty = require('delete-empty');
var jshint = require('gulp-jshint'); var jshint = require('gulp-jshint');
var sourcemaps = require('gulp-sourcemaps');
var paths = { var paths = {
sass: ['./scss/**/*.scss'], sass: ['./scss/**/*.scss'],
...@@ -46,16 +48,22 @@ gulp.task('default', ['sass', 'config', 'templatecache', 'ng_translate', 'ng_ann ...@@ -46,16 +48,22 @@ gulp.task('default', ['sass', 'config', 'templatecache', 'ng_translate', 'ng_ann
gulp.task('sass', function(done) { gulp.task('sass', function(done) {
gulp.src('./scss/ionic.app.scss') gulp.src('./scss/ionic.app.scss')
.pipe(sass()).on('error', sass.logError) .pipe(sass()).on('error', sass.logError)
.pipe(base64({
baseDir: "./www/css",
extensions: ['svg', 'png', /\.jpg#datauri$/i],
maxSize: 14 * 1024,
debug: true
}))
.pipe(gulp.dest('./www/css/')) .pipe(gulp.dest('./www/css/'))
.pipe(minifyCss({ .pipe(cleanCss({
keepSpecialComments: 0 keepSpecialComments: 0
})) }))
.pipe(sourcemaps.write())
.pipe(rename({ extname: '.min.css' })) .pipe(rename({ extname: '.min.css' }))
.pipe(gulp.dest('./www/css/')) .pipe(gulp.dest('./www/css/'))
.on('end', done); .on('end', done);
}); });
gulp.task('watch', function() { gulp.task('watch', function() {
gulp.watch(paths.sass, ['sass']); gulp.watch(paths.sass, ['sass']);
gulp.watch(paths.templatecache, ['templatecache']); gulp.watch(paths.templatecache, ['templatecache']);
......
resources/logo/index.html
+ 29
− 28
View file @ f3a36dbe
...@@ -12,33 +12,34 @@ ...@@ -12,33 +12,34 @@
<button onclick="document.body.className = 'dark'">obscur</button> <button onclick="document.body.className = 'dark'">obscur</button>
<img src="final/svg/colors/logo.large.cesium.dune.svg"/> <img src="svg/colors/logo.large.cesium.dune.svg"/>
<img src="final/svg/colors/logo.large.cesium.svg"/> <img src="svg/colors/logo.large.cesium.svg"/>
<img src="final/svg/colors/logo.large.cs.dune.svg"/> <img src="svg/colors/logo.large.cs.dune.svg"/>
<img src="final/svg/colors/logo.large.cs.svg"/> <img src="svg/colors/logo.large.cs.svg"/>
<img src="final/svg/colors/logo.large.empty.svg"/> <img src="svg/colors/logo.large.empty.svg"/>
<img src="final/svg/colors/logo.large.empty.transparent.svg"/> <img src="svg/colors/logo.large.empty.transparent.svg"/>
<img src="final/svg/colors/logo.small.cs.dune.svg"/> <img src="svg/colors/logo.large.empty.transparent.noticks.svg"/>
<img src="final/svg/colors/logo.small.cs.svg"/> <img src="svg/colors/logo.small.cs.dune.svg"/>
<img src="final/svg/colors/logo.small.empty.svg"/> <img src="svg/colors/logo.small.cs.svg"/>
<img src="final/svg/colors/logo.small.empty.transparent.svg"/> <img src="svg/colors/logo.small.empty.svg"/>
<img src="svg/colors/logo.small.empty.transparent.svg"/>
<img src="final/svg/colors/logo.large.empty.dune.svg"/>
<img src="final/svg/colors/logo.small.empty.dune.svg"/> <img src="svg/colors/logo.large.empty.dune.svg"/>
<img src="svg/colors/logo.small.empty.dune.svg"/>
<img src="final/svg/black/logo.large.cesium.svg"/>
<img src="final/svg/black/logo.large.cs.svg"/> <img src="svg/black/logo.large.cesium.svg"/>
<img src="final/svg/black/logo.large.empty.transparent.svg"/> <img src="svg/black/logo.large.cs.svg"/>
<img src="final/svg/black/logo.small.cs.svg"/> <img src="svg/black/logo.large.empty.transparent.svg"/>
<img src="final/svg/black/logo.small.empty.transparent.svg"/> <img src="svg/black/logo.small.cs.svg"/>
<img src="svg/black/logo.small.empty.transparent.svg"/>
<img src="final/svg/white/logo.large.cesium.svg"/>
<img src="final/svg/white/logo.large.cs.svg"/> <img src="svg/white/logo.large.cesium.svg"/>
<img src="final/svg/white/logo.large.empty.transparent.svg"/> <img src="svg/white/logo.large.cs.svg"/>
<img src="final/svg/white/logo.small.cs.svg"/> <img src="svg/white/logo.large.empty.transparent.svg"/>
<img src="final/svg/white/logo.small.empty.transparent.svg"/> <img src="svg/white/logo.small.cs.svg"/>
<img src="svg/white/logo.small.empty.transparent.svg"/>
......
resources/logo/proposals.html deleted 100644 → 0
+ 0
− 100
View file @ 75246020
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width">
<style id="bx-google-fonts">@import url(https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic,700,700italic,800,800italic);</style>
<title>Cesium logos</title>
<link rel="stylesheet" href="preview.css">
</head>
<body class="bright">
<button style="margin-left: -100px" onclick="document.body.className = 'bright'">clair</button>
<button onclick="document.body.className = 'dark'">obscur</button>
<!--<img src="<cesium/cs>-logo.<large/small>.<colors->.<blue/sand/no>-dune.svg"/>-->
<img src="v1/svg/cs-logo-dune1.svg"/>
<img src="v1/svg/cs-logo-dune2.svg"/>
<img src="v1/svg/cs-logo-dune3.svg"/>
<img src="v2/svg/cesium-logo-large-blue-dune.svg"/>
<img src="v2/svg/cesium-logo-large-blue-gold-dune.svg"/>
<img src="v2/svg/cesium-logo-large-gold-dune.svg"/>
<img src="v2/svg/cesium-logo-large-orange-dune.svg"/>
<img src="v2/svg/cesium-logo-large-positive-900-dune.svg"/>
<img src="v2/svg/cs-logo-small-positive-900-dune.svg"/>
<img src="v2/svg/cesium-logo.large.blue.no-dune.svg"/>
<img src="v2/svg/cs-logo.large.blue.no-dune.svg"/>
<img src="v2/svg/cs-logo.small.blue.no-dune.svg"/>
<img src="v2/svg/cesium-logo.large.blue.blue-dune.svg"/>
<img src="v2/svg/cs-logo.large.blue.blue-dune.svg"/>
<img src="v2/svg/cs-logo.small.blue.blue-dune.svg"/>
<img src="v2/svg/cesium-logo.large.blue.sand-dune.svg"/>
<img src="v2/svg/cs-logo.large.blue.sand-dune.svg"/>
<img src="v2/svg/cs-logo.small.blue.sand-dune.svg"/>
<img src="v2/svg/cesium-logo.large.blue-brown.no-dune.svg"/>
<img src="v2/svg/cs-logo.large.blue-brown.no-dune.svg"/>
<img src="v2/svg/cs-logo.small.blue-brown.no-dune.svg"/>
<img src="v2/svg/cesium-logo.large.blue-brown.blue-dune.svg"/>
<img src="v2/svg/cs-logo.large.blue-brown.blue-dune.svg"/>
<img src="v2/svg/cs-logo.small.blue-brown.blue-dune.svg"/>
<img src="v2/svg/cesium-logo.large.blue-brown.sand-dune.svg"/>
<img src="v2/svg/cs-logo.large.blue-brown.sand-dune.svg"/>
<img src="v2/svg/cs-logo.small.blue-brown.sand-dune.svg"/>
<img src="v2/svg/cesium-logo.large.sand.no-dune.svg"/>
<img src="v2/svg/cs-logo.large.sand.no-dune.svg"/>
<img src="v2/svg/cs-logo.small.sand.no-dune.svg"/>
<img src="v2/svg/cesium-logo.large.sand.blue-dune.svg"/>
<img src="v2/svg/cs-logo.large.sand.blue-dune.svg"/>
<img src="v2/svg/cs-logo.small.sand.blue-dune.svg"/>
<img src="v2/svg/cesium-logo.large.sand.sand-dune.svg"/>
<img src="v2/svg/cs-logo.large.sand.sand-dune.svg"/>
<img src="v2/svg/cs-logo.small.sand.sand-dune.svg"/>
<img src="v2/svg/cesium-logo.large.black.no-dune.svg"/>
<img src="v2/svg/cs-logo.large.black.no-dune.svg"/>
<img src="v2/svg/cs-logo.small.black.no-dune.svg"/>
<img src="v2/svg/cesium-logo.large.black.black-dune.svg"/>
<img src="v2/svg/cs-logo.large.black.black-dune.svg"/>
<img src="v2/svg/cs-logo.small.black.black-dune.svg"/>
<img src="v2/svg/cesium-logo.large.white.no-dune.svg"/>
<img src="v2/svg/cs-logo.large.white.no-dune.svg"/>
<img src="v2/svg/cs-logo.small.white.no-dune.svg"/>
<img src="v2/svg/cesium-logo.large.white.white-dune.svg"/>
<img src="v2/svg/cs-logo.large.white.white-dune.svg"/>
<img src="v2/svg/cs-logo.small.white.white-dune.svg"/>
<script>
var $ = s => Array.from( document.querySelectorAll(s) );
$('img')
.map( img => img.outerHTML = `
<section>
<h3>${img.src.split('/').pop()}</h3>
<icon class="large"><img src="${img.src}"></icon>
<icon class="medium"><img src="${img.src}"></icon>
<icon class="small"><img src="${img.src}"></icon>
<icon class="tiny"><img src="${img.src}"></icon>
</section>
` )
.join('')
</script>
</body>
</html>
resources/logo/v2/svg/cs-logo.large.blue.no-dune.svg → resources/logo/svg/colors/logo.large.empty.transparent.noticks.svg
+ 1
− 7
View file @ f3a36dbe
...@@ -11,10 +11,7 @@ ...@@ -11,10 +11,7 @@
<path style="display: inline; fill: rgb(64, 178, 255); fill-opacity: 1; fill-rule: evenodd; stroke: none; stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-opacity: 1; opacity: 0.4;" id="path-15" d="M 192.954 376.521 C 191.115 376.522 189.277 376.537 187.433 376.561 C 128.674 377.344 72.845 389.958 22.181 412.103 C 357.94 303.989 569.987 502.045 605.505 799.553 L 620.188 797.905 C 589.392 526.584 426.295 376.369 192.954 376.521 Z" transform="matrix(-0.931404, -0.363988, 0.363988, -0.931404, 419.499006, 1182.599809)" bx:origin="0.5 0.5"/> <path style="display: inline; fill: rgb(64, 178, 255); fill-opacity: 1; fill-rule: evenodd; stroke: none; stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-opacity: 1; opacity: 0.4;" id="path-15" d="M 192.954 376.521 C 191.115 376.522 189.277 376.537 187.433 376.561 C 128.674 377.344 72.845 389.958 22.181 412.103 C 357.94 303.989 569.987 502.045 605.505 799.553 L 620.188 797.905 C 589.392 526.584 426.295 376.369 192.954 376.521 Z" transform="matrix(-0.931404, -0.363988, 0.363988, -0.931404, 419.499006, 1182.599809)" bx:origin="0.5 0.5"/>
<path style="display: inline; fill: rgb(64, 178, 255); fill-opacity: 1; fill-rule: evenodd; stroke: none; stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-opacity: 1; opacity: 1;" id="path-16" d="M 221.614 63.973 C 219.777 63.976 217.938 63.99 216.094 64.015 C 157.334 64.795 101.506 77.409 50.841 99.554 C 386.598 -8.559 598.651 189.497 634.173 487.001 L 648.854 485.354 C 618.058 214.037 454.954 63.824 221.614 63.973 Z" transform="matrix(0.750452, -0.660925, 0.660925, 0.750452, -70.803322, 290.920273)" bx:origin="0.5 0.5"/> <path style="display: inline; fill: rgb(64, 178, 255); fill-opacity: 1; fill-rule: evenodd; stroke: none; stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-opacity: 1; opacity: 1;" id="path-16" d="M 221.614 63.973 C 219.777 63.976 217.938 63.99 216.094 64.015 C 157.334 64.795 101.506 77.409 50.841 99.554 C 386.598 -8.559 598.651 189.497 634.173 487.001 L 648.854 485.354 C 618.058 214.037 454.954 63.824 221.614 63.973 Z" transform="matrix(0.750452, -0.660925, 0.660925, 0.750452, -70.803322, 290.920273)" bx:origin="0.5 0.5"/>
<path style="display: inline; fill: rgb(64, 178, 255); fill-opacity: 1; fill-rule: evenodd; stroke: none; stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-opacity: 1; opacity: 0.4;" id="path-17" d="M 441.888 342.098 C 440.047 342.098 438.207 342.114 436.362 342.138 C 377.601 342.922 321.765 355.535 271.103 377.681 C 606.886 269.567 818.944 467.615 854.462 765.133 L 869.142 763.483 C 838.354 492.154 675.242 341.948 441.888 342.098 Z" transform="matrix(-0.356582, 0.934264, -0.934264, -0.356582, 1256.759493, 169.182552)" bx:origin="0.5 0.5"/> <path style="display: inline; fill: rgb(64, 178, 255); fill-opacity: 1; fill-rule: evenodd; stroke: none; stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-opacity: 1; opacity: 0.4;" id="path-17" d="M 441.888 342.098 C 440.047 342.098 438.207 342.114 436.362 342.138 C 377.601 342.922 321.765 355.535 271.103 377.681 C 606.886 269.567 818.944 467.615 854.462 765.133 L 869.142 763.483 C 838.354 492.154 675.242 341.948 441.888 342.098 Z" transform="matrix(-0.356582, 0.934264, -0.934264, -0.356582, 1256.759493, 169.182552)" bx:origin="0.5 0.5"/>
<g transform="matrix(0.762493, 0, 0, 0.762493, 19.294647, -716.322815)">
<path d="M 566.466 1089.137 L 566.466 1148.222 C 565.867 1148.219 565.267 1148.217 564.667 1148.217 C 561.481 1148.217 558.31 1148.259 555.154 1148.341 L 555.154 1089.137 Z M 908.29 1477.146 L 956.987 1477.146 L 956.987 1488.458 L 908.569 1488.458 C 908.539 1484.693 908.447 1480.922 908.29 1477.146 Z M 566.466 1835.013 L 566.466 1876.467 L 555.154 1876.467 L 555.154 1834.886 C 558.318 1834.973 561.49 1835.017 564.667 1835.017 C 565.267 1835.017 565.867 1835.016 566.466 1835.013 Z M 220.775 1488.458 L 169.657 1488.458 L 169.657 1477.146 L 221.089 1477.146 C 220.921 1480.909 220.816 1484.68 220.775 1488.458 Z" style="fill: rgb(80, 150, 200); stroke: none;" bx:origin="0 0"/>
<path d="M 760.121 1143.311 L 717.336 1217.417 C 715.72 1216.518 714.096 1215.632 712.465 1214.761 L 755.318 1140.537 Z M 830.122 1324.203 L 900.424 1283.614 L 903.198 1288.417 L 833.04 1328.923 C 832.08 1327.339 831.107 1325.766 830.122 1324.203 Z M 840.599 1641.137 L 903.197 1677.278 L 900.424 1682.082 L 837.911 1645.99 C 838.821 1644.38 839.717 1642.762 840.599 1641.137 Z M 725.168 1761.843 L 760.122 1822.385 L 755.318 1825.158 L 720.379 1764.641 C 721.985 1763.722 723.582 1762.789 725.168 1761.843 Z M 403.538 1760.932 L 366.456 1825.159 L 361.653 1822.386 L 398.802 1758.042 C 400.372 1759.019 401.951 1759.982 403.538 1760.932 Z M 289.58 1642.689 L 221.35 1682.082 L 218.577 1677.279 L 286.944 1637.807 C 287.807 1639.437 288.685 1641.065 289.58 1642.689 Z M 294.354 1332.168 L 218.576 1288.417 L 221.35 1283.614 L 297.213 1327.414 C 296.246 1328.99 295.293 1330.575 294.354 1332.168 Z M 406.079 1220.259 L 361.653 1143.311 L 366.457 1140.537 L 410.889 1217.495 C 409.276 1218.403 407.673 1219.324 406.079 1220.259 Z" style="fill: rgb(80, 150, 200); stroke: none;" bx:origin="0 0"/>
</g>
</g> </g>
<rect x="429.367" y="425.979" width="20.003" height="21.735" style="display: inline; opacity: 1; fill: rgb(80, 150, 200); fill-opacity: 1; stroke: none; stroke-width: 34.9; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0; stroke-opacity: 0.996078;" id="path-91" transform="matrix(1, 0, 0, 0.999999, -301.377075, -219.498434)"/> <rect x="429.367" y="425.979" width="20.003" height="21.735" style="display: inline; opacity: 1; fill: rgb(80, 150, 200); fill-opacity: 1; stroke: none; stroke-width: 34.9; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0; stroke-opacity: 0.996078;" id="path-91" transform="matrix(1, 0, 0, 0.999999, -301.377075, -219.498434)"/>
<rect x="446.853" y="25.462" width="25.99" height="25.99" style="display: inline; opacity: 1; fill: rgb(80, 150, 200); fill-opacity: 1; stroke: none; stroke-width: 34.9; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0; stroke-opacity: 0.996078;" id="path-93"/> <rect x="446.853" y="25.462" width="25.99" height="25.99" style="display: inline; opacity: 1; fill: rgb(80, 150, 200); fill-opacity: 1; stroke: none; stroke-width: 34.9; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0; stroke-opacity: 0.996078;" id="path-93"/>
...@@ -25,7 +22,4 @@ ...@@ -25,7 +22,4 @@
<rect x="421.962" y="775.937" width="32.92" height="34.653" style="display: inline; opacity: 1; fill: rgb(80, 150, 200); fill-opacity: 1; stroke: none; stroke-width: 34.9; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0; stroke-opacity: 0.996078;" id="path-99"/> <rect x="421.962" y="775.937" width="32.92" height="34.653" style="display: inline; opacity: 1; fill: rgb(80, 150, 200); fill-opacity: 1; stroke: none; stroke-width: 34.9; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0; stroke-opacity: 0.996078;" id="path-99"/>
<rect x="-66.939" y="-568.978" width="20.867" height="20.792" style="display: inline; opacity: 1; fill: rgb(80, 150, 200); fill-opacity: 1; stroke: none; stroke-width: 34.9; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0; stroke-opacity: 0.996078;" id="path-101" transform="matrix(-1, 0, 0, 0.999997, 31.356928, 984.736306)"/> <rect x="-66.939" y="-568.978" width="20.867" height="20.792" style="display: inline; opacity: 1; fill: rgb(80, 150, 200); fill-opacity: 1; stroke: none; stroke-width: 34.9; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0; stroke-opacity: 0.996078;" id="path-101" transform="matrix(-1, 0, 0, 0.999997, 31.356928, 984.736306)"/>
</g> </g>
<g transform="matrix(0.726449, 0, 0, 0.726449, -69.949951, -48.621319)">
<path d="M 396.617 313.184 C 368.497 313.184 346.36 322.184 330.207 340.184 C 314.054 358.177 305.977 382.817 305.977 414.104 C 305.977 446.104 313.594 470.951 328.827 488.644 C 344.06 506.331 365.84 515.174 394.167 515.174 C 412.98 515.174 430.257 512.771 445.997 507.964 L 445.997 521.774 C 431.177 526.987 412.67 529.594 390.477 529.594 C 358.99 529.594 334.197 519.421 316.097 499.074 C 297.997 478.727 288.947 450.301 288.947 413.794 C 288.947 390.994 293.267 370.904 301.907 353.524 C 310.547 336.144 322.97 322.724 339.177 313.264 C 355.384 303.804 374.224 299.074 395.697 299.074 C 417.577 299.074 437.157 303.164 454.437 311.344 L 448.147 325.454 C 431.787 317.274 414.61 313.184 396.617 313.184 ZM 595.809 483.124 C 595.809 498.051 590.135 509.527 578.789 517.554 C 567.442 525.581 551.339 529.594 530.479 529.594 C 508.185 529.594 490.495 526.167 477.409 519.314 L 477.409 502.904 C 494.182 511.291 511.872 515.484 530.479 515.484 C 546.939 515.484 559.439 512.747 567.979 507.274 C 576.512 501.807 580.779 494.524 580.779 485.424 C 580.779 477.037 577.379 469.981 570.579 464.254 C 563.785 458.527 552.615 452.904 537.069 447.384 C 520.402 441.351 508.695 436.161 501.949 431.814 C 495.202 427.474 490.115 422.567 486.689 417.094 C 483.262 411.627 481.549 404.957 481.549 397.084 C 481.549 384.611 486.789 374.744 497.269 367.484 C 507.749 360.224 522.395 356.594 541.209 356.594 C 559.209 356.594 576.285 359.967 592.439 366.714 L 586.769 380.514 C 570.409 373.767 555.222 370.394 541.209 370.394 C 527.615 370.394 516.829 372.644 508.849 377.144 C 500.875 381.644 496.889 387.881 496.889 395.854 C 496.889 404.547 499.982 411.501 506.169 416.714 C 512.355 421.927 524.445 427.754 542.439 434.194 C 557.472 439.614 568.412 444.497 575.259 448.844 C 582.112 453.191 587.252 458.124 590.679 463.644 C 594.099 469.164 595.809 475.657 595.809 483.124 Z" transform="matrix(1, 0, 0, 1, 0, 0)" style="text-transform: none; fill: rgb(80, 150, 200);"/>
</g>
</svg> </svg>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment