fix(dashboard): fix the button group styles (akveo#19)

datho1801 · Jul 20, 2017 · 7781de5 · 7781de5
1 parent 0d107a2
commit 7781de5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/src/app/pages/dashboard/electricity/electricity.component.html b/src/app/pages/dashboard/electricity/electricity.component.html
@@ -41,17 +41,15 @@
         </div>
       </div>
 
-      <!--<div class="btn-group" ngbDropdown ngbDropdownToggle>-->
-        <!--<button type="button" class="btn btn-primary">Week</button>-->
-        <!--<button type="button" class="btn btn-primary">-->
-          <!--<span class="sr-only">Dropdown</span>-->
-        <!--</button>-->
-        <!--<ul class="dropdown-menu">-->
-          <!--<li class="dropdown-item">Week</li>-->
-          <!--<li class="dropdown-item">Month</li>-->
-          <!--<li class="dropdown-item">Year</li>-->
-        <!--</ul>-->
-      <!--</div>-->
+      <!-- <div class="btn-group" ngbDropdown>
+        <button type="button" class="btn btn-primary">Week</button>
+        <button type="button" class="btn btn-primary" ngbDropdownToggle></button>
+        <ul class="dropdown-menu">
+          <li class="dropdown-item">Week</li>
+          <li class="dropdown-item">Month</li>
+          <li class="dropdown-item">Year</li>
+        </ul>
+      </div> -->
 
     </div>
     <ngx-electricity-chart></ngx-electricity-chart>

diff --git a/src/app/pages/dashboard/player/player.component.html b/src/app/pages/dashboard/player/player.component.html
@@ -43,7 +43,7 @@
     </div>
   </div>
   <div class="player-playlist-commands">
-    <div class="btn-group btn-group-block btn-group-divider" data-toggle="buttons">
+    <div class="btn-group btn-group-full-width" data-toggle="buttons">
       <label class="btn btn-primary" [class.active]="playlistCommandsModel.left">
         <input type="checkbox" [(ngModel)]="playlistCommandsModel.left"/> <i class="ion-plus-round"></i>
       </label>

diff --git a/src/app/pages/dashboard/temperature/temperature.component.scss b/src/app/pages/dashboard/temperature/temperature.component.scss
@@ -98,10 +98,9 @@
     justify-content: center;
 
     border-color: nga-theme(form-control-border-color);
-    width: 4.5rem;
     height: 4.5rem;
     padding: 0;
-    margin: 0;
+    margin-bottom: 0;
 
     &.active {
       border-color: nga-theme(color-fg-highlight);

diff --git a/src/app/pages/ui-features/buttons/block-level-buttons/block-level-buttons.component.html b/src/app/pages/ui-features/buttons/block-level-buttons/block-level-buttons.component.html
@@ -4,7 +4,7 @@
     <div class="row block-level-buttons">
       <div class="col-md-12">
         <div class="btn-group btn-group-full-width" role="group">
-          <button type="button" class="btn btn-primary btn-group-icon btn-group-divider">
+          <button type="button" class="btn btn-primary btn-group-icon btn-group-divider btn-fixed">
             <i class="ion-ios-home-outline"></i>
           </button>
           <button type="button" class="btn btn-primary">Icon Block Button</button>