Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop

sails/src/assets/scripts/modules/student/views/collections.html

@@ -51,7 +51,7 @@
             <!-- /.picto-legend  -->
             <img
               src="/app/img/redcross.png"
-              class="disabled"
+              class="red-cross-visibility disabled"
               ng-if="studentPicto.attributes.status == 'disabled'"/>
             <img
               ng-src="{{studentPicto.picto.uri}}"
@@ -137,7 +137,7 @@
             <!-- /.picto-legend  -->
             <img
               src="/app/img/redcross.png"
-              class="disabled"
+              class="red-cross-visibility disabled"
               ng-if="studentPicto.attributes.status == 'disabled'"/>
             <img
               ng-src="{{studentPicto.picto.uri}}"
@@ -258,7 +258,7 @@
             <!-- /.picto-legend  -->
             <img
               src="/app/img/redcross.png"
-              class="disabled"
+              class="red-cross-visibility disabled"
               ng-if="studentPicto.attributes.status == 'disabled'"/>
             <img
               ng-src="{{studentPicto.picto.uri}}"

sails/src/assets/styles/main.css

@@ -525,6 +525,11 @@ textarea.editable{
 		justify-content: center;
 }
 
+/* Red cross in student collection */
+.red-cross-visibility {
+    z-index: 1;
+}
+
 /* In addpicto */
 #collections{
 	height: 300px;