diff options
| -rw-r--r-- | app/assets/fonts/sBoiv/sboiv.eot | bin | 1496 -> 2136 bytes | |||
| -rw-r--r-- | app/assets/fonts/sBoiv/sboiv.svg | 3 | ||||
| -rw-r--r-- | app/assets/fonts/sBoiv/sboiv.ttf | bin | 1340 -> 1980 bytes | |||
| -rw-r--r-- | app/assets/fonts/sBoiv/sboiv.woff | bin | 1416 -> 2056 bytes | |||
| -rw-r--r-- | app/assets/stylesheets/components/_forms.sass | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/components/_tables.sass | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/typography/_fonts.sass | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/typography/_sboiv.sass | 5 | ||||
| -rw-r--r-- | app/views/workbenches/_filters.html.slim | 2 | ||||
| -rw-r--r-- | app/views/workbenches/show.html.slim | 2 |
10 files changed, 12 insertions, 8 deletions
diff --git a/app/assets/fonts/sBoiv/sboiv.eot b/app/assets/fonts/sBoiv/sboiv.eot Binary files differindex f3df36d9a..f3242ace3 100644 --- a/app/assets/fonts/sBoiv/sboiv.eot +++ b/app/assets/fonts/sBoiv/sboiv.eot diff --git a/app/assets/fonts/sBoiv/sboiv.svg b/app/assets/fonts/sBoiv/sboiv.svg index c506dee04..76f038bd7 100644 --- a/app/assets/fonts/sBoiv/sboiv.svg +++ b/app/assets/fonts/sBoiv/sboiv.svg @@ -8,5 +8,6 @@ <missing-glyph horiz-adv-x="1024" /> <glyph unicode=" " horiz-adv-x="512" d="" /> <glyph unicode="" glyph-name="update-vj" d="M1017.856 448c0 266.935-216.393 483.328-483.328 483.328v-99.84c211.677-0.291 383.197-171.81 383.488-383.46zM918.016 448c0-0.071 0-0.154 0-0.238 0-211.795-171.693-383.488-383.488-383.488-187.627 0-343.782 134.745-376.977 312.746l-102.767 2.371c29.828-240.928 233.283-425.583 479.866-425.583 266.935 0 483.328 216.393 483.328 483.328 0 3.82-0.044 7.629-0.132 11.427zM534.528 755.2c169.662 0 307.2-137.538 307.2-307.2h-307.2zM460.8 669.184c-0.283-17.134-14.098-30.949-31.205-31.232h-136.731v-136.192c0.003-0.152 0.004-0.332 0.004-0.512 0-17.249-13.983-31.232-31.232-31.232-0.001 0-0.003 0-0.004 0h-62.976c-17.31 0.288-31.232 14.388-31.232 31.74 0 0.001 0 0.003 0 0.004v136.192h-136.192c-17.249 0-31.232 13.983-31.232 31.232v62.976c0 17.249 13.983 31.232 31.232 31.232h136.192v136.704c0.283 17.134 14.098 30.949 31.205 31.232h63.003c17.249 0 31.232-13.983 31.232-31.232v-136.704h136.192c0.001 0 0.003 0 0.004 0 17.352 0 31.452-13.922 31.74-31.205z" /> -<glyph unicode="" glyph-name="chrono" horiz-adv-x="931" d="M440.957-64c243.751 0 440.957 196.267 440.957 438.857 0 225.524-171.483 412.038-391.962 436.419v51.2h73.493v97.524h-244.976v-97.524h73.493v-51.2c-220.478-24.381-391.962-209.676-391.962-436.419 0-242.59 197.206-438.857 440.957-438.857zM756.974 864.917l-71.043-70.705c71.043-41.448 131.062-101.181 172.708-171.886l71.055 70.705c-44.108 69.486-104.115 128-172.72 171.886z" /> +<glyph unicode="" glyph-name="preparing" d="M1011.2 614.4l-80.384 80.384c-7.765 8.206-18.732 13.313-30.891 13.313-0.12 0-0.239 0-0.359-0.001-0.129 0.002-0.303 0.003-0.478 0.003-11.952 0-22.709-5.119-30.196-13.285l-56.859-56.35 142.336-142.848 56.832 54.784c7.9 7.644 12.803 18.342 12.803 30.185 0 0.188-0.001 0.376-0.004 0.563 0.035 0.625 0.055 1.389 0.055 2.159 0 12.138-4.911 23.129-12.855 31.094zM504.32 330.752v-142.848h142.848l285.184 285.696-142.336 142.336zM805.888 544.256l-185.856-185.856c-0.834-0.338-1.802-0.535-2.816-0.535s-1.982 0.196-2.868 0.553c-0.285-0.079-0.672-0.113-1.067-0.113-3.676 0-6.656 2.98-6.656 6.656 0 0.395 0.034 0.782 0.1 1.159-0.322 0.797-0.505 1.765-0.505 2.776s0.183 1.979 0.518 2.873l188.397 183.751c0.834 0.338 1.802 0.535 2.816 0.535s1.982-0.196 2.868-0.553c0.285 0.079 0.672 0.113 1.067 0.113 3.676 0 6.656-2.98 6.656-6.656 0-0.395-0.034-0.782-0.1-1.159-0.528-1.405-1.409-2.616-2.539-3.532zM592.384 231.936v44.032h-44.032v36.864l31.232 31.232 80.384-80.384-31.232-31.232zM0 239.616h416.256v-51.2h-416.256v51.2z" /> +<glyph unicode="" glyph-name="current-ref" d="M530.944 258.048l-70.144 71.68c-18.016 18.227-43.018 29.516-70.656 29.516s-52.64-11.288-70.647-29.506l-30.217 30.198c18.443 18.335 29.94 43.639 30.208 71.629-0.796 26.612-12.010 50.408-29.674 67.614l-70.677 71.701c-17.884 17.891-42.593 28.957-69.888 28.957s-52.004-11.066-69.888-28.957l-51.2-51.2c-17.891-17.884-28.957-42.593-28.957-69.888s11.066-52.004 28.957-69.888l74.24-69.632c18.016-18.227 43.018-29.516 70.656-29.516s52.64 11.288 70.647 29.506l30.217-30.198c-18.443-18.335-29.94-43.639-30.208-71.629-0.004-0.365-0.006-0.735-0.006-1.106 0-25.725 9.933-49.13 26.173-66.589l70.601-71.62c17.858-17.739 42.465-28.702 69.632-28.702s51.774 10.963 69.638 28.707l51.194 51.195c18.015 17.826 29.171 42.554 29.171 69.888s-11.156 52.062-29.163 69.88zM241.152 404.992c-11.264 11.264-20.992 24.576-38.4 24.576-18.097 0-32.768-14.671-32.768-32.768 0-17.408 13.312-27.136 24.576-38.4-5.932-6.614-14.505-10.756-24.046-10.756-0.186 0-0.372 0.002-0.558 0.005-0.198-0.006-0.465-0.009-0.732-0.009-8.862 0-16.902 3.518-22.8 9.233l-71.159 71.672c-5.852 5.917-9.468 14.056-9.468 23.040s3.615 17.123 9.471 23.043l51.197 51.197c6.111 5.71 14.344 9.216 23.396 9.216 0.055 0 0.11 0 0.164 0 0.003 0 0.017 0 0.031 0 9.18 0 17.492-3.717 23.513-9.728l69.632-72.192c6.346-6.071 10.291-14.607 10.291-24.064s-3.945-17.993-10.279-24.052zM493.568 188.416c-0.074-9.019-3.78-17.157-9.725-23.037l-51.203-51.203c-5.968-5.407-13.923-8.716-22.652-8.716-0.317 0-0.632 0.004-0.947 0.013-0.18-0.007-0.447-0.010-0.714-0.010-8.862 0-16.902 3.518-22.8 9.233l-69.111 72.184c-6.346 6.071-10.291 14.607-10.291 24.064s3.945 17.993 10.279 24.052c11.276-11.252 21.004-24.564 38.412-24.564 0.612-0.041 1.328-0.064 2.048-0.064 18.097 0 32.768 14.671 32.768 32.768 0 0.023 0 0.045 0 0.068 0 17.404-13.312 27.132-24.576 38.396 5.719 7.519 14.538 12.425 24.517 12.798 0.070 0.002 0.084 0.002 0.098 0.002 9.18 0 17.492-3.717 23.513-9.728l71.168-71.168c6.006-5.864 9.731-14.041 9.731-23.089 0-0.163-0.001-0.325-0.004-0.488zM1013.76 794.624l-51.2 51.2c-6.51 6.641-15.574 10.757-25.6 10.757s-19.090-4.116-25.594-10.751l-245.766-244.23-108.032 108.544c-6.51 6.641-15.574 10.757-25.6 10.757s-19.090-4.116-25.594-10.751l-51.206-51.206c-6.641-6.51-10.757-15.574-10.757-25.6s4.116-19.090 10.751-25.594l135.686-134.15 51.2-51.2c6.51-6.641 15.574-10.757 25.6-10.757s19.090 4.116 25.594 10.751l51.206 51.206 269.312 270.336c6.641 6.51 10.757 15.574 10.757 25.6s-4.116 19.090-10.751 25.594z" /> </font></defs></svg>
\ No newline at end of file diff --git a/app/assets/fonts/sBoiv/sboiv.ttf b/app/assets/fonts/sBoiv/sboiv.ttf Binary files differindex f2b70a1cf..3afce9d84 100644 --- a/app/assets/fonts/sBoiv/sboiv.ttf +++ b/app/assets/fonts/sBoiv/sboiv.ttf diff --git a/app/assets/fonts/sBoiv/sboiv.woff b/app/assets/fonts/sBoiv/sboiv.woff Binary files differindex 8ede810d8..645f63206 100644 --- a/app/assets/fonts/sBoiv/sboiv.woff +++ b/app/assets/fonts/sBoiv/sboiv.woff diff --git a/app/assets/stylesheets/components/_forms.sass b/app/assets/stylesheets/components/_forms.sass index 4dcc8842b..3b7a135d5 100644 --- a/app/assets/stylesheets/components/_forms.sass +++ b/app/assets/stylesheets/components/_forms.sass @@ -552,7 +552,7 @@ table, .table padding-right: $cbx-size-xs + 10 position: relative - > .fa:last-child + > .fa:last-child, > .sb:last-child position: absolute top: 50% right: 0 diff --git a/app/assets/stylesheets/components/_tables.sass b/app/assets/stylesheets/components/_tables.sass index 11ea06a61..ade9bacf4 100644 --- a/app/assets/stylesheets/components/_tables.sass +++ b/app/assets/stylesheets/components/_tables.sass @@ -53,9 +53,9 @@ > .td-block white-space: nowrap - > .fa:first-child + > .fa:first-child, > .sb:first-child margin-right: 0.5em - > .fa:last-child + > .fa:last-child, > .sb:last-child margin-left: 0.5em > a diff --git a/app/assets/stylesheets/typography/_fonts.sass b/app/assets/stylesheets/typography/_fonts.sass index c715fa2ab..0bb0fd2db 100644 --- a/app/assets/stylesheets/typography/_fonts.sass +++ b/app/assets/stylesheets/typography/_fonts.sass @@ -35,6 +35,6 @@ //-- sBoiv --// @font-face font-family: 'sboiv' - src: url(asset-path('sBoiv/sboiv.woff')) format('woff'), url(asset-path('sBoiv/sboiv.ttf')) format('ttf') + src: url(asset-path('sBoiv/sboiv.woff?5l6pxj')) format('woff'), url(asset-path('sBoiv/sboiv.ttf?5l6pxj')) format('ttf') font-weight: normal font-style: normal diff --git a/app/assets/stylesheets/typography/_sboiv.sass b/app/assets/stylesheets/typography/_sboiv.sass index 3e8eb2868..cd3af8ab7 100644 --- a/app/assets/stylesheets/typography/_sboiv.sass +++ b/app/assets/stylesheets/typography/_sboiv.sass @@ -53,5 +53,8 @@ .sb-update-vj:before content: '\e900' -.sb-chrono:before +.sb-preparing:before content: '\e901' + +.sb-current-ref:before + content: '\e902' diff --git a/app/views/workbenches/_filters.html.slim b/app/views/workbenches/_filters.html.slim index 2f96dba1e..7c5055963 100644 --- a/app/views/workbenches/_filters.html.slim +++ b/app/views/workbenches/_filters.html.slim @@ -15,7 +15,7 @@ = f.label @wbench_refs.human_attribute_name(:status), required: false, class: 'control-label' .form-group.checkbox_list = f.input :archived_at_not_null, label: ("<span>Conservé<span class='fa fa-archive'></span></span>").html_safe, as: :boolean, wrapper_html: { class: 'checkbox-wrapper' } - = f.input :archived_at_null, label: ("<span>En préparation<span class='fa fa-pencil'></span></span>").html_safe, as: :boolean, wrapper_html: { class: 'checkbox-wrapper' } + = f.input :archived_at_null, label: ("<span>En préparation<span class='sb sb-lg sb-preparing'></span></span>").html_safe, as: :boolean, wrapper_html: { class: 'checkbox-wrapper' } .form-group.togglable = f.label 'Organisation(s)', required: false, class: 'control-label' diff --git a/app/views/workbenches/show.html.slim b/app/views/workbenches/show.html.slim index 1bd86af16..2d13501b7 100644 --- a/app/views/workbenches/show.html.slim +++ b/app/views/workbenches/show.html.slim @@ -22,7 +22,7 @@ .col-lg-12 = table_builder @wbench_refs, { :name => 'name', - :status => Proc.new {|w| w.archived? ? ("<div class='td-block'><span class='fa fa-archive'></span><span>Conservé</span></div>").html_safe : ("<div class='td-block'><span class='fa fa-pencil'></span><span>En préparation</span></div>").html_safe}, + :status => Proc.new {|w| w.archived? ? ("<div class='td-block'><span class='fa fa-archive'></span><span>Conservé</span></div>").html_safe : ("<div class='td-block'><span class='sb sb-lg sb-preparing'></span><span>En préparation</span></div>").html_safe}, :organisation => Proc.new {|w| w.organisation.name}, :validity_period => Proc.new {|w| w.validity_period.nil? ? '-' : t('validity_range', debut: l(w.try(:validity_period).try(:begin), format: :short), end: l(w.try(:validity_period).try(:end), format: :short))}, :lines => Proc.new {|w| w.lines.count}, |
