Merge branch 'master' of https://framagit.org/Chill-project/Chill-Main

Resources/public/sass/_custom.scss

@@ -4,7 +4,6 @@
 @import 'custom/fonts';
 @import 'custom/timeline';
 @import 'custom/mixins/entity';
-@import 'custom/activity';
 @import 'custom/report';
 @import 'custom/person';
 @import 'custom/pagination';

Resources/public/sass/contrib/fontawesome/_path.scss

@@ -3,12 +3,12 @@
 
 @font-face {
   font-family: 'FontAwesome';
-  src: url('#{$fa-font-path}/fontawesome-webfont.eot?v=#{$fa-version}');
-  src: url('#{$fa-font-path}/fontawesome-webfont.eot?#iefix&v=#{$fa-version}') format('embedded-opentype'),
-    url('#{$fa-font-path}/fontawesome-webfont.woff2?v=#{$fa-version}') format('woff2'),
-    url('#{$fa-font-path}/fontawesome-webfont.woff?v=#{$fa-version}') format('woff'),
-    url('#{$fa-font-path}/fontawesome-webfont.ttf?v=#{$fa-version}') format('truetype'),
-    url('#{$fa-font-path}/fontawesome-webfont.svg?v=#{$fa-version}#fontawesomeregular') format('svg');
+  src: url('./../../../fonts/fontawesome-webfont.eot?v=#{$fa-version}');
+  src: url('./../../../fonts/fontawesome-webfont.eot?#iefix&v=#{$fa-version}') format('embedded-opentype'),
+       url('./../../../fonts/fontawesome-webfont.woff2?v=#{$fa-version}') format('woff2'),
+    url('./../../../fonts/fontawesome-webfont.woff?v=#{$fa-version}') format('woff'),
+    url('./../../../fonts/fontawesome-webfont.ttf?v=#{$fa-version}') format('truetype'),
+    url('./../../../fonts/fontawesome-webfont.svg?v=#{$fa-version}#fontawesomeregular') format('svg');
 //  src: url('#{$fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts
   font-weight: normal;
   font-style: normal;

Resources/public/sass/custom/_activity.scss

@@ -1,7 +0,0 @@
-span.entity.entity-activity.activity-reason {
-    @include entity($chill-pink, white);
-}
-
-.activity {
-    color: $chill-green;
-}

Resources/public/sass/custom/_record_actions.scss

@@ -10,6 +10,7 @@ ul.record_actions, ul.record_actions_column {
     display: flex;
     justify-content: flex-end;
     padding: 0.5em 0;
+    flex-wrap: wrap-reverse;
 
     li {
         display: inline-block;

Resources/public/sass/custom/mixins/entity.scss

@@ -1,6 +1,6 @@
 @mixin entity($background-color, $color: white) {
     font-variant: small-caps;
-    display: inline;
+    display: inline-block;
     padding: .2em .6em .3em;
     font-size: 88%;
     font-weight: bold;
@@ -11,5 +11,6 @@
     border-radius: .25em;
     color: $color;
     background-color: $background-color;
+    margin: 0.5em;
 }
 

Resources/public/sass/custom/modules/_buttons.scss

@@ -1,7 +1,7 @@
 .sc-button {
     margin-bottom: 0.5rem;
     
-    &.bt-submit, &.bt-save, &.bt-create, &.bt-new {
+    &.bt-submit, &.bt-save, &.bt-create, &.bt-new, &.bt-duplicate {
         @include button($green, $white);
     }
 
@@ -19,6 +19,7 @@
 
     &:not(.change-icon) {
 
+        // icons using font-awesome "old way"
         &.bt-create::before,
         &.bt-save::before,
         &.bt-new::before,
@@ -31,6 +32,14 @@
             font: normal normal normal 14px/1 FontAwesome;
             margin-right: 0.5em;
         }
+        
+        // icons using font-awesome "new svg way"
+        &.bt-duplicate::before {
+            display: inline-block;
+            width: 1em;
+            margin-right: 0.5em;
+            vertical-align: middle;
+        }
 
         &.bt-save::before {
             // add a floppy
@@ -60,6 +69,10 @@
         &.bt-show::before, &.bt-view::before {
             content: "";
         }
+        
+        &.bt-duplicate::before {
+            content: url("./copy-solid.svg");
+        }
     }
 
     > i.fa {

Resources/public/sass/custom/modules/copy-solid.svg

@@ -0,0 +1,4 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="copy" class="svg-inline--fa fa-copy fa-w-14" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512">
+    <!-- adapted from original work obtained from font-awesome CC-BY 4.0 International - https://fontawesome.com/license Last updated on July 12, 2018 -->
+    <path fill="white" d="M320 448v40c0 13.255-10.745 24-24 24H24c-13.255 0-24-10.745-24-24V120c0-13.255 10.745-24 24-24h72v296c0 30.879 25.121 56 56 56h168zm0-344V0H152c-13.255 0-24 10.745-24 24v368c0 13.255 10.745 24 24 24h272c13.255 0 24-10.745 24-24V128H344c-13.2 0-24-10.8-24-24zm120.971-31.029L375.029 7.029A24 24 0 0 0 358.059 0H352v96h96v-6.059a24 24 0 0 0-7.029-16.97z"></path>
+</svg>

Resources/public/sass/modules/_forms.scss

@@ -25,10 +25,17 @@ label {
    abbr {
       display: none;
    }
+   
+    // mark the label for empty placeholder
+    &[for$="_placeholder"] {
+       font-style: italic;
+    }
 }
 
 .inline-choice {
    white-space:nowrap;
+   display: inline-block;
+   
    label {
       white-space:normal;
       display: inline;
@@ -38,6 +45,11 @@ label {
    }
 }
 
+div.choice-widget-expanded  {
+    margin-top: 0.5em;
+    margin-bottom: 0.5em;
+}
+
 textarea,
 //input,
 #{$all-text-inputs},