From a574b3cdf1903b9c57e6c23738ff6971890e73c2 Mon Sep 17 00:00:00 2001 From: xdrm-brackets Date: Wed, 14 Mar 2018 00:07:19 +0100 Subject: [PATCH] [webpack.ue.view] found an design idea for 'required' vs. 'optional' UEs --- public_html/asset/svg/pin.svg | 45 +++++++++++++++++++++++ public_html/asset/svg/warning_radio.svg | 47 ++++++++++++++++--------- webpack/component/ue/view.vue | 2 +- webpack/scss/container.scss | 16 +++++++++ 4 files changed, 92 insertions(+), 18 deletions(-) create mode 100644 public_html/asset/svg/pin.svg diff --git a/public_html/asset/svg/pin.svg b/public_html/asset/svg/pin.svg new file mode 100644 index 0000000..b13d28e --- /dev/null +++ b/public_html/asset/svg/pin.svg @@ -0,0 +1,45 @@ + +image/svg+xml \ No newline at end of file diff --git a/public_html/asset/svg/warning_radio.svg b/public_html/asset/svg/warning_radio.svg index e11fd42..aa91698 100644 --- a/public_html/asset/svg/warning_radio.svg +++ b/public_html/asset/svg/warning_radio.svg @@ -7,17 +7,28 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - enable-background="new 0 0 24 24" - id="Layer_1" - version="1.0" - viewBox="0 0 24 24" - xml:space="preserve" + height="1792" + viewBox="0 0 1792 1792" + width="1792" + version="1.1" + id="svg4" sodipodi:docname="warning_radio.svg" - inkscape:version="0.92.2 5c3e80d, 2017-08-06">image/svg+xml + + + + image/svg+xml + + + + + + + + \ No newline at end of file + inkscape:connector-curvature="0" /> + diff --git a/webpack/component/ue/view.vue b/webpack/component/ue/view.vue index a4e1d4e..6449dd3 100644 --- a/webpack/component/ue/view.vue +++ b/webpack/component/ue/view.vue @@ -73,7 +73,7 @@ -
{{ ue.required ? 'UE obligatoire' : 'UE optionnelle' }}
+
{{ ue.required ? 'UE obligatoire' : 'UE optionnelle' }}
{{ ue.volumeCours + ue.volumeTD + ue.volumeTP }}h totales
{{ gstore.form_by_id(form_id).labelForm || '???' }} diff --git a/webpack/scss/container.scss b/webpack/scss/container.scss index 59fe107..ab09a9d 100644 --- a/webpack/scss/container.scss +++ b/webpack/scss/container.scss @@ -667,6 +667,22 @@ color: $form-valid-color; } + // state style + &[data-state]{ + color: $form-neutral-color; + + &:before, + &[data-state='0']:before{ + background-image: url('/asset/svg/pin.svg@#{$rd-form-neutral-color}'); + background-position: center center; + background-size: auto 100%; + } + + &[data-state='1']:before{ + background-image: url('/asset/svg/pin.svg@#{$rd-form-invalid-color}'); + } + }; + } }