Bläddra i källkod

mise en page header

v1
Charly 3 år sedan
förälder
incheckning
14eb2646c8
15 ändrade filer med 11729 tillägg och 11764 borttagningar
  1. +0
    -12
      assets/app.js
  2. +1
    -1
      assets/app/frontend/scss/base.scss
  3. +9
    -8
      assets/app/frontend/scss/header.scss
  4. +2
    -0
      assets/app/frontend/scss/vars.scss
  5. +0
    -11
      assets/bootstrap.js
  6. +0
    -16
      assets/controllers/hello_controller.js
  7. +0
    -3
      assets/styles/app.css
  8. +0
    -842
      public/build/adminlte-plugins.53e5cc84.js
  9. +845
    -0
      public/build/adminlte-plugins.c7086074.js
  10. +10866
    -0
      public/build/app-frontend.35f52dd6.css
  11. +0
    -10865
      public/build/app-frontend.aeb3dd19.css
  12. +2
    -2
      public/build/entrypoints.json
  13. +2
    -2
      public/build/manifest.json
  14. +1
    -1
      src/Entity/User/User.php
  15. +1
    -1
      templates/frontend/home.html.twig

+ 0
- 12
assets/app.js Visa fil

@@ -1,12 +0,0 @@
/*
* Welcome to your app's main JavaScript file!
*
* We recommend including the built version of this JavaScript file
* (and its CSS file) in your base layout (base.html.twig).
*/

// any CSS you import will output into a single css file (app.css in this case)
import './styles/app.css';

// start the Stimulus application
import './bootstrap';

+ 1
- 1
assets/app/frontend/scss/base.scss Visa fil

@@ -1,5 +1,5 @@
#content-page {
margin-top: 150px;
margin-top: $headerheight;
}

img {

+ 9
- 8
assets/app/frontend/scss/header.scss Visa fil

@@ -13,19 +13,20 @@
height: 100%;

.row-toggle {
height: 16%;
height: 12%;

.toggle {
position: absolute;
right: 50px;
top: 50px;
right: 0;
top: 2%;
border: 0;
background-color: #FFF;
z-index: 100;
}
}

.row-list {
height: 84%;
height: 88%;

nav {
ul {
@@ -36,7 +37,7 @@
width: 100%;
padding-left: 20%;
padding-right: 15%;
margin-bottom: 8%;
margin-bottom: 6%;
display: inline-block;

a {
@@ -82,7 +83,7 @@

.menu-fixed {
background-color: #FFF;
height: 150px;
height: $headerheight;
z-index: 2;
border-bottom: 1px solid lightgrey;

@@ -90,7 +91,7 @@
width: 50%;

img {
max-height: 123px;
max-height: 85px;
}
}

@@ -110,7 +111,7 @@

.space-collab {
color: $yellow;
font-size: 25px;
font-size: 22px;
font-family: franklinregular;

img {

+ 2
- 0
assets/app/frontend/scss/vars.scss Visa fil

@@ -7,6 +7,8 @@ $orange: #dc5b2f;
$blue: #17428c;
$green: #568b6f;

$headerheight: 122px;

@font-face {
font-family: 'dinregular';
src: url($dir-fonts + 'din_regular-webfont.eot');

+ 0
- 11
assets/bootstrap.js Visa fil

@@ -1,11 +0,0 @@
import { startStimulusApp } from '@symfony/stimulus-bridge';

// Registers Stimulus controllers from controllers.json and in the controllers/ directory
export const app = startStimulusApp(require.context(
'@symfony/stimulus-bridge/lazy-controller-loader!./controllers',
true,
/\.(j|t)sx?$/
));

// register any custom, 3rd party controllers here
// app.register('some_controller_name', SomeImportedController);

+ 0
- 16
assets/controllers/hello_controller.js Visa fil

@@ -1,16 +0,0 @@
import { Controller } from 'stimulus';

/*
* This is an example Stimulus controller!
*
* Any element with a data-controller="hello" attribute will cause
* this controller to be executed. The name "hello" comes from the filename:
* hello_controller.js -> "hello"
*
* Delete this file or adapt it for your use!
*/
export default class extends Controller {
connect() {
this.element.textContent = 'Hello Stimulus! Edit me in assets/controllers/hello_controller.js';
}
}

+ 0
- 3
assets/styles/app.css Visa fil

@@ -1,3 +0,0 @@
body {
background-color: lightgray;
}

+ 0
- 842
public/build/adminlte-plugins.53e5cc84.js
Filskillnaden har hållits tillbaka eftersom den är för stor
Visa fil


+ 845
- 0
public/build/adminlte-plugins.c7086074.js
Filskillnaden har hållits tillbaka eftersom den är för stor
Visa fil


+ 10866
- 0
public/build/app-frontend.35f52dd6.css
Filskillnaden har hållits tillbaka eftersom den är för stor
Visa fil


+ 0
- 10865
public/build/app-frontend.aeb3dd19.css
Filskillnaden har hållits tillbaka eftersom den är för stor
Visa fil


+ 2
- 2
public/build/entrypoints.json Visa fil

@@ -9,7 +9,7 @@
"/build/vendors-node_modules_core-js_modules_es_array_find_js-node_modules_core-js_modules_es_date_to-6fef76.ac898f36.js",
"/build/vendors-node_modules_popper_js_dist_esm_popper_js.e5c0d110.js",
"/build/vendors-node_modules_admin-lte_dist_js_adminlte_min_js-node_modules_bootstrap-autocomplete_di-ff08f2.d1f0f608.js",
"/build/adminlte-plugins.53e5cc84.js"
"/build/adminlte-plugins.c7086074.js"
],
"css": [
"/build/vendors-node_modules_admin-lte_dist_js_adminlte_min_js-node_modules_bootstrap-autocomplete_di-ff08f2.fa890b12.css"
@@ -120,7 +120,7 @@
"/build/app-frontend.48212924.js"
],
"css": [
"/build/app-frontend.aeb3dd19.css"
"/build/app-frontend.35f52dd6.css"
]
}
}

+ 2
- 2
public/build/manifest.json Visa fil

@@ -1,5 +1,5 @@
{
"build/adminlte-plugins.js": "/build/adminlte-plugins.53e5cc84.js",
"build/adminlte-plugins.js": "/build/adminlte-plugins.c7086074.js",
"build/adminlte-index.css": "/build/adminlte-index.e4548695.css",
"build/adminlte-index.js": "/build/adminlte-index.54281e4b.js",
"build/adminlte-form.css": "/build/adminlte-form.59862983.css",
@@ -17,7 +17,7 @@
"build/sov-ticket.js": "/build/sov-ticket.df76c7a0.js",
"build/app-backend.css": "/build/app-backend.3d882954.css",
"build/app-backend.js": "/build/app-backend.e0a6620d.js",
"build/app-frontend.css": "/build/app-frontend.aeb3dd19.css",
"build/app-frontend.css": "/build/app-frontend.35f52dd6.css",
"build/app-frontend.js": "/build/app-frontend.48212924.js",
"build/runtime.js": "/build/runtime.3095b250.js",
"build/vendors-node_modules_core-js_internals_export_js.2e873f33.js": "/build/vendors-node_modules_core-js_internals_export_js.2e873f33.js",

+ 1
- 1
src/Entity/User/User.php Visa fil

@@ -6,7 +6,7 @@ use App\Entity\CollectifData;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
use Doctrine\ORM\Mapping as ORM;
use Lc\SovBundle\Model\User\User as SovUserModel;
use Lc\SovBundle\Model\User\GroupUserModel as SovUserModel;
use Lc\SovBundle\Model\User\UserInterface;
use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;


+ 1
- 1
templates/frontend/home.html.twig Visa fil

@@ -15,7 +15,7 @@
<div class="col-12">
<h1>Imaginons ensemble le futur du Nord Franche-Comté</h1>
<h2>Participez à une démarche inédite de concertation citoyenne.</h2>
<a class="discover" href="" title="Découvrir">DÉCOUVRIR</a>
<a class="discover" href="{{ path('app_contribuate') }}" title="Découvrir">DÉCOUVRIR</a>
<img class="perso-aac" src="{{ 'assets/img/Personnages.png' }}" alt="Personnages-AAC">
<img class="startup" src="{{ 'assets/img/Picto-StartUP.png' }}" alt="StartUP">
</div>

Laddar…
Avbryt
Spara