Merge branch '4-cacher-la-ventilation' into 'dev'

Resolve "cacher la ventilation" Closes UnchartedBull#4 See merge request vs-projects/octodash!4
pciavald · Mar 21, 2021 · 586dc49 · 586dc49
2 parents d0d6dcb + 3d39729
commit 586dc49
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/app/printer-status/printer-status.component.html b/src/app/printer-status/printer-status.component.html
@@ -30,7 +30,7 @@
         /{{ printerStatus.heatbed.set }}<span class="unit">°C</span>
       </span>
     </td>
-    <td
+<!--    <td
       class="printer-status__value printer-status__value-3 printer-status__no-set-value"
       (click)="showQuickControlFan()"
       matRipple
@@ -41,6 +41,7 @@
         {{ printerStatus.fan }}<span class="printer-status__unit">%</span>
       </span>
     </td>
+    -->
   </tr>
 </table>
 <div class="quick-control" *ngIf="view !== QuickControlView.NONE" id="quickControl">
@@ -105,7 +106,7 @@
     >
       {{ this.heatbedTarget }}<span class="quick-control__controller-value-unit">°C</span>
     </div>
-    <div
+<!--    <div
       class="quick-control__controller-value"
       colspan="2"
       *ngIf="view === QuickControlView.FAN"
@@ -116,6 +117,7 @@
       {{ this.fanTarget }}
       <span class="quick-control__controller-value-unit">%</span>
     </div>
+    -->
     <div class="quick-control__controller-row">
       <div
         class="quick-control__controller-decrease"

diff --git a/src/app/settings/settings.component.html b/src/app/settings/settings.component.html
@@ -147,7 +147,7 @@
                   />
                 </td>
               </tr>
-              <tr>
+<!--              <tr>
                 <td style="width: 25.6vw; display: block">
                   <label for="defaultFanSpeed" class="settings__input-label">
                     Ventilateur
@@ -164,6 +164,7 @@
                   />
                 </td>
               </tr>
+              -->
             </table>
           </form>
           <span class="settings__heading-2">Filament</span>