Cadoles
/
ninegate
18
0
Fork 0
Code Issues 29 Pull Requests Projects 1 Releases Wiki Activity

Merge branch 'master' into dist/envole/6/master

This commit is contained in:
Arnaud Fornerot 2020-11-06 14:10:45 +01:00
parent b648137665 f5633610a9
commit 0885efd1f4
14 changed files with 261 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ninegate-1.0/src/Cadoles/CoreBundle/Form/ConfigType.php
View File

@ -85,12 +85,16 @@ class ConfigType extends AbstractType
"Chewy-Regular" => "Chewy-Regular",
"Courgette-Regular" => "Courgette-Regular",
"FredokaOne-Regular" => "FredokaOne-Regular",
"Gothic-Bold" => "Gothic-Bold",
"Gothic-Regular" => "Gothic-Regular",
"Grandstander" => "Grandstander",
"Helvetica" => "Helvetica",
"Justanotherhand-Regular" => "Justanotherhand-Regular",
"Lato-Regular" => "Lato-Regular",
"LexendDeca-Regular" => "LexendDeca-Regular",
"LuckiestGuy-Regular" => "LuckiestGuy-Regular",
"Marianne-Bold" => "Marianne-Bold",
"Marianne-Regular" => "Marianne-Regular",
"Overpass-Black" => "Overpass-Black",
"PassionOne" => "PassionOne",
"Peacesans" => "Peacesans",

257
src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/font.css
View File

@ -1,13 +1,10 @@
@font-face {
font-family: 'Redressed';
src: url('../fonts/typo/Redressed-webfont.eot');
src: url('../fonts/typo/Redressed-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/typo/Redressed-webfont.woff') format('woff'),
url('../fonts/typo/Redressed-webfont.ttf') format('truetype'),
url('../fonts/typo/Redressed-webfont.svg#redressedregular') format('svg');
font-family: 'ABeeZee-Regular';
src: url('../fonts/typo/ABeeZee-Regular.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
}
@font-face {
font-family: 'Acme-Regular';
@ -20,108 +17,19 @@
font-style: normal;
}
@font-face {
font-family: 'Peacesans';
src: url('../fonts/typo/Peacesans-webfont.eot');
src: url('../fonts/typo/Peacesans-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/typo/Peacesans-webfont.woff') format('woff'),
url('../fonts/typo/Peacesans-webfont.ttf') format('truetype'),
url('../fonts/typo/Peacesans-webfont.svg#peacesans') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Roboto-Regular';
src: url('../fonts/typo/Roboto-Regular-webfont.eot');
src: url('../fonts/typo/Roboto-Regular-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/typo/Roboto-Regular-webfont.woff') format('woff'),
url('../fonts/typo/Roboto-Regular-webfont.ttf') format('truetype'),
url('../fonts/typo/Roboto-Regular-webfont.svg#peacesansregular') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Justanotherhand-Regular';
src: url('../fonts/typo/Justanotherhand-Regular-webfont.eot');
src: url('../fonts/typo/Justanotherhand-Regular-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/typo/Justanotherhand-Regular-webfont.woff') format('woff'),
url('../fonts/typo/Justanotherhand-Regular-webfont.ttf') format('truetype'),
url('../fonts/typo/Justanotherhand-Regular-webfont.svg#justanotherhandregular') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Lato-Regular';
src: url('../fonts/typo/Lato-Regular.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'ABeeZee-Regular';
src: url('../fonts/typo/ABeeZee-Regular.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'AlfaSlabOne-Regular';
src: url('../fonts/typo/AlfaSlabOne-Regular.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Anton-Regular';
src: url('../fonts/typo/Anton-Regular.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'FredokaOne-Regular';
src: url('../fonts/typo/FredokaOne-Regular.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Overpass-Black';
src: url('../fonts/typo/Overpass-Black.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Righteous-Regular';
src: url('../fonts/typo/Righteous-Regular.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Signika-Regular';
src: url('../fonts/typo/Signika-Regular.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Teko-Bold';
src: url('../fonts/typo/Teko-Bold.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'LuckiestGuy-Regular';
src: url('../fonts/typo/LuckiestGuy-Regular.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
}
@font-face {
font-family: 'Baloo-Regular';
@ -150,6 +58,52 @@
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'FredokaOne-Regular';
src: url('../fonts/typo/FredokaOne-Regular.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Gothic-Regular';
src: url('../fonts/typo/Gothic-Regular.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Gothic-Bold';
src: url('../fonts/typo/Gothic-Bold.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Grandstander';
src: url('../fonts/typo/Grandstander-Black.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Justanotherhand-Regular';
src: url('../fonts/typo/Justanotherhand-Regular-webfont.eot');
src: url('../fonts/typo/Justanotherhand-Regular-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/typo/Justanotherhand-Regular-webfont.woff') format('woff'),
url('../fonts/typo/Justanotherhand-Regular-webfont.ttf') format('truetype'),
url('../fonts/typo/Justanotherhand-Regular-webfont.svg#justanotherhandregular') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Lato-Regular';
src: url('../fonts/typo/Lato-Regular.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'LexendDeca-Regular';
@ -157,6 +111,85 @@
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Marianne-Bold';
src: url('../fonts/typo/Marianne-Bold.otf') format('truetype');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Marianne-Regular';
src: url('../fonts/typo/Marianne-Regular.otf') format('truetype');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Justanotherhand-Regular';
src: url('../fonts/typo/Justanotherhand-Regular-webfont.eot');
src: url('../fonts/typo/Justanotherhand-Regular-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/typo/Justanotherhand-Regular-webfont.woff') format('woff'),
url('../fonts/typo/Justanotherhand-Regular-webfont.ttf') format('truetype'),
url('../fonts/typo/Justanotherhand-Regular-webfont.svg#justanotherhandregular') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Overpass-Black';
src: url('../fonts/typo/Overpass-Black.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'PassionOne';
src: url('../fonts/typo/PassionOne-Regular.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Peacesans';
src: url('../fonts/typo/Peacesans-webfont.eot');
src: url('../fonts/typo/Peacesans-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/typo/Peacesans-webfont.woff') format('woff'),
url('../fonts/typo/Peacesans-webfont.ttf') format('truetype'),
url('../fonts/typo/Peacesans-webfont.svg#peacesans') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Redressed';
src: url('../fonts/typo/Redressed-webfont.eot');
src: url('../fonts/typo/Redressed-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/typo/Redressed-webfont.woff') format('woff'),
url('../fonts/typo/Redressed-webfont.ttf') format('truetype'),
url('../fonts/typo/Redressed-webfont.svg#redressedregular') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Righteous-Regular';
src: url('../fonts/typo/Righteous-Regular.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Roboto-Regular';
src: url('../fonts/typo/Roboto-Regular-webfont.eot');
src: url('../fonts/typo/Roboto-Regular-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/typo/Roboto-Regular-webfont.woff') format('woff'),
url('../fonts/typo/Roboto-Regular-webfont.ttf') format('truetype'),
url('../fonts/typo/Roboto-Regular-webfont.svg#peacesansregular') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'RubikMonoOne-Regular';
@ -172,23 +205,23 @@
font-style: normal;
}
@font-face {
font-family: 'Signika-Regular';
src: url('../fonts/typo/Signika-Regular.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Teko-Bold';
src: url('../fonts/typo/Teko-Bold.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Viga-Regular';
src: url('../fonts/typo/Viga-Regular.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Grandstander';
src: url('../fonts/typo/Grandstander-Black.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'PassionOne';
src: url('../fonts/typo/PassionOne-Regular.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}

BIN
src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/fonts/typo/Gothic-Bold.ttf Normal file
View File

Binary file not shown.

BIN
src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/fonts/typo/Gothic-Regular.ttf Normal file
View File

Binary file not shown.

BIN
src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/fonts/typo/Marianne-Bold.otf Normal file
View File

Binary file not shown.

BIN
src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/fonts/typo/Marianne-Regular.otf Normal file
View File

Binary file not shown.

BIN
src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/function.html.twig Normal file
View File

Binary file not shown.

BIN
src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/header.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.9 KiB

3
src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/info.yml Normal file
View File

@ -0,0 +1,3 @@
name: Métice
author: Pierre Cadéot
version: 1.0

0
src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/local.js Normal file
View File

BIN
src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/look.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 556 KiB

53
src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/style.css Normal file
View File

@ -0,0 +1,53 @@
div.header {
background-image: linear-gradient(90deg,rgba(255,255,255,1) 0%, rgba(255,255,255,1) 15%, rgba(255,255,255,0.1) 50%, rgba(255,255,255,0) 100%),var(--header) !important;
}
.avatar { background-color: var(--main) !important; }
#logo {
height: 79px !important;
float: left !important;
top: -8px !important;
left: -10px !important;
position: relative !important;
}
div.header > a > span {
color: black !important;
}
nav#appmenu > ul > li.active > a.active, .nav>li>a:hover {
background-color: white !important;
color: var(--main);
font-weight: bold;
}
.navbar-default, .grid-item, .widgetheader {
background-color: var(--main) !important;
}
.grid-item-content {
background-color: var(--dark) !important;
}
.widget-mini > .widgetheader {
background-color: var(--light) !important;
}
.navbar-default { border-color: var(--light) !important }
.nav > li > a:hover {
background:none !important;
}
.nav.navbar-top-links.navbar-left>li>a:hover {
text-shadow: var(--light) 0px 0px 20px;
color: var(--main) !important;
background-color: var(--light) !important;
}
.nav.navbar-top-links.navbar-right>li>a:hover {
text-shadow: white 0px 0px 20px;
color: var(--main) !important;
background: none !important;
}
nav#appmenu { zoom: 0.68; font-weight: bold; }

81
src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/head.html.twig
View File

@ -8,6 +8,37 @@
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<style>
:root{
--colorbody: #{{ color['colorbody'] }};
--main: #{{ color['main'] }};
--mainR: {{ color['mainrgb']['r'] }};
--mainG: {{ color['mainrgb']['g'] }};
--mainB: {{ color['mainrgb']['b'] }};
--dark: #{{ color['dark'] }};
--darkR: {{ color['darkrgb']['r'] }};
--darkG: {{ color['darkrgb']['g'] }};
--darkB: {{ color['darkrgb']['b'] }};
--light: #{{ color['light'] }};
--lightR: {{ color['lightrgb']['r'] }};
--lightG: {{ color['lightrgb']['g'] }};
--lightB: {{ color['lightrgb']['b'] }};
--fontcolorhover: #{{ color['fontcolorhover'] }};
--fontcolorhoverdark: #{{ color['fontcolorhoverdark'] }};
--fontfacetitle: {{ app.session.get('fontfacetitle') }};
--fontfacebody: {{ app.session.get('fontfacebody') }};
--header: url(/{{ alias }}/{{ header }});
--logo: url(/{{ alias }}/{{ logo }});
{% if not app.session.get('sublogo') is empty %}
--sublogo: url(/{{ alias }}/{{ app.session.get('sublogo') }});
{% else %}
--sublogo: url();
{% endif %}
--fgheader: {{ fgheader }};
--heightheader: {{ heightheader }};
}
</style>
{% block stylesheets %}
{% stylesheets
'@CadolesCoreBundle/Resources/public/css/bootstrap.min.css'
@ -42,19 +73,6 @@
<link href="{{ asset_url }}" rel="stylesheet" media="screen" />
{% endstylesheets %}
{% set theme = app.session.get('theme') %}
{% if theme is not empty %}
<link href="/{{ alias }}/bundles/cadolescore/themes/{{theme}}/style.css" rel="stylesheet" media="screen" />
{% endif %}
<link rel="shortcut icon" href="/{{ alias }}/{{ app.session.get('logo') }}" />
<style>
</style>
<style>
body,
.navbar-default ,
@ -72,11 +90,11 @@
.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-primary,
.btn-primary
{
background-color: #{{ color['main'] }}
background-color: var(--main)
}
#page-wrapper {
background-color: #{{ color['colorbody'] }}
background-color: var(--colorbody)
}
.navbar-default,
@ -93,7 +111,7 @@
.bootstrap-switch.bootstrap-switch-focused,
.btn-primary
{
border-color: #{{ color['main'] }}
border-color: var(--main)
}
h1,
@ -104,7 +122,7 @@
.modal-dialog,
a
{
color: #{{ color['main'] }}
color: var(--main)
}
.nav>li>a:focus,
@ -119,19 +137,19 @@
.btn-primary:active,
.btn-primary:focus
{
background-color: #{{ color['dark'] }} !important;
background-color: var(--dark) !important;
}
.btn-primary:hover,
.btn-primary:active,
.btn-primary:focus
{
border-color: #{{ color['dark'] }} !important;
border-color: var(--dark) !important;
}
.form-control:focus
{
border-color: #{{ color['light'] }}
border-color: var(--light)
}
.form-control:focus,
.bootstrap-switch.bootstrap-switch-focused {
@ -143,7 +161,7 @@
a:focus,
.pagination>li>a:hover
{
color: #{{ color['dark'] }}
color: var(--dark)
}
.header a,
@ -153,7 +171,7 @@
.pagemenu a,
.grid .grid-preview .caption,
.grid .grid-preview .caption h1 {
color: #{{ color['fontcolorhover'] }}
color: var(--fontcolorhover)
}
.header a:hover,
@ -161,28 +179,37 @@
.navbar-default .navbar-brand:hover,
.navbar-default a:hover,
.pagemenu a:hover {
color: #{{ color['fontcolorhoverdark'] }}
color: var(--fontcolorhoverdark)
}
.header .title,
.panel-heading,
.widgetheader,
h1 {
font-family: {{ app.session.get('fontfacetitle') }};
font-family: var(--fontfacetitle);
}
body,
.slick .slicksubtitle,
.slick .slicklink {
font-family: {{ app.session.get('fontfacebody') }};
font-family: var(--fontfacebody);
}
.dropdown-submenu a
{
color: #{{ color['main'] }}
color: var(--main)
}
</style>
{% set theme = app.session.get('theme') %}
{% if theme is not empty %}
<link href="/{{ alias }}/bundles/cadolescore/themes/{{theme}}/style.css" rel="stylesheet" media="screen" />
{% endif %}
<link rel="shortcut icon" href="/{{ alias }}/{{ app.session.get('logo') }}" />
{% endblock %}
</head>

5
src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/base.html.twig
View File

@ -23,9 +23,7 @@
{%endif%}
<!DOCTYPE html>
<html>
<html>
{{ include('@CadolesCore/Include/head.html.twig') }}
<style>
@ -33,6 +31,7 @@
{% block localstyle %}
{% endblock %}
</style>
{% if maxwidth is defined and maxwidth %}