Commit c1fb7fc8 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Migration intégrale de l'UI sur Boostrap 5 (en cours) 

NON FONCTIONNEL
parent ad37751d

module/Oscar/view/layout/layout.phtml

+273 −94

File changed.

Preview size limit exceeded, changes collapsed.

ui/package.json

+2 −1
Original line number Diff line number Diff line
@@ -10,10 +10,11 @@ 
    "preview": "vite preview"

  },

  "dependencies": {

    "@popperjs/core": "^2.11.8",

    "@quasar/extras": "^1.16.17",

    "@vitejs/plugin-vue": "^6.0.0",

    "axios": "^1.4.0",

    "bootstrap": "^5.3.3",

    "bootstrap": "^5.3.8",

    "marked": "^16.1.1",

    "material-design-icons-iconfont": "^6.7.0",

    "materials": "^1.1.3",

ui/src/oscar-css.js

+2 −0
Original line number Diff line number Diff line 
//import 'bootstrap/dist/css/bootstrap.css';

import './oscar-css.scss';

import bootstrap from 'bootstrap/js/index.umd.js';

// import 'bootstrap';

import {createApp} from "vue";

import Tooltip from "./components/Tooltip.vue";

import momentFilter from "./utils/MomentFilter.js";

ui/src/oscar-css.scss

+78 −14
Original line number Diff line number Diff line 
@use "sass:color";



////////////////////////////////////////////////

// Variables BOOSTSTRAP

////////////////////////////////////////////////

$brand-primary: #5368ac !default;

$brand-complementary: #27556C !default;

$primary: $brand-primary; // orange

$secondary: $brand-complementary; // gris bleuté

$bg-image: 'bg.jpg' !default;



$border-radius: 4px;



//rgb(255 - red($brand-primary), 255 - green($brand-primary), 255 - blue($brand-primary));

$brand-secondary1: #7d69b2;
@@ -14,18 +19,12 @@ $brand-warning: #f0ad4e !default; 
$brand-danger: #d9534f !default;

$brand-error: #cb0b05 !default;



$color-white: #fff !default;



$colorGreyUltraLight: #CCC;

$colorGreyLight: #AAA;



$font-size-smallest: 9px;

$font-size-smaller: 10px;

$font-size-smaller: 10px;

$font-size-small: 12px;

$font-size-base: 14px;

$font-size-big: 16px;

$font-size-bigger: 18px;

$font-size-biggest: 20px;



$grey-mega-light: #EEE;

$grey-ultra-light: #CCC;

$grid-float-breakpoint: 1024px;

$colorGreyMedium: #999;
@@ -34,12 +33,11 @@ $colorGreyBlack: #222; 


$colorGreyM: #999;





@import "bootstrap/scss/bootstrap";



/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

// General

body {

  background-color: rgba(210, 210, 210, 1);

  background-blend-mode: lighten;

}



body:not(.privatize) {

  #btn-toggle-private {
@@ -49,6 +47,71 @@ body:not(.privatize) { 
  }

}



p, ul, li {

  margin: 0;

  padding: 0;

}

li {

  list-style: none;

}



#contenu-principal {

  margin-top: 70px;

}



.cartouche {

  background: $primary;

  color: $color-white;

  padding: 0 .5em 0 .5em;

  text-decoration: none;

  border-radius: $border-radius;

  text-shadow: none;

  font-weight: 600;

  &:has(.addon){

    padding: 0 0 0 .5em;

  }

  .addon {

    font-weight: 400;

    border-radius: 0 $border-radius $border-radius 0;

    background: lighten($brand-primary, 30%);

    color: $brand-primary;

    padding: 0 .5em 0 .25em;

    margin-left: .25em;

  }

}



.card {

  border: solid thin $colorGreyLight;

  background: $grey-mega-light;

  border-radius: 0;

  margin: .5em 0;

  padding: .6em;

  box-shadow: -0em -0em 1em rgba(0, 0, 0, 0.3);

  &:hover {

    border-color: $colorGreyMedium;

    background-color: white;

  }

  .card-title {

    display: flex;

    font-size: 1.25em;

    padding: 0;

    margin: 0;

    border-bottom: thin solid $colorGreyUltraLight;

    padding-bottom: .6em;

  }

}



.metas {

  font-weight: 300;

  font-size: 0.9em;

  color: $colorGreyDark;

  time, a {

    font-weight: 600;



  }

}



/*

.oscar-section {

  background-color: white;
@@ -68,6 +131,7 @@ body:not(.privatize) { 
    padding: .25em;

  }

}

/***/



#btn-toggle-private {

  .on, .off {

ui/yarn.lock

+9 −4
Original line number Diff line number Diff line
@@ -227,6 +227,11 @@ 
  resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz"

  integrity sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==



"@popperjs/core@^2.11.8":

  version "2.11.8"

  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f"

  integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==



"@quasar/extras@^1.16.17":

  version "1.17.0"

  resolved "https://registry.npmjs.org/@quasar/extras/-/extras-1.17.0.tgz"
@@ -536,10 +541,10 @@ axios@^1.4.0: 
    form-data "^4.0.0"

    proxy-from-env "^1.1.0"



bootstrap@^5.3.3:

  version "5.3.7"

  resolved "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.7.tgz"

  integrity sha512-7KgiD8UHjfcPBHEpDNg+zGz8L3LqR3GVwqZiBRFX04a1BCArZOz1r2kjly2HQ0WokqTO0v1nF+QAt8dsW4lKlw==

bootstrap@^5.3.8:

  version "5.3.8"

  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.8.tgz#6401a10057a22752d21f4e19055508980656aeed"

  integrity sha512-HP1SZDqaLDPwsNiqRqi5NcP0SSXciX2s9E+RyqJIIqGo+vJeN5AJVM98CXmW/Wux0nQ5L7jeWUdplCEf0Ee+tg==



buffer-builder@^0.2.0:

  version "0.2.0"