mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-09-12 01:34:58 +00:00
Compare commits
17 Commits
bootstrap-
...
vue3-test0
Author | SHA1 | Date | |
---|---|---|---|
3e7c79d6ce | |||
bc1f624e14 | |||
f73d3bf320 | |||
2de8338651 | |||
e7df62b373 | |||
69ea88a4d5 | |||
9566ea89b1 | |||
425d51649f | |||
c32f730713 | |||
a48d6d2a0a | |||
16b155d449 | |||
083f56bff0 | |||
f526453ba3 | |||
89d95a0eae | |||
6bcdbaf668 | |||
0a0895584c | |||
d7d8f2a60a |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,3 +1,4 @@
|
|||||||
.composer/*
|
.composer/*
|
||||||
composer.phar
|
composer.phar
|
||||||
|
docs/build/
|
||||||
|
|
||||||
|
@@ -22,7 +22,6 @@
|
|||||||
"require": {
|
"require": {
|
||||||
"champs-libres/async-uploader-bundle": "dev-sf4",
|
"champs-libres/async-uploader-bundle": "dev-sf4",
|
||||||
"graylog2/gelf-php": "^1.5",
|
"graylog2/gelf-php": "^1.5",
|
||||||
"symfony/flex": "^1.9",
|
|
||||||
"symfony/form": "4.*",
|
"symfony/form": "4.*",
|
||||||
"symfony/twig-bundle": "^4.4",
|
"symfony/twig-bundle": "^4.4",
|
||||||
"twig/extra-bundle": "^2.12|^3.0",
|
"twig/extra-bundle": "^2.12|^3.0",
|
||||||
@@ -38,6 +37,7 @@
|
|||||||
"symfony/validator": "4.*",
|
"symfony/validator": "4.*",
|
||||||
"sensio/framework-extra-bundle": "^5.5",
|
"sensio/framework-extra-bundle": "^5.5",
|
||||||
"symfony/yaml": "4.*",
|
"symfony/yaml": "4.*",
|
||||||
|
"symfony/webpack-encore-bundle": "^1.11",
|
||||||
"knplabs/knp-menu": "^3.1",
|
"knplabs/knp-menu": "^3.1",
|
||||||
"knplabs/knp-menu-bundle": "^3.0",
|
"knplabs/knp-menu-bundle": "^3.0",
|
||||||
"symfony/templating": "4.*",
|
"symfony/templating": "4.*",
|
||||||
@@ -52,7 +52,8 @@
|
|||||||
"symfony/browser-kit": "^5.2",
|
"symfony/browser-kit": "^5.2",
|
||||||
"symfony/css-selector": "^5.2",
|
"symfony/css-selector": "^5.2",
|
||||||
"twig/markdown-extra": "^3.3",
|
"twig/markdown-extra": "^3.3",
|
||||||
"erusev/parsedown": "^1.7"
|
"erusev/parsedown": "^1.7",
|
||||||
|
"symfony/serializer": "^5.2"
|
||||||
},
|
},
|
||||||
"conflict": {
|
"conflict": {
|
||||||
"symfony/symfony": "*"
|
"symfony/symfony": "*"
|
||||||
|
@@ -21,9 +21,7 @@ global.chill = chill;
|
|||||||
/*
|
/*
|
||||||
* load requirements in chill entrypoint
|
* load requirements in chill entrypoint
|
||||||
*/
|
*/
|
||||||
|
require('./scss/chillmain.scss');
|
||||||
require('./sass/scratch.scss');
|
|
||||||
|
|
||||||
require('./css/chillmain.css');
|
require('./css/chillmain.css');
|
||||||
require('./css/pikaday.css');
|
require('./css/pikaday.css');
|
||||||
|
|
||||||
@@ -37,10 +35,11 @@ require('./modules/download-report/index.js');
|
|||||||
require('./modules/select_interactive_loading/index.js');
|
require('./modules/select_interactive_loading/index.js');
|
||||||
require('./modules/export-list/export-list.scss');
|
require('./modules/export-list/export-list.scss');
|
||||||
require('./modules/entity/index.js');
|
require('./modules/entity/index.js');
|
||||||
|
//require('./modules/tabs/index.js');
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* load img
|
* load img
|
||||||
*/
|
*/
|
||||||
require('./img/favicon.ico');
|
require('./img/favicon.ico');
|
||||||
require('./img/logo-chill-sans-slogan_white.png');
|
require('./img/logo-chill-sans-slogan_white.png');
|
||||||
require('./img/logo-chill-outil-accompagnement_white.png');
|
require('./img/logo-chill-outil-accompagnement_white.png');
|
||||||
|
@@ -0,0 +1,4 @@
|
|||||||
|
/*
|
||||||
|
* These custom styles will override bootstrap enabled stylesheets
|
||||||
|
*/
|
||||||
|
|
47
src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/bootstrap.scss
vendored
Normal file
47
src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/bootstrap.scss
vendored
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
/*
|
||||||
|
* Enable / disable bootstrap assets
|
||||||
|
*/
|
||||||
|
|
||||||
|
@import "bootstrap/scss/functions";
|
||||||
|
|
||||||
|
/* replace variables */
|
||||||
|
// @import "bootstrap/scss/variables";
|
||||||
|
@import "custom/_variables";
|
||||||
|
|
||||||
|
@import "bootstrap/scss/mixins";
|
||||||
|
// @import "bootstrap/scss/root";
|
||||||
|
// @import "bootstrap/scss/reboot";
|
||||||
|
// @import "bootstrap/scss/type";
|
||||||
|
// @import "bootstrap/scss/images";
|
||||||
|
// @import "bootstrap/scss/code";
|
||||||
|
// @import "bootstrap/scss/grid";
|
||||||
|
// @import "bootstrap/scss/tables";
|
||||||
|
// @import "bootstrap/scss/forms";
|
||||||
|
// @import "bootstrap/scss/buttons";
|
||||||
|
// @import "bootstrap/scss/transitions";
|
||||||
|
// @import "bootstrap/scss/dropdown";
|
||||||
|
// @import "bootstrap/scss/button-group";
|
||||||
|
// @import "bootstrap/scss/input-group";
|
||||||
|
// @import "bootstrap/scss/custom-forms";
|
||||||
|
// @import "bootstrap/scss/nav";
|
||||||
|
// @import "bootstrap/scss/navbar";
|
||||||
|
// @import "bootstrap/scss/card";
|
||||||
|
// @import "bootstrap/scss/breadcrumb";
|
||||||
|
// @import "bootstrap/scss/pagination";
|
||||||
|
// @import "bootstrap/scss/badge";
|
||||||
|
// @import "bootstrap/scss/jumbotron";
|
||||||
|
// @import "bootstrap/scss/alert";
|
||||||
|
// @import "bootstrap/scss/progress";
|
||||||
|
// @import "bootstrap/scss/media";
|
||||||
|
// @import "bootstrap/scss/list-group";
|
||||||
|
// @import "bootstrap/scss/close";
|
||||||
|
// @import "bootstrap/scss/toasts";
|
||||||
|
@import "bootstrap/scss/modal";
|
||||||
|
// @import "bootstrap/scss/tooltip";
|
||||||
|
// @import "bootstrap/scss/popover";
|
||||||
|
// @import "bootstrap/scss/carousel";
|
||||||
|
// @import "bootstrap/scss/spinners";
|
||||||
|
// @import "bootstrap/scss/utilities";
|
||||||
|
// @import "bootstrap/scss/print";
|
||||||
|
|
||||||
|
@import "custom";
|
@@ -1,42 +0,0 @@
|
|||||||
/*
|
|
||||||
* when bootstrap.css comes after chill.css
|
|
||||||
* we have to disable conflict classes
|
|
||||||
*/
|
|
||||||
|
|
||||||
@import "bootstrap/scss/functions";
|
|
||||||
@import "bootstrap/scss/variables";
|
|
||||||
@import "bootstrap/scss/mixins";
|
|
||||||
@import "bootstrap/scss/root";
|
|
||||||
//@import "bootstrap/scss/reboot"; // h1, h2, h3, ...
|
|
||||||
//@import "bootstrap/scss/type"; // h1, h2, h3, ...
|
|
||||||
@import "bootstrap/scss/images";
|
|
||||||
@import "bootstrap/scss/code";
|
|
||||||
//@import "bootstrap/scss/grid"; // container
|
|
||||||
@import "bootstrap/scss/tables";
|
|
||||||
@import "bootstrap/scss/forms";
|
|
||||||
@import "bootstrap/scss/buttons";
|
|
||||||
@import "bootstrap/scss/transitions";
|
|
||||||
@import "bootstrap/scss/dropdown";
|
|
||||||
@import "bootstrap/scss/button-group";
|
|
||||||
@import "bootstrap/scss/input-group";
|
|
||||||
@import "bootstrap/scss/custom-forms";
|
|
||||||
@import "bootstrap/scss/nav";
|
|
||||||
@import "bootstrap/scss/navbar";
|
|
||||||
@import "bootstrap/scss/card";
|
|
||||||
@import "bootstrap/scss/breadcrumb";
|
|
||||||
@import "bootstrap/scss/pagination";
|
|
||||||
@import "bootstrap/scss/badge";
|
|
||||||
@import "bootstrap/scss/jumbotron";
|
|
||||||
@import "bootstrap/scss/alert";
|
|
||||||
@import "bootstrap/scss/progress";
|
|
||||||
@import "bootstrap/scss/media";
|
|
||||||
@import "bootstrap/scss/list-group";
|
|
||||||
@import "bootstrap/scss/close";
|
|
||||||
@import "bootstrap/scss/toasts";
|
|
||||||
@import "bootstrap/scss/modal";
|
|
||||||
@import "bootstrap/scss/tooltip";
|
|
||||||
@import "bootstrap/scss/popover";
|
|
||||||
@import "bootstrap/scss/carousel";
|
|
||||||
@import "bootstrap/scss/spinners";
|
|
||||||
@import "bootstrap/scss/utilities";
|
|
||||||
@import "bootstrap/scss/print";
|
|
File diff suppressed because it is too large
Load Diff
@@ -1,9 +1,9 @@
|
|||||||
// Compile all bootstrap assets from nodes-modules
|
// Compile all bootstrap assets from nodes-modules
|
||||||
//require('bootstrap/scss/bootstrap.scss')
|
//require('bootstrap/scss/bootstrap.scss')
|
||||||
|
|
||||||
// Compile custom styles to adapt bootstrap in chill context
|
// Or compile bootstrap only enabled assets
|
||||||
require('./custom.scss')
|
require('./bootstrap.scss');
|
||||||
|
|
||||||
// You can specify which plugins you need
|
// You can specify which plugins you need
|
||||||
//import { Tooltip, Toast, Popover } from 'bootstrap';
|
//import { Tooltip, Toast, Popover } from 'bootstrap';
|
||||||
//import Alert from 'bootstrap/js/dist/alert';
|
import Modal from 'bootstrap/js/dist/modal';
|
||||||
|
@@ -1,3 +1,9 @@
|
|||||||
|
/*
|
||||||
|
* NOTE 2021.04
|
||||||
|
* scss/chill.scss is the main sass file for the new chill.2
|
||||||
|
* scratch will be replaced by bootstrap, please avoid to edit in modules/scratch/_custom.scss
|
||||||
|
*/
|
||||||
|
|
||||||
// YOUR CUSTOM SCSS
|
// YOUR CUSTOM SCSS
|
||||||
@import 'custom/config/colors';
|
@import 'custom/config/colors';
|
||||||
@import 'custom/config/variables';
|
@import 'custom/config/variables';
|
||||||
@@ -156,7 +162,6 @@ dl.chill_view_data {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
blockquote.chill-user-quote,
|
blockquote.chill-user-quote,
|
||||||
div.chill-user-quote {
|
div.chill-user-quote {
|
||||||
border-left: 10px solid $chill-yellow;
|
border-left: 10px solid $chill-yellow;
|
||||||
@@ -164,12 +169,12 @@ div.chill-user-quote {
|
|||||||
padding: 0.5em 10px;
|
padding: 0.5em 10px;
|
||||||
quotes: "\201C""\201D""\2018""\2019";
|
quotes: "\201C""\201D""\2018""\2019";
|
||||||
background-color: $chill-llight-gray;
|
background-color: $chill-llight-gray;
|
||||||
|
|
||||||
blockquote {
|
blockquote {
|
||||||
margin: 1.5em 10px;
|
margin: 1.5em 10px;
|
||||||
padding: 0.5em 10px;
|
padding: 0.5em 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
blockquote:before {
|
blockquote:before {
|
||||||
color: #ccc;
|
color: #ccc;
|
||||||
content: open-quote;
|
content: open-quote;
|
||||||
@@ -182,5 +187,4 @@ div.chill-user-quote {
|
|||||||
|
|
||||||
.chill-no-data-statement {
|
.chill-no-data-statement {
|
||||||
font-style: italic;
|
font-style: italic;
|
||||||
|
|
||||||
}
|
}
|
@@ -1,42 +1,42 @@
|
|||||||
@charset "UTF-8";
|
@charset "UTF-8";
|
||||||
|
|
||||||
/// Outputs the spec and prefixed versions of the `::selection` pseudo-element.
|
/// Outputs the spec and prefixed versions of the `::selection` pseudo-element.
|
||||||
///
|
///
|
||||||
/// @param {Bool} $current-selector [false]
|
/// @param {Bool} $current-selector [false]
|
||||||
/// If set to `true`, it takes the current element into consideration.
|
/// If set to `true`, it takes the current element into consideration.
|
||||||
///
|
///
|
||||||
/// @example scss - Usage
|
/// @example scss - Usage
|
||||||
/// .element {
|
/// .element {
|
||||||
/// @include selection(true) {
|
/// @include selection(true) {
|
||||||
/// background-color: #ffbb52;
|
/// background-color: #ffbb52;
|
||||||
/// }
|
/// }
|
||||||
/// }
|
/// }
|
||||||
///
|
///
|
||||||
/// @example css - CSS Output
|
/// @example css - CSS Output
|
||||||
/// .element::-moz-selection {
|
/// .element::-moz-selection {
|
||||||
/// background-color: #ffbb52;
|
/// background-color: #ffbb52;
|
||||||
/// }
|
/// }
|
||||||
///
|
///
|
||||||
/// .element::selection {
|
/// .element::selection {
|
||||||
/// background-color: #ffbb52;
|
/// background-color: #ffbb52;
|
||||||
/// }
|
/// }
|
||||||
|
|
||||||
@mixin selection($current-selector: false) {
|
@mixin selection($current-selector: false) {
|
||||||
@if $current-selector {
|
@if $current-selector {
|
||||||
&::-moz-selection {
|
&::-moz-selection {
|
||||||
@content;
|
@content;
|
||||||
}
|
}
|
||||||
|
|
||||||
&::selection {
|
&::selection {
|
||||||
@content;
|
@content;
|
||||||
}
|
}
|
||||||
} @else {
|
} @else {
|
||||||
::-moz-selection {
|
::-moz-selection {
|
||||||
@content;
|
@content;
|
||||||
}
|
}
|
||||||
|
|
||||||
::selection {
|
::selection {
|
||||||
@content;
|
@content;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user