* fixed merge changes for flipped panel

Vonage · Mar 29, 2017 · aee49a3 · aee49a3
1 parent 8d455d4
commit aee49a3
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 28 deletions.
diff --git a/dist/css/status_panel.css b/dist/css/status_panel.css
diff --git a/dist/css/status_panel.css.map b/dist/css/status_panel.css.map
diff --git a/dist/module.html b/dist/module.html
@@ -1,9 +1,10 @@
 <div class="status-panel">
   <div class="st-card-front">
-    <div class="ok-text">ok</div>
-    <div class="warning-text">warning</div>
-    <div class="fail-text">critical</div>
-    <div class="gray-text">No data</div>
+    <div class="ok-text">OK</div>
+    <div class="warning-text">Warning</div>
+    <div class="fail-text">Critical</div>
+    <div class="no-data-text">No data</div>
+	  <div class="disabled-text">Disabled</div>
   </div>
   <div class="st-card-back">
     <div ng-show="ctrl.duplicates">

diff --git a/dist/module.js.map b/dist/module.js.map
diff --git a/src/css/status_panel.scss b/src/css/status_panel.scss
@@ -16,7 +16,6 @@
 		font-size: 1.5rem;
 	}
 
-
 	.status-panel-annotation_row {
 		position: absolute;
 		top: 0;
@@ -25,9 +24,15 @@
 		font-size: 0.85rem;
 	}
 
-	.ok-text, .warning-text, .fail-text, .gray-text{
+	.ok-text, .warning-text, .fail-text, .no-data-text, .disabled-text{
 		display: none;
-		font-size: 3.5rem;
+		font-size: 2.5rem;
+	}
+
+	.status_name_row {
+		display: table-row;
+		height: 10%;
+		padding-top: 10px;
 	}
 }
 
@@ -52,14 +57,21 @@
   }
 }
 
-.gray-state {
+.no-data-state {
   background-color: gray;
-  .gray-text {
+  .no-data-text {
     display: block;
   }
 }
 
-.gray-state .st-card-back{
+.disabled-state {
+	background-color: gray;
+	.disabled-text {
+		display: block;
+	}
+}
+
+.no-data-state .st-card-back, .disabled-state .st-card-back{
   display: none;
 }
 
@@ -90,21 +102,20 @@
   transform: rotateY(-180deg);
 }
 
-.st-card.effect-hover:hover:not(.gray-state) .st-card-front, .st-card.effect-hover.flipped:not(.gray-state) .st-card-front {
+.st-card.effect-hover:hover:not(.no-data-state):not(.disabled-state) .st-card-front, .st-card.effect-hover.flipped:not(.no-data-state):not(.disabled-state) .st-card-front {
   -webkit-transform: rotateY(-180deg);
   transform: rotateY(-180deg);
 }
 
-.st-card.effect-hover:hover:not(.gray-state) .st-card-back, .st-card.effect-hover.flipped:not(.gray-state) .st-card-back {
+.st-card.effect-hover:hover:not(.no-data-state) .st-card-back, .st-card.effect-hover.flipped:not(.no-data-state) .st-card-back {
   -webkit-transform: rotateY(0);
   transform: rotateY(0);
 }
 
-.st-card:not(.effect-hover):not(.gray-state) .st-card-front {
+.st-card:not(.effect-hover):not(.no-data-state):not(.disabled-state) .st-card-front {
   display: none;
 }
 
-
 .no-data-state {
 	background-color: gray;
 }

diff --git a/src/module.html b/src/module.html
@@ -1,9 +1,10 @@
 <div class="status-panel">
   <div class="st-card-front">
-    <div class="ok-text">ok</div>
-    <div class="warning-text">warning</div>
-    <div class="fail-text">critical</div>
-    <div class="gray-text">No data</div>
+    <div class="ok-text">OK</div>
+    <div class="warning-text">Warning</div>
+    <div class="fail-text">Critical</div>
+    <div class="no-data-text">No data</div>
+	  <div class="disabled-text">Disabled</div>
   </div>
   <div class="st-card-back">
     <div ng-show="ctrl.duplicates">