diff --git a/.gitignore b/.gitignore index 07dbd3648..76ec96d40 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ Resources/bower_components/ Resources/node_modules/ Resources/public/css/sass/* !Resources/public/css/sass/_custom.scss +!Resources/public/css/sass/_timeline.scss Resources/public/js/select2/ Resources/public/js/pikaday/ Resources/public/css/select2/ diff --git a/Resources/public/css/sass/_custom.scss b/Resources/public/css/sass/_custom.scss index 80263fbbc..68120bcee 100644 --- a/Resources/public/css/sass/_custom.scss +++ b/Resources/public/css/sass/_custom.scss @@ -1,4 +1,7 @@ // YOUR CUSTOM SCSS + +@import 'timeline.scss'; + div#general { background: none repeat scroll 0 0 $green; color: #FFF; diff --git a/Resources/public/css/sass/_timeline.scss b/Resources/public/css/sass/_timeline.scss new file mode 100644 index 000000000..ee21d927d --- /dev/null +++ b/Resources/public/css/sass/_timeline.scss @@ -0,0 +1,31 @@ +/* +Chill is a software for social workers +Copyright (C) 2015 Champs Libres + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . +*/ + +div.timeline { + div { + margin: 0.7em 0.2em; + background-color: #e6e6e6; + padding: 0.3em; + + div.summary { + margin-left: 1em; + } + } + + +}