Merge remote-tracking branch 'origin/develop' into develop

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

@@ -78,7 +78,7 @@
               <thead class="thead-default">
                 <tr>
                   <th></th>
-                  <th class="text-center" translate>instructions</th>
+                  <th class="text-left" translate>instructions</th>
                   <th class="text-center" translate>instruction_begin</th>
                   <th class="text-center" translate>instruction_end</th>
                   <th class="text-center" translate>state</th>
@@ -87,10 +87,10 @@
               </thead>
               <tbody>
                 <tr ng-repeat="i in m.instructions">
-                  <td>
+                  <td class="td-beige">
                     <a ng-click="open_instruction(i)"><span class="glyphicon glyphicon-file text_medium" aria-hidden="true"></span></a>
                   </td>
-                  <td>
+                  <td class="td-beige">
                     <dl>
                       <dt translate>instruction</dt>
                       <dd><div class="instruction-data"><input class="editable" type="text" ng-model="i.name" ng-blur="update_instruction(i)" placeholder="{{ 'instruction_name' | translate }}"></div></dd>
@@ -98,21 +98,21 @@
                       <dd ng-if="!minimalMode"><div class="instruction-data"><textarea class="elipsis editable" type="text" ng-model="i.objective" ng-blur="update_instruction(i)" rows="3" placeholder="{{ 'instruction_objetive' | translate }}"></textarea></div></dd>
                     </dl>
                   </td>
-                  <td>
+                  <td class="td-beige">
                   	<div class="text-center">
                   		<span class="color_blue">{{ i.begin | date:"dd-MM-yyyy" }}</span>
                   		<br>
                   		{{ i.begin | date:"HH:mm:ss" }}
                   	</div>
                   </td>
-                  <td>
+                  <td class="td-beige">
                   	<div class="text-center" ng-class="{ color_green : i.id == m.last_ins }">
                   		<span ng-class="{ color_green : i.id == m.last_ins, color_blue : i.id != m.last_ins }">{{ i.end | date:"dd-MM-yyyy" }}</span>
                   		<br>
                   		{{ i.end | date:"HH:mm:ss" }}
                   	</div>
                   </td>
-                  <td class="text-center">
+                  <td class="td-beige text-center">
                     <span class="pointer text_medium glyphicon" ng-class="{
                     	'color_green': i.status == 'finished',
                     	'glyphicon-check': i.status == 'finished',
@@ -121,7 +121,7 @@
                     	'glyphicon-minus': i.status == null
                     }" aria-hidden="true" popover="{{(i.status || 'nobegin') | translate}}" popover-trigger="mouseenter" ng-click="change_status(i)"></span>
                   </td>
-                  <td>
+                  <td class="td-beige">
                     <a confirmed-click="delete_instruction(i);" ng-confirm-click="{{ 'confirmation' | translate}}" class="delete_instruction" popover="{{ 'delete' | translate }}" popover-trigger="mouseenter" style="text-decoration:none">
                       <span class="text_medium color_red glyphicon glyphicon-remove-circle options-button" aria-hidden="true"></span>
                     </a>

sails/src/assets/scripts/modules/supervisor/views/instructions.html

@@ -56,13 +56,13 @@
 	      <table class="table">
           <thead class="thead-default">
   	        <tr>
-  	          <th class="text-center" translate>instructions</th>
+  	          <th class="text-left" translate>instructions</th>
   	          <th></th>
   	        </tr>
           </thead>
           <tbody>
   	        <tr ng-repeat="i in m.metainstructions">
-              <td>
+              <td class="td-beige">
                 <dl>
                   <dt translate>instruction</dt>
                   <dd><div class="instruction-data"><input class="editable" type="text" ng-model="i.name" ng-blur="update_instruction(i)" placeholder="{{ 'instruction_name' | translate }}"></div></dd>
@@ -70,7 +70,7 @@
                   <dd ng-if="!minimalMode"><div class="instruction-data"><textarea class="elipsis editable" type="text" ng-model="i.objective" ng-blur="update_instruction(i)" rows="3" placeholder="{{ 'instruction_objetive' | translate }}"></textarea></div></dd>
                 </dl>
               </td>
-  	          <td>
+  	          <td class="td-beige">
                 <a confirmed-click="delete_instruction(i);" ng-confirm-click="{{ 'confirmation' | translate}}" class="delete_instruction" popover="{{ 'delete' | translate }}" popover-trigger="mouseenter" style="text-decoration:none">
                   <span class="text_medium color_red glyphicon glyphicon-remove-circle options-button" aria-hidden="true"></span>
                 </a>

sails/src/assets/styles/main.css

@@ -263,25 +263,29 @@ tr:hover .ops a{
  	padding-top: 2px;
  }
 
- .method-header {
-   background-color: #F5F5F3;
-   padding: 5px;
-   height: 52px;
-   margin-bottom: 5px;
-   border-top-left-radius: 5px;
-   border-top-right-radius: 5px;
-   border-bottom: 3px solid #DDDDDD;
- }
-
  .method {
    margin-bottom: 30px;
    border-radius: 5px;
-   border: 1px solid #DDDDDD;
+   border: 2px solid beige;
  }
 
-.thead-default {
-    background-color: #f5f5f3;
-}
+ .method-header {
+	background-color: beige;
+	padding-top: 3px;
+	height: 52px;
+	border-top-left-radius: 5px;
+	border-top-right-radius: 5px;
+	border-bottom: 3px solid #eaeac7;
+ }
+
+ .thead-default {
+   background-color: rgba(245, 245, 220, 0.3);
+   border-bottom: 3px solid rgba(234, 234, 199, 0.3);
+ }
+
+ .td-beige{
+   border-top: 1px solid beige !important;
+ }
 
 .instruction-data {
     width: 700px;
@@ -337,6 +341,10 @@ textarea.editable{
 	max-width: 100%;
 }
 
+.editable.lead{
+	border: 1px solid transparent !important;
+}
+
 /* Panel Colecciones */
 
 .drag { opacity: 0.5; }