diff --git a/public/styles/css/style.css b/public/styles/css/style.css index b7e7c71..3c0d447 100644 --- a/public/styles/css/style.css +++ b/public/styles/css/style.css @@ -1,3 +1,7 @@ +body { + font-size: 20px; +} + h1{ padding: 40px 0px 9px 0px; border-bottom: 1px solid #eee; @@ -295,7 +299,6 @@ th.dt-center, td.dt-center { text-align: center; } .herotitle { text-align: left; position:absolute; - //width:100%; top: 80px; left:50px; z-index: 9000; @@ -306,39 +309,6 @@ th.dt-center, td.dt-center { text-align: center; } border:none; } -.herousers { - position: absolute; - top: 100px; - flex-wrap: wrap; - left: 400px; - z-index: 10000; - display: flex; -} - -.herousers h3 { - width:100%; - padding-left:15px; -} - -.herouser { - padding:15px; - width:250px; - background-color: var(--colorbgbodydark); - margin:10px; - border-radius:5px; - text-align:center; -} - -.herouser img { - width:80px; - height: 80px; -} - -.herouser h4 { - font-size:16px; - margin-top:15px; -} - .heromenu { padding-top: 30px; font-size: 20px; @@ -372,7 +342,8 @@ th.dt-center, td.dt-center { text-align: center; } } .herologo img { - max-height:200px; + height:200px; + width:200px; border-radius: 100%; } @@ -382,15 +353,8 @@ th.dt-center, td.dt-center { text-align: center; } .slick-dots { top: 120px; left: 0px; text-align: center; width: 100%; } .heromenu .facatmenu {display: none;} .catmenu { display:none } - .heromenu .linkmenu {zoom:200%} - .herousers { top:315px; left:0px; width: 100%; justify-content: center; } - .herousers { text-align: center; } - .herousers h3{ padding-left: 0px; } - .herouser { width:170px} - .herouser img { width:50px;height:50px} - .herofloatmenu a { - font-size: 40px; - } + .heromenu .linkmenu {zoom:150%; margin-top: 10px;} + .herologo img { width:100px; height:100px; } .herofloatmenu .avatar { height: 40px; @@ -404,7 +368,7 @@ th.dt-center, td.dt-center { text-align: center; } .grid-item-size-2 { width: 20%; margin-bottom: 0%;float:left;} .grid-item-size-3 { width: 30%; margin-bottom: 0%;float:left;} .grid-item-size-4 { width: 40%; margin-bottom: 0%;float:left;} -.grid-item-size-5 { width: 40%; margin-bottom: 0%;float:left;} +.grid-item-size-5 { width: 50%; margin-bottom: 0%;float:left;} .grid-item-size-6 { width: 60%; margin-bottom: 0%;float:left;} .grid-item-size-7 { width: 70%; margin-bottom: 0%;float:left;} .grid-item-size-8 { width: 80%; margin-bottom: 0%;float:left;} @@ -412,9 +376,12 @@ th.dt-center, td.dt-center { text-align: center; } .grid-item-full { width: 100%; margin-bottom: 0%; font-size:20px;float:left; } .grid-item-full h1 {margin: 0; border:none; padding: 20px 0px 0px 10px; } .gutter-sizer { width: 0%;float:left; } +.member{display:flex; flex-direction: column; align-items: center;} +.member img{border-radius:100%;width:60px; height: 60px;} @media (max-width: 980px) { - .grid-sizer { width: 50%; margin-bottom: 0%;} + .grid-sizer { width: 10%; margin-bottom: 0%;} .grid-item-size { width: 50%; margin-bottom: 0%;} + .grid-item-size-small-3 { width: 30%} } diff --git a/public/styles/medias/logo.png b/public/styles/medias/logo.png index dafd6f7..d64b72d 100644 Binary files a/public/styles/medias/logo.png and b/public/styles/medias/logo.png differ diff --git a/src/Controller/HomeController.php b/src/Controller/HomeController.php index 3c37362..2ee9b98 100755 --- a/src/Controller/HomeController.php +++ b/src/Controller/HomeController.php @@ -14,7 +14,7 @@ class HomeController extends AbstractController $em = $this->getDoctrine()->getManager(); $users = $em->getRepository("App:User")->findBy([],["pseudo"=>"ASC"]); - $categorys = $em->getRepository("App:Category")->findBy(["user"=>null]); + $illustrations = $em->getRepository("App:Illustration")->findAll(); $links = $em->getRepository("App:Link")->findBy(["user"=>null]); $webzines = $em->getRepository("App:Webzine")->findBy(["user"=>null], ['set' => 'ASC', 'order' => 'ASC']); @@ -23,7 +23,7 @@ class HomeController extends AbstractController "usesidebar" => false, "usemonocolor" => true, "users" => $users, - "categorys" => $categorys, + "illustrations" => $illustrations, "links" => $links, "webzines" => $webzines ]); diff --git a/templates/Home/home.html.twig b/templates/Home/home.html.twig index 5731e0f..ed4d018 100644 --- a/templates/Home/home.html.twig +++ b/templates/Home/home.html.twig @@ -24,26 +24,6 @@ transition: -webkit-filter 0.1s; } {% endif %} - - {% for category in categorys|sort((a, b) => a.order <=> b.order) %} - {% if category.usecategoryconfig and category.appthumbfilter %} - .cssfilter-{{category.id}} { - filter: grayscale({{category.appthumbfiltergrayscale}}%) opacity({{category.appthumbfilteropacity}}%) sepia({{category.appthumbfiltersepia}}%); - transition: -webkit-filter 0.1s; - } - - .cssfilter-{{category.id}}:hover { - filter: unset; - -webkit-filter: unset; - -moz-filter: unset; - -o-filter: unset; - -ms-filter: unset; - - -webkit-transition: -webkit-filter 0.1s; - transition: -webkit-filter 0.1s; - } - {% endif %} - {% endfor %} {% endblock %} {% block body %} @@ -54,16 +34,12 @@
- {% for category in categorys|sort((a, b) => a.order <=> b.order) %} - {% if not category.illustrations is empty %} - {{category.name}}  - {% endif %} - {% endfor %} + Membres  + Illustrations  {% if not webzines is empty %} Webzines  {% endif %} Liens  - Contact 
@@ -173,11 +149,8 @@
- {% for category in categorys|sort((a, b) => a.order <=> b.order) %} - {% if not category.illustrations is empty %} - {{category.name}}
- {% endif %} - {% endfor %} + Membres
+ Illustrations
{% if not webzines is empty %} Webzines
@@ -186,47 +159,83 @@ {% if not links is empty %} Liens
{% endif %} - - Contact
-
-

Membres

- {% for user in users %} -
- -
-

{{user.pseudo}}

- -
- {% endfor %} -
- - - {% set style="margin:30px" %} - {% if app.session.get("appmaxthumbwidth")!="0" %} - {% set style="max-width:"~app.session.get("appmaxthumbwidth")~"px; margin:30px auto;" %} - {% endif %} -
-
-
- {% for category in categorys|sort((a, b) => a.order <=> b.order) %} - {% if not category.illustrations is empty %} -

{{ category.name }}

- {% for illustration in category.illustrations %} + +
+
+
+
+ + +
+
+
+ +
+

{{ app.session.get("appname")}}

+ + {% if not app.session.get("appsubname") is empty %} + {{ app.session.get("appsubname")}}
+ {%endif%} + + {% if not app.session.get("appdescription") is empty %} +
{{ app.session.get("appdescription")|raw}} + {%endif%} + + {% if app.session.get('email') is not empty or app.session.get('facebook') is not empty or app.session.get('instagram') is not empty or app.session.get('twitter') is not empty or app.session.get('google') is not empty or app.session.get('youtube') is not empty %} +

+ {% endif %} + + {% if app.session.get('email') is not empty %} + Email = {{ app.session.get('email') }}
+ {% endif %} + {% if app.session.get('facebook') is not empty %} + Facebook = {{ app.session.get('facebook') }}
+ {% endif %} + {% if app.session.get('instagram') is not empty %} + Instagram = {{ app.session.get('instagram') }}
+ {% endif %} + {% if app.session.get('twitter') is not empty %} + Twitter = {{ app.session.get('twitter') }}
+ {% endif %} + {% if app.session.get('google') is not empty %} + Google = {{ app.session.get('google') }}
+ {% endif %} + {% if app.session.get('youtube') is not empty %} + Youtube = {{ app.session.get('youtube') }}
+ {% endif %} +
+
+ + +
+

Membres

+ + {% for user in users %} +
+ + + {{user.pseudo}} + +
+ {% endfor %} +
+ + +
+

Illustrations

+ + {% for illustration in illustrations %} {% set appthumbwidth=app.session.get("appthumbwidth") %} {% set appthumbheight=app.session.get("appthumbheight") %} - {% if category.usecategoryconfig %} - {% set appthumbwidth=category.appthumbwidth %} - {% set appthumbheight=category.appthumbheight %} - {% endif %} {% if appthumbwidth==0 %} {% set class="" %} @@ -266,95 +275,59 @@ {% set source="thumbori_"~illustration.illustration %} {% endif %} - -
+ +
{% endfor %} - {% endif %} - {% endfor %} +
- {% if not webzines is empty %} -

Webzines

- {% endif %} - - {% set setname="" %} - {% for webzine in webzines %} - {% if not webzine.webzinepages is empty %} - {% if setname!=webzine.set %} - {% if not webzine.set is empty %} -

{{webzine.set}}

- {% endif %} - {% set setname=webzine.set %} +
+ {% if not webzines is empty %} +

Webzines

{% endif %} - {% set page=webzine.webzinepages[0] %} - {% set source="thumbori_"~page.illustration %} - {% set class=" grid-item-size-2 grid-item-size-page" %} - -
-
- - {% endif %} - {% endfor %} + {% set setname="" %} + {% for webzine in webzines %} + {% if not webzine.webzinepages is empty %} + {% if setname!=webzine.set %} + {% if not webzine.set is empty %} +

{{webzine.set}}

+ {% endif %} + {% set setname=webzine.set %} + {% endif %} + {% set page=webzine.webzinepages[0] %} + {% set source="thumbori_"~page.illustration %} + {% set class=" grid-item-size-2 grid-item-size-page" %} - - {% if not webzines is empty %} - - -
-
- -
- {% for link in links|sort((a, b) => a.order <=> b.order) %} - {{ link.name }} + +
+
+ + {% endif %} {% endfor %}
- {% endif %} - -

Contact

- -
+ +
+ {% if not webzines is empty %} + + +
+
-
- -
-

{{ app.session.get("appname")}}

- {% if not app.session.get("appsubname") is empty %} - {{ app.session.get("appsubname")}}
- {%endif%} - {% if not app.session.get("appdescription") is empty %} - -
{{ app.session.get("appdescription")|raw}}
- - {%endif%} - -
- - {% if app.session.get('email') is not empty %} - Email = {{ app.session.get('email') }}
- {% endif %} - {% if app.session.get('facebook') is not empty %} - Facebook = {{ app.session.get('facebook') }}
- {% endif %} - {% if app.session.get('instagram') is not empty %} - Instagram = {{ app.session.get('instagram') }}
- {% endif %} - {% if app.session.get('twitter') is not empty %} - Twitter = {{ app.session.get('twitter') }}
- {% endif %} - {% if app.session.get('google') is not empty %} - Google = {{ app.session.get('google') }}
- {% endif %} - {% if app.session.get('youtube') is not empty %} - Youtube = {{ app.session.get('youtube') }}
- {% endif %} - -
-
+
+ {% for link in links|sort((a, b) => a.order <=> b.order) %} + {{ link.name }} + {% endfor %} +
+ {% endif %} +
+
+
+
{% endblock %} @@ -386,7 +359,8 @@ window.onload = function() { $('body').imagesLoaded(function() { height=Math.max(500,$(window).height()); $('.heroheader').height(height); - $('.herologo').css({ top: (height-250) +'px' }); + himg=$('.herologo img').height(); + $('.herologo').css({ top: (height-himg-50) +'px' }); $('.heroheader').slick({ slidesToShow: 1, @@ -431,9 +405,9 @@ window.onload = function() { $(window).scroll(); height=Math.max(500,$(window).height()); $('.heroheader').height(height); - $('.herologo').css({ top: (height-250) +'px' }); + himg=$('.herologo img').height(); + $('.herologo').css({ top: (height-himg-50) +'px' }); resizeThumb(); - }); $(window).scroll(function () { diff --git a/templates/Home/user.html.twig b/templates/Home/user.html.twig index 12f6969..d5b3fa3 100644 --- a/templates/Home/user.html.twig +++ b/templates/Home/user.html.twig @@ -381,7 +381,8 @@ window.onload = function() { $('body').imagesLoaded(function() { height=Math.max(500,$(window).height()); $('.heroheader').height(height); - $('.herologo').css({ top: (height-250) +'px' }); + himg=$('.herologo img').height(); + $('.herologo').css({ top: (height-himg-50) +'px' }); $('.heroheader').slick({ slidesToShow: 1, @@ -426,10 +427,10 @@ window.onload = function() { $(window).scroll(); height=Math.max(500,$(window).height()); $('.heroheader').height(height); - $('.herologo').css({ top: (height-250) +'px' }); + himg=$('.herologo img').height(); + $('.herologo').css({ top: (height-himg-50) +'px' }); resizeThumb(); - - }); + }); $(window).scroll(function () { if($(window).width()>=980) {