Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MaarchCourrier
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Redmine
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Harbor Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maarch
MaarchCourrier
Commits
e08e2413
Commit
e08e2413
authored
4 years ago
by
Alex ORLUC
Browse files
Options
Downloads
Patches
Plain Diff
FEAT #13694 TIME 0:15 get custom img
parent
450174d1
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
apps/maarch_entreprise/img/maarch_box.png
+0
-0
0 additions, 0 deletions
apps/maarch_entreprise/img/maarch_box.png
src/frontend/app/app.component.ts
+2
-5
2 additions, 5 deletions
src/frontend/app/app.component.ts
src/frontend/assets/logo.svg
+0
-145
0 additions, 145 deletions
src/frontend/assets/logo.svg
with
2 additions
and
150 deletions
apps/maarch_entreprise/img/maarch_box.png
deleted
100644 → 0
+
0
−
0
View file @
450174d1
78.2 KiB
This diff is collapsed.
Click to expand it.
src/frontend/app/app.component.ts
+
2
−
5
View file @
e08e2413
import
{
Component
,
ViewChild
,
OnInit
}
from
'
@angular/core
'
;
import
{
Component
,
ViewChild
,
OnInit
}
from
'
@angular/core
'
;
import
{
Location
}
from
'
@angular/common
'
;
import
{
DomSanitizer
}
from
'
@angular/platform-browser
'
;
import
{
DomSanitizer
}
from
'
@angular/platform-browser
'
;
import
{
MatIconRegistry
}
from
'
@angular/material/icon
'
;
import
{
MatIconRegistry
}
from
'
@angular/material/icon
'
;
import
{
MAT_TOOLTIP_DEFAULT_OPTIONS
,
MatTooltipDefaultOptions
}
from
'
@angular/material/tooltip
'
;
import
{
MAT_TOOLTIP_DEFAULT_OPTIONS
,
MatTooltipDefaultOptions
}
from
'
@angular/material/tooltip
'
;
...
@@ -7,7 +6,6 @@ import { HeaderService } from '../service/header.service';
...
@@ -7,7 +6,6 @@ import { HeaderService } from '../service/header.service';
import
{
AppService
}
from
'
../service/app.service
'
;
import
{
AppService
}
from
'
../service/app.service
'
;
import
{
MatSidenav
}
from
'
@angular/material/sidenav
'
;
import
{
MatSidenav
}
from
'
@angular/material/sidenav
'
;
import
{
LangService
}
from
'
../service/app-lang.service
'
;
import
{
LangService
}
from
'
../service/app-lang.service
'
;
import
{
Router
}
from
'
@angular/router
'
;
/** Custom options the configure the tooltip's default show/hide delays. */
/** Custom options the configure the tooltip's default show/hide delays. */
export
const
myCustomTooltipDefaults
:
MatTooltipDefaultOptions
=
{
export
const
myCustomTooltipDefaults
:
MatTooltipDefaultOptions
=
{
...
@@ -31,15 +29,14 @@ export class AppComponent implements OnInit {
...
@@ -31,15 +29,14 @@ export class AppComponent implements OnInit {
constructor
(
constructor
(
public
langService
:
LangService
,
public
langService
:
LangService
,
private
location
:
Location
,
iconReg
:
MatIconRegistry
,
iconReg
:
MatIconRegistry
,
sanitizer
:
DomSanitizer
,
sanitizer
:
DomSanitizer
,
public
appService
:
AppService
,
public
appService
:
AppService
,
public
headerService
:
HeaderService
public
headerService
:
HeaderService
)
{
)
{
iconReg
.
addSvgIcon
(
'
maarchLogo
'
,
sanitizer
.
bypassSecurityTrustResourceUrl
(
'
static.php?filename=logo_white.svg
'
)).
addSvgIcon
(
'
maarchLogoOnly
'
,
sanitizer
.
bypassSecurityTrustResourceUrl
(
'
img/logo_only_white.svg
'
));
iconReg
.
addSvgIcon
(
'
maarchLogo
'
,
sanitizer
.
bypassSecurityTrustResourceUrl
(
'
../rest/images?image=onlyLogo
'
));
iconReg
.
addSvgIcon
(
'
maarchLogoFull
'
,
sanitizer
.
bypassSecurityTrustResourceUrl
(
'
assets/logo.svg
'
));
iconReg
.
addSvgIcon
(
'
maarchLogoFull
'
,
sanitizer
.
bypassSecurityTrustResourceUrl
(
'
../rest/images?image=logo
'
));
iconReg
.
addSvgIcon
(
'
maarchLogoWhite
'
,
sanitizer
.
bypassSecurityTrustResourceUrl
(
'
assets/logo_white.svg
'
));
iconReg
.
addSvgIcon
(
'
maarchLogoWhite
'
,
sanitizer
.
bypassSecurityTrustResourceUrl
(
'
assets/logo_white.svg
'
));
iconReg
.
addSvgIcon
(
'
maarchBox
'
,
sanitizer
.
bypassSecurityTrustResourceUrl
(
'
assets/maarch_box.svg
'
));
iconReg
.
addSvgIcon
(
'
maarchBox
'
,
sanitizer
.
bypassSecurityTrustResourceUrl
(
'
assets/maarch_box.svg
'
));
...
...
This diff is collapsed.
Click to expand it.
src/frontend/assets/logo.svg
deleted
100644 → 0
+
0
−
145
View file @
450174d1
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc=
"http://purl.org/dc/elements/1.1/"
xmlns:cc=
"http://creativecommons.org/ns#"
xmlns:rdf=
"http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg=
"http://www.w3.org/2000/svg"
xmlns=
"http://www.w3.org/2000/svg"
xmlns:sodipodi=
"http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape=
"http://www.inkscape.org/namespaces/inkscape"
id=
"svg2"
version=
"1.1"
inkscape:version=
"0.91 r13725"
xml:space=
"preserve"
width=
"550pt"
height=
"180pt"
viewBox=
"0 0 687.50001 225.00001"
sodipodi:docname=
"Courrier_2.svg"
><metadata
id=
"metadata8"
><rdf:RDF><cc:Work
rdf:about=
""
><dc:format>
image/svg+xml
</dc:format><dc:type
rdf:resource=
"http://purl.org/dc/dcmitype/StillImage"
/><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id=
"defs6"
><clipPath
clipPathUnits=
"userSpaceOnUse"
id=
"clipPath16"
><path
d=
"m 0,1008.912 774.066,0 L 774.066,0 0,0 0,1008.912 Z"
id=
"path18"
inkscape:connector-curvature=
"0"
/></clipPath><clipPath
clipPathUnits=
"userSpaceOnUse"
id=
"clipPath76"
><path
d=
"m 0,1008.912 774.066,0 L 774.066,0 0,0 0,1008.912 Z"
id=
"path78"
inkscape:connector-curvature=
"0"
/></clipPath></defs><sodipodi:namedview
pagecolor=
"#ffffff"
bordercolor=
"#666666"
borderopacity=
"1"
objecttolerance=
"10"
gridtolerance=
"10"
guidetolerance=
"10"
inkscape:pageopacity=
"0"
inkscape:pageshadow=
"2"
inkscape:window-width=
"1600"
inkscape:window-height=
"872"
id=
"namedview4"
showgrid=
"false"
inkscape:zoom=
"0.74431556"
inkscape:cx=
"192.79111"
inkscape:cy=
"-27.07458"
inkscape:window-x=
"1920"
inkscape:window-y=
"0"
inkscape:window-maximized=
"1"
inkscape:current-layer=
"g10"
inkscape:document-units=
"pt"
units=
"pt"
fit-margin-top=
"15"
fit-margin-left=
"15"
fit-margin-right=
"15"
fit-margin-bottom=
"15"
showguides=
"true"
inkscape:guide-bbox=
"true"
><sodipodi:guide
position=
"526.11531,46.909564"
orientation=
"1,0"
id=
"guide4171"
/><sodipodi:guide
position=
"4.1592596,-356.14533"
orientation=
"0,1"
id=
"guide4173"
/><sodipodi:guide
position=
"10.876841,-298.37413"
orientation=
"0,1"
id=
"guide4224"
/></sodipodi:namedview><g
id=
"g10"
inkscape:groupmode=
"layer"
inkscape:label=
"LOGOS-MAARCH-déclinaisons"
transform=
"matrix(1.25,0,0,-1.25,-40.916186,305.53211)"
><g
id=
"g4295"
transform=
"matrix(0.99559634,0,0,1.0235937,0.21020049,-1.8739484)"
><g
transform=
"matrix(1.5274519,0,0,1.5274519,3.1610964,31.78496)"
id=
"g4153"
><path
inkscape:connector-curvature=
"0"
id=
"path206"
style=
"fill:#24b0ed;fill-opacity:1;fill-rule:nonzero;stroke:none"
d=
"m 169.11968,79.730378 -17.731,31.572002 0,-39.931002 c 0,-1.461 -1.273,-2.679 -2.8,-2.679 -1.528,0 -2.8,1.218 -2.8,2.679 l 0,50.563002 c 0,1.461 1.272,2.678 2.8,2.678 1.272,0 2.121,-0.73 2.545,-1.542 l 20.531,-36.766002 20.616,36.766002 c 0.339,0.568 1.018,1.542 2.545,1.542 1.527,0 2.8,-1.217 2.8,-2.678 l 0,-50.563002 c 0,-1.461 -1.273,-2.679 -2.8,-2.679 -1.527,0 -2.8,1.218 -2.8,2.679 l 0,39.931002 -17.816,-31.572002 c -0.594,-1.055 -1.527,-1.542 -2.545,-1.542 -0.849,0 -1.951,0.405 -2.545,1.542"
/><path
inkscape:connector-curvature=
"0"
id=
"path210"
style=
"fill:#24b0ed;fill-opacity:1;fill-rule:nonzero;stroke:none"
d=
"m 231.56108,83.382678 0,3.409 -11.962,0 c -5.515,0 -9.332,-2.191 -9.332,-6.899 0,-4.22 3.054,-6.899 9.671,-6.899 5.939,0 11.623,3.491 11.623,10.389 m -19.852,14.934002 c -0.848,-0.893 -1.442,-1.136 -2.206,-1.136 -1.357,0 -2.461,1.055 -2.461,2.353 0,0.568 0.17,0.974 0.425,1.38 2.375,3.571 6.957,6.411 14.083,6.411 9.841,0 15.271,-5.518 15.271,-13.796002 l 0,-22.32 c 0,-1.38 -1.188,-2.516 -2.63,-2.516 -1.443,0 -2.63,1.136 -2.63,2.516 l 0,2.921 c -2.121,-3.814 -7.041,-5.843 -12.132,-5.843 -8.993,0 -14.677,4.139 -14.677,11.606 0,7.142 5.684,11.444 14.847,11.444 l 11.962,0 0,2.192 c 0,5.518002 -3.817,8.927002 -10.011,8.927002 -4.496,0 -7.211,-1.299 -9.841,-4.139"
/><path
inkscape:connector-curvature=
"0"
id=
"path214"
style=
"fill:#24b0ed;fill-opacity:1;fill-rule:nonzero;stroke:none"
d=
"m 268.63528,83.382678 0,3.409 -11.962,0 c -5.515,0 -9.332,-2.191 -9.332,-6.899 0,-4.22 3.054,-6.899 9.671,-6.899 5.939,0 11.623,3.491 11.623,10.389 m -19.852,14.934002 c -0.848,-0.893 -1.442,-1.136 -2.206,-1.136 -1.357,0 -2.461,1.055 -2.461,2.353 0,0.568 0.17,0.974 0.425,1.38 2.375,3.571 6.957,6.411 14.083,6.411 9.841,0 15.271,-5.518 15.271,-13.796002 l 0,-22.32 c 0,-1.38 -1.188,-2.516 -2.63,-2.516 -1.443,0 -2.63,1.136 -2.63,2.516 l 0,2.921 c -2.121,-3.814 -7.041,-5.843 -12.132,-5.843 -8.993,0 -14.677,4.139 -14.677,11.606 0,7.142 5.684,11.444 14.847,11.444 l 11.962,0 0,2.192 c 0,5.518002 -3.817,8.927002 -10.011,8.927002 -4.496,0 -7.211,-1.299 -9.841,-4.139"
/><path
inkscape:connector-curvature=
"0"
id=
"path218"
style=
"fill:#24b0ed;fill-opacity:1;fill-rule:nonzero;stroke:none"
d=
"m 286.96148,100.66978 c 1.696,3.733 5.938,6.493 11.793,6.493 1.441,0 2.63,-1.137 2.63,-2.515 0,-1.38 -1.189,-2.517 -2.63,-2.517 -7.806,0 -11.793,-5.194 -11.793,-12.661002 l 0,-18.18 c 0,-1.461 -1.187,-2.598 -2.715,-2.598 -1.527,0 -2.715,1.137 -2.715,2.598 l 0,32.951002 c 0,1.461 1.188,2.598 2.715,2.598 1.528,0 2.715,-1.137 2.715,-2.598 l 0,-3.571 z"
/><path
inkscape:connector-curvature=
"0"
id=
"path222"
style=
"fill:#24b0ed;fill-opacity:1;fill-rule:nonzero;stroke:none"
d=
"m 319.70948,107.32508 c 7.551,0 11.708,-3.814 13.065,-5.6 0.424,-0.568 0.594,-0.974 0.594,-1.542 0,-1.379 -1.103,-2.354 -2.461,-2.354 -0.847,0 -1.442,0.325 -2.036,0.975 -1.272,1.379 -3.562,3.814 -9.162,3.814 -7.806,0 -11.963,-4.789 -11.963,-14.772002 0,-10.145 4.157,-14.852 11.963,-14.852 4.921,0 7.89,2.11 9.841,3.49 0.595,0.405 1.018,0.568 1.612,0.568 1.358,0 2.46,-1.055 2.46,-2.354 0,-0.73 -0.254,-1.299 -1.102,-2.029 -1.867,-1.46 -5.939,-4.382 -12.811,-4.382 -10.944,0 -17.477,6.249 -17.477,19.559 0,13.311002 6.533,19.479002 17.477,19.479002"
/><path
inkscape:connector-curvature=
"0"
id=
"path226"
style=
"fill:#24b0ed;fill-opacity:1;fill-rule:nonzero;stroke:none"
d=
"m 371.12258,92.959878 0,-21.67 c 0,-1.461 -1.187,-2.598 -2.715,-2.598 -1.526,0 -2.715,1.137 -2.715,2.598 l 0,20.614 c 0,6.412002 -1.951,10.795002 -10.18,10.795002 -8.399,0 -11.284,-4.87 -11.284,-11.362002 l 0,-20.047 c 0,-1.461 -1.187,-2.598 -2.714,-2.598 -1.528,0 -2.715,1.137 -2.715,2.598 l 0,53.241002 c 0,1.461 1.187,2.598 2.715,2.598 1.527,0 2.714,-1.137 2.714,-2.598 l 0,-22.886 c 1.612,3.084 5.769,5.68 11.284,5.68 13.065,0 15.61,-7.467 15.61,-14.365002"
/></g><g
transform=
"matrix(1.5592875,0,0,1.5592875,-140.82421,-94.632417)"
id=
"g4161"
><path
inkscape:connector-curvature=
"0"
id=
"path238"
style=
"fill:#f99830;fill-opacity:1;fill-rule:nonzero;stroke:none"
d=
"m 350.46229,123.36469 c 0,7.949 3.958,11.772 10.464,11.772 3.186,0 5.971,-1.375 7.547,-3.554 0.167,-0.236 0.234,-0.47 0.234,-0.704 0,-0.605 -0.47,-1.075 -1.073,-1.075 -0.302,0 -0.604,0.102 -0.872,0.437 -1.141,1.576 -3.321,2.817 -5.836,2.817 -5.165,0 -8.116,-3.119 -8.116,-9.693 0,-6.976 2.951,-9.658 8.116,-9.658 2.214,0 4.528,0.871 5.836,2.75 0.235,0.335 0.603,0.435 0.872,0.435 0.603,0 1.073,-0.469 1.073,-1.073 0,-0.268 -0.067,-0.435 -0.201,-0.637 -1.476,-2.146 -4.494,-3.555 -7.58,-3.555 -6.506,0 -10.464,3.488 -10.464,11.738"
/><path
inkscape:connector-curvature=
"0"
id=
"path242"
style=
"fill:#f99830;fill-opacity:1;fill-rule:nonzero;stroke:none"
d=
"m 383.26109,119.74269 c 0,4.227 -1.777,6.104 -4.863,6.104 -3.085,0 -4.864,-1.877 -4.864,-6.104 0,-4.293 1.779,-6.138 4.864,-6.138 3.086,0 4.863,1.845 4.863,6.138 m 2.18,0 c 0,-5.5 -2.683,-8.082 -7.043,-8.082 -4.326,0 -7.043,2.582 -7.043,8.082 0,5.501 2.717,8.05 7.043,8.05 4.36,0 7.043,-2.549 7.043,-8.05"
/><path
inkscape:connector-curvature=
"0"
id=
"path246"
style=
"fill:#f99830;fill-opacity:1;fill-rule:nonzero;stroke:none"
d=
"m 390.63809,126.51799 0,-8.754 c 0,-2.18 0.704,-4.058 4.092,-4.058 3.387,0 4.092,1.878 4.092,4.058 l 0,8.754 c 0,0.604 0.503,1.073 1.106,1.073 0.57,0 1.04,-0.469 1.04,-1.073 l 0,-8.754 c 0,-3.186 -1.04,-6.103 -6.238,-6.103 -5.165,0 -6.238,2.917 -6.238,6.103 l 0,8.754 c 0,0.604 0.469,1.073 1.073,1.073 0.57,0 1.073,-0.469 1.073,-1.073"
/><path
inkscape:connector-curvature=
"0"
id=
"path250"
style=
"fill:#f99830;fill-opacity:1;fill-rule:nonzero;stroke:none"
d=
"m 407.17029,125.04249 c 0.671,1.543 2.348,2.683 4.662,2.683 0.57,0 1.04,-0.47 1.04,-1.039 0,-0.571 -0.47,-1.04 -1.04,-1.04 -3.086,0 -4.662,-2.147 -4.662,-5.233 l 0,-7.513 c 0,-0.603 -0.469,-1.073 -1.073,-1.073 -0.604,0 -1.073,0.47 -1.073,1.073 l 0,13.618 c 0,0.603 0.469,1.073 1.073,1.073 0.604,0 1.073,-0.47 1.073,-1.073 l 0,-1.476 z"
/><path
inkscape:connector-curvature=
"0"
id=
"path254"
style=
"fill:#f99830;fill-opacity:1;fill-rule:nonzero;stroke:none"
d=
"m 417.39879,125.04249 c 0.671,1.543 2.348,2.683 4.662,2.683 0.57,0 1.04,-0.47 1.04,-1.039 0,-0.571 -0.47,-1.04 -1.04,-1.04 -3.086,0 -4.662,-2.147 -4.662,-5.233 l 0,-7.513 c 0,-0.603 -0.469,-1.073 -1.073,-1.073 -0.604,0 -1.073,0.47 -1.073,1.073 l 0,13.618 c 0,0.603 0.469,1.073 1.073,1.073 0.604,0 1.073,-0.47 1.073,-1.073 l 0,-1.476 z"
/><path
inkscape:connector-curvature=
"0"
id=
"path258"
style=
"fill:#f99830;fill-opacity:1;fill-rule:nonzero;stroke:none"
d=
"m 427.76109,112.90089 c 0,-0.604 -0.47,-1.073 -1.073,-1.073 -0.604,0 -1.073,0.469 -1.073,1.073 l 0,13.617 c 0,0.604 0.469,1.073 1.073,1.073 0.603,0 1.073,-0.469 1.073,-1.073 l 0,-13.617 z m -2.348,19.117 c 0,0.973 0.47,1.342 1.275,1.342 0.804,0 1.274,-0.369 1.274,-1.342 0,-0.805 -0.47,-1.274 -1.274,-1.274 -0.805,0 -1.275,0.469 -1.275,1.274"
/><path
inkscape:connector-curvature=
"0"
id=
"path262"
style=
"fill:#f99830;fill-opacity:1;fill-rule:nonzero;stroke:none"
d=
"m 438.05709,125.84709 c -2.918,0 -4.528,-1.878 -4.73,-4.863 l 9.023,0 c 0,2.415 -0.839,4.863 -4.293,4.863 m 0,1.945 c 5.366,0 6.406,-4.259 6.406,-6.54 0,-0.972 0,-2.146 -1.342,-2.146 l -9.794,0 c 0,-3.321 1.913,-5.467 5.065,-5.467 1.945,0 3.086,0.737 4.025,1.442 0.202,0.134 0.335,0.202 0.604,0.202 0.536,0 0.973,-0.437 0.973,-0.973 0,-0.369 -0.168,-0.57 -0.37,-0.772 -0.503,-0.503 -2.247,-1.878 -5.232,-1.878 -4.46,0 -7.244,2.449 -7.244,8.083 0,5.165 2.549,8.049 6.909,8.049"
/><path
inkscape:connector-curvature=
"0"
id=
"path266"
style=
"fill:#f99830;fill-opacity:1;fill-rule:nonzero;stroke:none"
d=
"m 449.96039,125.04249 c 0.671,1.543 2.348,2.683 4.662,2.683 0.57,0 1.04,-0.47 1.04,-1.039 0,-0.571 -0.47,-1.04 -1.04,-1.04 -3.085,0 -4.662,-2.147 -4.662,-5.233 l 0,-7.513 c 0,-0.603 -0.469,-1.073 -1.073,-1.073 -0.604,0 -1.073,0.47 -1.073,1.073 l 0,13.618 c 0,0.603 0.469,1.073 1.073,1.073 0.604,0 1.073,-0.47 1.073,-1.073 l 0,-1.476 z"
/></g><g
transform=
"matrix(1.4609441,0,0,1.4609441,-118.00664,-77.986946)"
id=
"g4228"
><path
inkscape:connector-curvature=
"0"
id=
"path230"
style=
"fill:#f99830;fill-opacity:1;fill-rule:nonzero;stroke:none"
d=
"m 170.37832,133.55512 -43.33606,43.61895 0,-52.82465 90.70821,0 0,-13.45393 -104.30358,0 0,80.01641 9.34714,9.9836 47.72573,-48.00964 -0.14144,-19.33074 z"
/><path
inkscape:connector-curvature=
"0"
id=
"path234"
style=
"fill:#24b0ed;fill-opacity:1;fill-rule:nonzero;stroke:none"
d=
"m 218.26815,201.60622 0,-20.26979 -48.0858,-48.08583 -9.46177,10.01735 57.54757,58.33827 z"
/></g></g></g></svg>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment