diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/ConfigType.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/ConfigType.php
index 31acbdd3..d81c713b 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/ConfigType.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/ConfigType.php
@@ -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",
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/font.css b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/font.css
index abc4516c..9586e05f 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/font.css
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/font.css
@@ -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;
- }
\ No newline at end of file
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/fonts/typo/Gothic-Bold.ttf b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/fonts/typo/Gothic-Bold.ttf
new file mode 100644
index 00000000..d3577b96
Binary files /dev/null and b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/fonts/typo/Gothic-Bold.ttf differ
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/fonts/typo/Gothic-Regular.ttf b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/fonts/typo/Gothic-Regular.ttf
new file mode 100644
index 00000000..c60a3241
Binary files /dev/null and b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/fonts/typo/Gothic-Regular.ttf differ
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/fonts/typo/Marianne-Bold.otf b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/fonts/typo/Marianne-Bold.otf
new file mode 100644
index 00000000..4a051bcd
Binary files /dev/null and b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/fonts/typo/Marianne-Bold.otf differ
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/fonts/typo/Marianne-Regular.otf b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/fonts/typo/Marianne-Regular.otf
new file mode 100644
index 00000000..b8aa87d2
Binary files /dev/null and b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/fonts/typo/Marianne-Regular.otf differ
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/function.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/function.html.twig
new file mode 100644
index 00000000..2f0555b2
Binary files /dev/null and b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/function.html.twig differ
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/header.jpg b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/header.jpg
new file mode 100644
index 00000000..ab1266aa
Binary files /dev/null and b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/header.jpg differ
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/info.yml b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/info.yml
new file mode 100644
index 00000000..9a2cb0d5
--- /dev/null
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/info.yml
@@ -0,0 +1,3 @@
+name: Métice
+author: Pierre Cadéot
+version: 1.0
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/local.js b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/local.js
new file mode 100644
index 00000000..e69de29b
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/look.png b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/look.png
new file mode 100644
index 00000000..950a3d1a
Binary files /dev/null and b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/look.png differ
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/style.css b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/style.css
new file mode 100644
index 00000000..8bf8302e
--- /dev/null
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/style.css
@@ -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; }
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/head.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/head.html.twig
index f43671f5..73309bdc 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/head.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/head.html.twig
@@ -8,6 +8,37 @@
+
+
{% block stylesheets %}
{% stylesheets
'@CadolesCoreBundle/Resources/public/css/bootstrap.min.css'
@@ -42,19 +73,6 @@
{% endstylesheets %}
- {% set theme = app.session.get('theme') %}
- {% if theme is not empty %}
-
- {% endif %}
-
-
-
-
-
-
-
+
+
+
+ {% set theme = app.session.get('theme') %}
+ {% if theme is not empty %}
+
+ {% endif %}
+
+
+
{% endblock %}
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/base.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/base.html.twig
index 0e08a40c..45c15fa6 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/base.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/base.html.twig
@@ -23,9 +23,7 @@
{%endif%}
-
-
-
+
{{ include('@CadolesCore/Include/head.html.twig') }}
{% if maxwidth is defined and maxwidth %}