Skip to content

Commit f04a1e8

Browse files
author
OpenShift Bot
authored
Merge pull request #1263 from rhamilto/issue-1262
Merged by openshift-bot
2 parents a5f801f + b105d92 commit f04a1e8

17 files changed

+64
-37
lines changed

app/styles/_core.less

+17-3
Original file line numberDiff line numberDiff line change
@@ -937,10 +937,24 @@ a.disabled-link {
937937
}
938938

939939
.actions-dropdown-kebab {
940-
.action-button;
941-
// Bigger click target for the dropdown icon, which is a narrow ellipsis
940+
color: @gray-darker;
942941
padding: 0 10px;
943-
vertical-align: middle;
942+
&:active,
943+
&:focus,
944+
&:hover {
945+
color: @link-color;
946+
}
947+
}
948+
949+
@media(max-width: @screen-xs-max) {
950+
.contains-actions > .dropdown {
951+
// add dropdown-pf-kebab styles
952+
.dropdown-kebab-pf;
953+
// adjust position of dropdown to account for larger kebab
954+
.dropdown-menu.dropdown-menu-right {
955+
right: -4px;
956+
}
957+
}
944958
}
945959

946960
.header-actions {

app/views/browse/_replica-set-actions.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<a href=""
77
class="dropdown-toggle actions-dropdown-kebab visible-xs-inline"
88
data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i><span class="sr-only">Actions</span></a>
9-
<ul class="dropdown-menu actions action-button">
9+
<ul class="dropdown-menu dropdown-menu-right actions action-button">
1010
<li ng-if="deployment && ({ group: 'extensions', resource: 'deployments' } | canI : 'update')">
1111
<a ng-href="project/{{project.metadata.name}}/attach-pvc?kind=Deployment&name={{deployment.metadata.name}}&group=extensions"
1212
role="button">Add Storage</a>

app/views/browse/_replication-controller-actions.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<a href=""
77
class="dropdown-toggle actions-dropdown-kebab visible-xs-inline"
88
data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i><span class="sr-only">Actions</span></a>
9-
<ul class="dropdown-menu actions action-button">
9+
<ul class="dropdown-menu dropdown-menu-right actions action-button">
1010
<li ng-if="deploymentConfigName && ('deploymentconfigs' | canI : 'update')">
1111
<a ng-href="project/{{project.metadata.name}}/attach-pvc?kind=DeploymentConfig&name={{deploymentConfigName}}"
1212
role="button">Add Storage</a>

app/views/browse/build-config.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ <h1 class="contains-actions">
3030
<a href=""
3131
class="dropdown-toggle actions-dropdown-kebab visible-xs-inline"
3232
data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i><span class="sr-only">Actions</span></a>
33-
<ul class="dropdown-menu actions action-button">
33+
<ul class="dropdown-menu dropdown-menu-right actions action-button">
3434
<li class="visible-xs-inline" ng-if="'buildconfigs/instantiate' | canI : 'create'">
3535
<a href="" role="button" ng-click="startBuild()">
3636
<span ng-if="!(buildConfig | isJenkinsPipelineStrategy)">

app/views/browse/build.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ <h1 class="contains-actions">
2929
<a href=""
3030
class="dropdown-toggle actions-dropdown-kebab visible-xs-inline"
3131
data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i><span class="sr-only">Actions</span></a>
32-
<ul class="dropdown-menu actions action-button">
32+
<ul class="dropdown-menu dropdown-menu-right actions action-button">
3333
<li ng-if="'buildconfigs' | canI : 'update'">
3434
<a ng-href="{{buildConfig | editResourceURL}}" role="button">
3535
<span ng-if="!(buildConfig | isJenkinsPipelineStrategy)">

app/views/browse/config-map.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ <h1 class="contains-actions">
2222
<a href=""
2323
class="dropdown-toggle actions-dropdown-kebab visible-xs-inline"
2424
data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i><span class="sr-only">Actions</span></a>
25-
<ul class="dropdown-menu actions action-link">
25+
<ul class="dropdown-menu dropdown-menu-right actions action-button">
2626
<li ng-if="'configmaps' | canI : 'update'">
2727
<a ng-href="{{configMap | editResourceURL}}" role="button">Edit</a>
2828
</li>

app/views/browse/deployment-config.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ <h1 class="contains-actions">
2828
<a href=""
2929
class="dropdown-toggle actions-dropdown-kebab visible-xs-inline"
3030
data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i><span class="sr-only">Actions</span></a>
31-
<ul class="dropdown-menu actions action-button">
31+
<ul class="dropdown-menu dropdown-menu-right actions action-button">
3232
<li class="visible-xs-inline" ng-class="{ disabled: !canDeploy() }" ng-if="'deploymentconfigs' | canI : 'update'">
3333
<a href=""
3434
role="button"

app/views/browse/deployment.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ <h1 class="contains-actions">
1818
<a href=""
1919
class="dropdown-toggle actions-dropdown-kebab visible-xs-inline"
2020
data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i><span class="sr-only">Actions</span></a>
21-
<ul class="dropdown-menu actions action-button">
21+
<ul class="dropdown-menu dropdown-menu-right actions action-button">
2222
<li ng-if="!deployment.spec.paused && !updatingPausedState && ({ group: 'extensions', resource: 'deployments' } | canI : 'update')">
2323
<a href="" ng-click="setPaused(true)" role="button">Pause Rollouts</a>
2424
</li>

app/views/browse/imagestream.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ <h1 class="contains-actions">
1919
<a href=""
2020
class="dropdown-toggle actions-dropdown-kebab visible-xs-inline"
2121
data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i><span class="sr-only">Actions</span></a>
22-
<ul class="dropdown-menu actions action-button">
22+
<ul class="dropdown-menu dropdown-menu-right actions action-button">
2323
<li ng-if="'imagestreams' | canI : 'update'">
2424
<a ng-href="{{imageStream | editYamlURL}}" role="button">Edit YAML</a>
2525
</li>

app/views/browse/persistent-volume-claim.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ <h1 class="contains-actions">
1919
<a href=""
2020
class="dropdown-toggle actions-dropdown-kebab visible-xs-inline"
2121
data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i><span class="sr-only">Actions</span></a>
22-
<ul class="dropdown-menu actions action-button">
22+
<ul class="dropdown-menu dropdown-menu-right actions action-button">
2323
<li ng-if="!pvc.spec.volumeName">
2424
<a ng-href="{{pvc | editYamlURL}}" role="button">Edit YAML</a>
2525
</li>

app/views/browse/pod.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ <h1 class="contains-actions">
1919
<a href=""
2020
class="dropdown-toggle actions-dropdown-kebab visible-xs-inline"
2121
data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i><span class="sr-only">Actions</span></a>
22-
<ul class="dropdown-menu actions action-button">
22+
<ul class="dropdown-menu dropdown-menu-right actions action-button">
2323
<li ng-if="(pod | annotation:'deploymentConfig') && ('deploymentconfigs' | canI : 'update')">
2424
<a ng-href="project/{{project.metadata.name}}/attach-pvc?kind=DeploymentConfig&name={{pod | annotation:'deploymentConfig'}}"
2525
role="button">Add Storage</a>

app/views/browse/route.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ <h1 class="contains-actions">
1919
<a href=""
2020
class="dropdown-toggle actions-dropdown-kebab visible-xs-inline"
2121
data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i><span class="sr-only">Actions</span></a>
22-
<ul class="dropdown-menu actions action-button">
22+
<ul class="dropdown-menu dropdown-menu-right actions action-button">
2323
<li ng-if="'routes' | canI : 'update'">
2424
<a ng-href="{{route | editResourceURL}}" role="button">Edit</a>
2525
</li>

app/views/browse/secret.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ <h1 class="contains-actions">
1818
<a href=""
1919
class="dropdown-toggle actions-dropdown-kebab visible-xs-inline"
2020
data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i><span class="sr-only">Actions</span></a>
21-
<ul class="dropdown-menu actions action-link">
21+
<ul class="dropdown-menu dropdown-menu-right actions action-button">
2222
<li ng-if="'secrets' | canI : 'update'">
2323
<a ng-href="{{secret | editYamlURL}}" role="button">Edit YAML</a>
2424
</li>

app/views/browse/service.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ <h1 class="contains-actions">
1919
<a href=""
2020
class="dropdown-toggle actions-dropdown-kebab visible-xs-inline"
2121
data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i><span class="sr-only">Actions</span></a>
22-
<ul class="dropdown-menu actions action-link">
22+
<ul class="dropdown-menu dropdown-menu-right actions action-button">
2323
<li ng-if="'routes' | canI : 'create'">
2424
<a ng-href="project/{{project.metadata.name}}/create-route?service={{service.metadata.name}}"
2525
role="button">Create Route</a>

app/views/browse/stateful-set.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h1>
3232
data-toggle="dropdown">
3333
<i class="fa fa-ellipsis-v"></i><span class="sr-only">Actions</span>
3434
</a>
35-
<ul class="dropdown-menu actions action-button">
35+
<ul class="dropdown-menu dropdown-menu-right actions action-button">
3636
<li ng-if="resourceGroupVersion | canI : 'update'">
3737
<a ng-href="{{statefulSet | editYamlURL}}" role="button">Edit YAML</a>
3838
</li>

dist/scripts/templates.js

+14-14
Original file line numberDiff line numberDiff line change
@@ -1495,7 +1495,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
14951495
"<span class=\"caret\"></span>\n" +
14961496
"</button>\n" +
14971497
"<a href=\"\" class=\"dropdown-toggle actions-dropdown-kebab visible-xs-inline\" data-toggle=\"dropdown\"><i class=\"fa fa-ellipsis-v\"></i><span class=\"sr-only\">Actions</span></a>\n" +
1498-
"<ul class=\"dropdown-menu actions action-button\">\n" +
1498+
"<ul class=\"dropdown-menu dropdown-menu-right actions action-button\">\n" +
14991499
"<li ng-if=\"deployment && ({ group: 'extensions', resource: 'deployments' } | canI : 'update')\">\n" +
15001500
"<a ng-href=\"project/{{project.metadata.name}}/attach-pvc?kind=Deployment&name={{deployment.metadata.name}}&group=extensions\" role=\"button\">Add Storage</a>\n" +
15011501
"</li>\n" +
@@ -1705,7 +1705,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
17051705
"<span class=\"caret\"></span>\n" +
17061706
"</button>\n" +
17071707
"<a href=\"\" class=\"dropdown-toggle actions-dropdown-kebab visible-xs-inline\" data-toggle=\"dropdown\"><i class=\"fa fa-ellipsis-v\"></i><span class=\"sr-only\">Actions</span></a>\n" +
1708-
"<ul class=\"dropdown-menu actions action-button\">\n" +
1708+
"<ul class=\"dropdown-menu dropdown-menu-right actions action-button\">\n" +
17091709
"<li ng-if=\"deploymentConfigName && ('deploymentconfigs' | canI : 'update')\">\n" +
17101710
"<a ng-href=\"project/{{project.metadata.name}}/attach-pvc?kind=DeploymentConfig&name={{deploymentConfigName}}\" role=\"button\">Add Storage</a>\n" +
17111711
"</li>\n" +
@@ -1766,7 +1766,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
17661766
"<span class=\"caret\" aria-hidden=\"true\"></span>\n" +
17671767
"</button>\n" +
17681768
"<a href=\"\" class=\"dropdown-toggle actions-dropdown-kebab visible-xs-inline\" data-toggle=\"dropdown\"><i class=\"fa fa-ellipsis-v\"></i><span class=\"sr-only\">Actions</span></a>\n" +
1769-
"<ul class=\"dropdown-menu actions action-button\">\n" +
1769+
"<ul class=\"dropdown-menu dropdown-menu-right actions action-button\">\n" +
17701770
"<li class=\"visible-xs-inline\" ng-if=\"'buildconfigs/instantiate' | canI : 'create'\">\n" +
17711771
"<a href=\"\" role=\"button\" ng-click=\"startBuild()\">\n" +
17721772
"<span ng-if=\"!(buildConfig | isJenkinsPipelineStrategy)\">\n" +
@@ -2191,7 +2191,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
21912191
"<span class=\"caret\" aria-hidden=\"true\"></span>\n" +
21922192
"</button>\n" +
21932193
"<a href=\"\" class=\"dropdown-toggle actions-dropdown-kebab visible-xs-inline\" data-toggle=\"dropdown\"><i class=\"fa fa-ellipsis-v\"></i><span class=\"sr-only\">Actions</span></a>\n" +
2194-
"<ul class=\"dropdown-menu actions action-button\">\n" +
2194+
"<ul class=\"dropdown-menu dropdown-menu-right actions action-button\">\n" +
21952195
"<li ng-if=\"'buildconfigs' | canI : 'update'\">\n" +
21962196
"<a ng-href=\"{{buildConfig | editResourceURL}}\" role=\"button\">\n" +
21972197
"<span ng-if=\"!(buildConfig | isJenkinsPipelineStrategy)\">\n" +
@@ -2300,7 +2300,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
23002300
"<span class=\"caret\"></span>\n" +
23012301
"</button>\n" +
23022302
"<a href=\"\" class=\"dropdown-toggle actions-dropdown-kebab visible-xs-inline\" data-toggle=\"dropdown\"><i class=\"fa fa-ellipsis-v\"></i><span class=\"sr-only\">Actions</span></a>\n" +
2303-
"<ul class=\"dropdown-menu actions action-link\">\n" +
2303+
"<ul class=\"dropdown-menu dropdown-menu-right actions action-button\">\n" +
23042304
"<li ng-if=\"'configmaps' | canI : 'update'\">\n" +
23052305
"<a ng-href=\"{{configMap | editResourceURL}}\" role=\"button\">Edit</a>\n" +
23062306
"</li>\n" +
@@ -2449,7 +2449,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
24492449
"<span class=\"caret\" aria-hidden=\"true\"></span>\n" +
24502450
"</button>\n" +
24512451
"<a href=\"\" class=\"dropdown-toggle actions-dropdown-kebab visible-xs-inline\" data-toggle=\"dropdown\"><i class=\"fa fa-ellipsis-v\"></i><span class=\"sr-only\">Actions</span></a>\n" +
2452-
"<ul class=\"dropdown-menu actions action-button\">\n" +
2452+
"<ul class=\"dropdown-menu dropdown-menu-right actions action-button\">\n" +
24532453
"<li class=\"visible-xs-inline\" ng-class=\"{ disabled: !canDeploy() }\" ng-if=\"'deploymentconfigs' | canI : 'update'\">\n" +
24542454
"<a href=\"\" role=\"button\" ng-attr-aria-disabled=\"{{canDeploy() ? undefined : 'true'}}\" ng-class=\"{ 'disabled-link': !canDeploy() }\" ng-click=\"startLatestDeployment()\">Deploy</a>\n" +
24552455
"</li>\n" +
@@ -2757,7 +2757,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
27572757
"<span class=\"caret\" aria-hidden=\"true\"></span>\n" +
27582758
"</button>\n" +
27592759
"<a href=\"\" class=\"dropdown-toggle actions-dropdown-kebab visible-xs-inline\" data-toggle=\"dropdown\"><i class=\"fa fa-ellipsis-v\"></i><span class=\"sr-only\">Actions</span></a>\n" +
2760-
"<ul class=\"dropdown-menu actions action-button\">\n" +
2760+
"<ul class=\"dropdown-menu dropdown-menu-right actions action-button\">\n" +
27612761
"<li ng-if=\"!deployment.spec.paused && !updatingPausedState && ({ group: 'extensions', resource: 'deployments' } | canI : 'update')\">\n" +
27622762
"<a href=\"\" ng-click=\"setPaused(true)\" role=\"button\">Pause Rollouts</a>\n" +
27632763
"</li>\n" +
@@ -3047,7 +3047,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
30473047
"<span class=\"caret\" aria-hidden=\"true\"></span>\n" +
30483048
"</button>\n" +
30493049
"<a href=\"\" class=\"dropdown-toggle actions-dropdown-kebab visible-xs-inline\" data-toggle=\"dropdown\"><i class=\"fa fa-ellipsis-v\"></i><span class=\"sr-only\">Actions</span></a>\n" +
3050-
"<ul class=\"dropdown-menu actions action-button\">\n" +
3050+
"<ul class=\"dropdown-menu dropdown-menu-right actions action-button\">\n" +
30513051
"<li ng-if=\"'imagestreams' | canI : 'update'\">\n" +
30523052
"<a ng-href=\"{{imageStream | editYamlURL}}\" role=\"button\">Edit YAML</a>\n" +
30533053
"</li>\n" +
@@ -3191,7 +3191,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
31913191
"<span class=\"caret\" aria-hidden=\"true\"></span>\n" +
31923192
"</button>\n" +
31933193
"<a href=\"\" class=\"dropdown-toggle actions-dropdown-kebab visible-xs-inline\" data-toggle=\"dropdown\"><i class=\"fa fa-ellipsis-v\"></i><span class=\"sr-only\">Actions</span></a>\n" +
3194-
"<ul class=\"dropdown-menu actions action-button\">\n" +
3194+
"<ul class=\"dropdown-menu dropdown-menu-right actions action-button\">\n" +
31953195
"<li ng-if=\"!pvc.spec.volumeName\">\n" +
31963196
"<a ng-href=\"{{pvc | editYamlURL}}\" role=\"button\">Edit YAML</a>\n" +
31973197
"</li>\n" +
@@ -3273,7 +3273,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
32733273
"<span class=\"caret\"></span>\n" +
32743274
"</button>\n" +
32753275
"<a href=\"\" class=\"dropdown-toggle actions-dropdown-kebab visible-xs-inline\" data-toggle=\"dropdown\"><i class=\"fa fa-ellipsis-v\"></i><span class=\"sr-only\">Actions</span></a>\n" +
3276-
"<ul class=\"dropdown-menu actions action-button\">\n" +
3276+
"<ul class=\"dropdown-menu dropdown-menu-right actions action-button\">\n" +
32773277
"<li ng-if=\"(pod | annotation:'deploymentConfig') && ('deploymentconfigs' | canI : 'update')\">\n" +
32783278
"<a ng-href=\"project/{{project.metadata.name}}/attach-pvc?kind=DeploymentConfig&name={{pod | annotation:'deploymentConfig'}}\" role=\"button\">Add Storage</a>\n" +
32793279
"</li>\n" +
@@ -3537,7 +3537,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
35373537
"<span class=\"caret\" aria-hidden=\"true\"></span>\n" +
35383538
"</button>\n" +
35393539
"<a href=\"\" class=\"dropdown-toggle actions-dropdown-kebab visible-xs-inline\" data-toggle=\"dropdown\"><i class=\"fa fa-ellipsis-v\"></i><span class=\"sr-only\">Actions</span></a>\n" +
3540-
"<ul class=\"dropdown-menu actions action-button\">\n" +
3540+
"<ul class=\"dropdown-menu dropdown-menu-right actions action-button\">\n" +
35413541
"<li ng-if=\"'routes' | canI : 'update'\">\n" +
35423542
"<a ng-href=\"{{route | editResourceURL}}\" role=\"button\">Edit</a>\n" +
35433543
"</li>\n" +
@@ -3852,7 +3852,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
38523852
"<span class=\"caret\"></span>\n" +
38533853
"</button>\n" +
38543854
"<a href=\"\" class=\"dropdown-toggle actions-dropdown-kebab visible-xs-inline\" data-toggle=\"dropdown\"><i class=\"fa fa-ellipsis-v\"></i><span class=\"sr-only\">Actions</span></a>\n" +
3855-
"<ul class=\"dropdown-menu actions action-link\">\n" +
3855+
"<ul class=\"dropdown-menu dropdown-menu-right actions action-button\">\n" +
38563856
"<li ng-if=\"'secrets' | canI : 'update'\">\n" +
38573857
"<a ng-href=\"{{secret | editYamlURL}}\" role=\"button\">Edit YAML</a>\n" +
38583858
"</li>\n" +
@@ -3931,7 +3931,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
39313931
"<span class=\"caret\"></span>\n" +
39323932
"</button>\n" +
39333933
"<a href=\"\" class=\"dropdown-toggle actions-dropdown-kebab visible-xs-inline\" data-toggle=\"dropdown\"><i class=\"fa fa-ellipsis-v\"></i><span class=\"sr-only\">Actions</span></a>\n" +
3934-
"<ul class=\"dropdown-menu actions action-link\">\n" +
3934+
"<ul class=\"dropdown-menu dropdown-menu-right actions action-button\">\n" +
39353935
"<li ng-if=\"'routes' | canI : 'create'\">\n" +
39363936
"<a ng-href=\"project/{{project.metadata.name}}/create-route?service={{service.metadata.name}}\" role=\"button\">Create Route</a>\n" +
39373937
"</li>\n" +
@@ -4050,7 +4050,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
40504050
"<a href=\"\" class=\"dropdown-toggle actions-dropdown-kebab visible-xs-inline\" data-toggle=\"dropdown\">\n" +
40514051
"<i class=\"fa fa-ellipsis-v\"></i><span class=\"sr-only\">Actions</span>\n" +
40524052
"</a>\n" +
4053-
"<ul class=\"dropdown-menu actions action-button\">\n" +
4053+
"<ul class=\"dropdown-menu dropdown-menu-right actions action-button\">\n" +
40544054
"<li ng-if=\"resourceGroupVersion | canI : 'update'\">\n" +
40554055
"<a ng-href=\"{{statefulSet | editYamlURL}}\" role=\"button\">Edit YAML</a>\n" +
40564056
"</li>\n" +

0 commit comments

Comments
 (0)