diff --git a/app/views/browse/build-config.html b/app/views/browse/build-config.html
index eb2374d131..94ec707ab0 100644
--- a/app/views/browse/build-config.html
+++ b/app/views/browse/build-config.html
@@ -178,7 +178,7 @@
No builds.
-
+
Build |
@@ -220,7 +220,7 @@ No builds.
-
+
diff --git a/app/views/browse/config-maps.html b/app/views/browse/config-maps.html
index b9c4c8569a..35d07bf619 100644
--- a/app/views/browse/config-maps.html
+++ b/app/views/browse/config-maps.html
@@ -28,7 +28,7 @@
Loading...
-
+
diff --git a/app/views/browse/deployment-config.html b/app/views/browse/deployment-config.html
index f2da35192f..39412b4e9c 100644
--- a/app/views/browse/deployment-config.html
+++ b/app/views/browse/deployment-config.html
@@ -129,7 +129,7 @@
-
+
Deployment |
diff --git a/app/views/browse/deployment.html b/app/views/browse/deployment.html
index ceaef03a83..13a60372ec 100644
--- a/app/views/browse/deployment.html
+++ b/app/views/browse/deployment.html
@@ -89,7 +89,7 @@
-
+
diff --git a/app/views/browse/routes.html b/app/views/browse/routes.html
index 5210133c89..00a900bc73 100644
--- a/app/views/browse/routes.html
+++ b/app/views/browse/routes.html
@@ -26,7 +26,7 @@
-
+
diff --git a/app/views/browse/stateful-sets.html b/app/views/browse/stateful-sets.html
index 12c97c3507..1744e6a44b 100644
--- a/app/views/browse/stateful-sets.html
+++ b/app/views/browse/stateful-sets.html
@@ -28,7 +28,7 @@
Loading...
-
+
diff --git a/app/views/builds.html b/app/views/builds.html
index 0f0c1f4cf9..a47c2ea8a6 100644
--- a/app/views/builds.html
+++ b/app/views/builds.html
@@ -23,7 +23,7 @@
-
+
diff --git a/app/views/deployments.html b/app/views/deployments.html
index 031f936c13..1a3654896d 100644
--- a/app/views/deployments.html
+++ b/app/views/deployments.html
@@ -24,7 +24,7 @@
Deployment Configurations
-
+
@@ -110,7 +110,7 @@ Deployment Co
Deployments
-
+
@@ -155,7 +155,7 @@ Deployments
Replica Sets
-
+
@@ -183,7 +183,7 @@ Replica Sets
Other Replication Controllers
-
+
diff --git a/app/views/directives/events.html b/app/views/directives/events.html
index 91de4e42d5..bb4c73ae7b 100644
--- a/app/views/directives/events.html
+++ b/app/views/directives/events.html
@@ -34,7 +34,7 @@
-
+
Time |
diff --git a/app/views/directives/pods-table.html b/app/views/directives/pods-table.html
index ef6c293a79..f1323ff1ef 100644
--- a/app/views/directives/pods-table.html
+++ b/app/views/directives/pods-table.html
@@ -1,4 +1,4 @@
-
+
diff --git a/app/views/directives/traffic-table.html b/app/views/directives/traffic-table.html
index ef83a789f5..d61447d105 100644
--- a/app/views/directives/traffic-table.html
+++ b/app/views/directives/traffic-table.html
@@ -1,5 +1,5 @@
-
+
{{(customNameHeader || 'Route') | translate}} / Node Port |
diff --git a/app/views/images.html b/app/views/images.html
index 2cf72e02c0..cace78a18d 100644
--- a/app/views/images.html
+++ b/app/views/images.html
@@ -23,7 +23,7 @@
-
+
diff --git a/app/views/secrets.html b/app/views/secrets.html
index 345c50d6b3..5c5cdbb477 100644
--- a/app/views/secrets.html
+++ b/app/views/secrets.html
@@ -22,7 +22,7 @@
Loading...
-
+
diff --git a/app/views/services.html b/app/views/services.html
index 6479c5bf69..9ff88a580a 100644
--- a/app/views/services.html
+++ b/app/views/services.html
@@ -23,7 +23,7 @@
-
+
diff --git a/app/views/storage.html b/app/views/storage.html
index 922b7d78e5..67ac59f514 100644
--- a/app/views/storage.html
+++ b/app/views/storage.html
@@ -34,7 +34,7 @@ Persistent Volume Claims
Create Storage
-
+
diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
index 8d43f093f5..d518e132d2 100644
--- a/dist/scripts/templates.js
+++ b/dist/scripts/templates.js
@@ -1851,7 +1851,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"\n" +
"\n" +
"\n" +
- "\n" +
+ "\n" +
"\n" +
"\n" +
"Build | \n" +
@@ -1893,8 +1893,13 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"
\n" +
"\n" +
"
\n" +
+<<<<<<< 96de671426db59fb68bd3b8af93d73f5d6503d3e
"
\n" +
"{{emptyMessage|translate}} |
\n" +
+=======
+ "\n" +
+ "{{emptyMessage}} |
\n" +
+>>>>>>> Removing table-hover from tables to address inconsistency in hover color
"
\n" +
"\n" +
"\n" +
@@ -2334,7 +2339,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"\n" +
"
Loading...
\n" +
"
\n" +
- "
\n" +
+ "\n" +
"\n" +
"\n" +
"\n" +
@@ -2481,7 +2486,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"\n" +
"\n" +
"\n" +
- "\n" +
+ "\n" +
"\n" +
"\n" +
"Deployment | \n" +
@@ -2805,8 +2810,12 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"\n" +
"\n" +
"\n" +
+<<<<<<< 96de671426db59fb68bd3b8af93d73f5d6503d3e
>>>>>>> Label Filter for Kubernetes Deployment History Tab
"\n" +
+=======
+ "\n" +
+>>>>>>> Removing table-hover from tables to address inconsistency in hover color
"\n" +
"\n" +
"\n" +
@@ -3721,7 +3730,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"\n" +
"\n" +
"
\n" +
- "
\n" +
+ "\n" +
"\n" +
"\n" +
"\n" +
@@ -4141,7 +4150,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"Loading...
\n" +
"\n" +
"
\n" +
- "
\n" +
+ "\n" +
"\n" +
"\n" +
"\n" +
@@ -4206,7 +4215,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"\n" +
"\n" +
"
\n" +
- "
\n" +
+ "\n" +
"\n" +
"\n" +
"\n" +
@@ -5282,8 +5291,13 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"\n" +
"\n" +
"
\n" +
+<<<<<<< 96de671426db59fb68bd3b8af93d73f5d6503d3e
"
Deployment Configurations
\n" +
"
\n" +
+=======
+ "Deployment Configurations
\n" +
+ "\n" +
+>>>>>>> Removing table-hover from tables to address inconsistency in hover color
"\n" +
"\n" +
"\n" +
@@ -5368,8 +5382,13 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"\n" +
"
\n" +
"\n" +
+<<<<<<< 96de671426db59fb68bd3b8af93d73f5d6503d3e
"
Deployments
\n" +
"
\n" +
+=======
+ "Deployments
\n" +
+ "\n" +
+>>>>>>> Removing table-hover from tables to address inconsistency in hover color
"\n" +
"\n" +
"\n" +
@@ -5414,7 +5433,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"\n" +
"\n" +
"
Replica Sets
\n" +
- "
\n" +
+ "\n" +
"\n" +
"\n" +
"\n" +
@@ -5441,8 +5460,13 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"
\n" +
"\n" +
" 0\" id=\"replica-controllers\">\n" +
+<<<<<<< 96de671426db59fb68bd3b8af93d73f5d6503d3e
"
Other Replication Controllers
\n" +
"
\n" +
+=======
+ "Other Replication Controllers
\n" +
+ "\n" +
+>>>>>>> Removing table-hover from tables to address inconsistency in hover color
"\n" +
"\n" +
"\n" +
@@ -7042,7 +7066,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"\n" +
"\n" +
"\n" +
- "\n" +
+ "\n" +
"\n" +
"\n" +
"Time | \n" +
@@ -9033,7 +9057,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
$templateCache.put('views/directives/pods-table.html',
- "\n" +
+ "\n" +
"\n" +
"\n" +
"\n" +
@@ -9289,7 +9313,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
$templateCache.put('views/directives/traffic-table.html',
- " \n" +
+ " \n" +
"\n" +
"\n" +
"{{(customNameHeader || 'Route') | translate}} / Node Port | \n" +
@@ -10575,7 +10599,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"\n" +
"\n" +
"
\n" +
- "
\n" +
+ "\n" +
"\n" +
"\n" +
"\n" +
@@ -13533,7 +13557,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"Loading...
\n" +
"\n" +
"
\n" +
- "
\n" +
+ "\n" +
"\n" +
"\n" +
"\n" +
@@ -13598,7 +13622,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"\n" +
"\n" +
"
\n" +
- "
\n" +
+ "\n" +
"\n" +
"\n" +
"\n" +
@@ -13741,7 +13765,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"Create Storage\n" +
"\n" +
"\n" +
- "\n" +
+ "\n" +
"\n" +
"\n" +
"\n" +