Skip to content

Removing layout.attrs to reduce dependencies #2860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 1, 2018
Merged

Removing layout.attrs to reduce dependencies #2860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions app/components/osc-webhook-triggers/osc-webhook-triggers.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
search-enabled="false"
title="Select a webhook type"
ng-class="{'has-warning': trigger.isDuplicate }"
focus-on="focus-index-{{$index}}"
flex>
focus-on="focus-index-{{$index}}">
<ui-select-match placeholder="Webhook type">
{{ $select.selected.label }}
</ui-select-match>
Expand All @@ -29,8 +28,7 @@
title="Select a webhook secret reference"
ng-class="{'has-error': $ctrl.secretsForm[secretFieldName].$invalid && $ctrl.secretsForm[secretFieldName].$touched}"
ng-disabled="!trigger.data.type"
ng-required="trigger.data.type"
flex>
ng-required="trigger.data.type">
<ui-select-match placeholder="Webhook secret reference">
{{ $select.selected.metadata.name }}
</ui-select-match>
Expand Down
1 change: 0 additions & 1 deletion app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
<link rel="stylesheet" href="bower_components/xterm.js/dist/xterm.css" />
<link rel="stylesheet" href="bower_components/kubernetes-container-terminal/dist/container-terminal.css" />
<link rel="stylesheet" href="bower_components/registry-image-widgets/dist/image-widgets.css" />
<link rel="stylesheet" href="bower_components/layout.attrs/dist/layout.attrs.css" />
<link rel="stylesheet" href="bower_components/ng-sortable/dist/ng-sortable.css" />
<link rel="stylesheet" href="bower_components/ui-select/dist/select.css" />
<link rel="stylesheet" href="bower_components/hopscotch/dist/css/hopscotch.css" />
Expand Down
18 changes: 0 additions & 18 deletions app/scripts/directives/actionChip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,4 @@
'use strict';
// <div>
// <div>Chips</div>
// <div row mobile="column">
// <action-chip
// key="'1'"></action-chip>
// <action-chip
// key="'2'"
// value="'foo'"></action-chip>
// <action-chip
// key="'3'"
// action="foo('shizzle', 'pop')"></action-chip>
// <action-chip
// key="'4'"
// value="'bar'"
// icon="'fa fa-check'"
// action="foo('shizzle', 'pop2')"></action-chip>
// </div>
// </div>
angular
.module('openshiftConsole')
.directive('actionChip', function() {
Expand Down
5 changes: 5 additions & 0 deletions app/styles/_catalog.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
@bind-service-page-height: 310px;

// old catalog page (/create)
.filter-catalog {
width: 100%;
}

.landing {
h1, .nav-tabs {
margin-bottom: 0 !important;
Expand Down
18 changes: 14 additions & 4 deletions app/styles/_components.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,9 @@
margin-top: 15px;
}
.pod-template {
// so that .word-break() on children works
[flex] {
min-width: 0;
Copy link
Member

@sg00dwin sg00dwin Feb 28, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wouldn't we need to keep min-width: 0 on .pod-template?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep. It moved to line 53.

}
.icon-row {
border-left: 3px solid @gray-lighter;
display: flex;
padding: 2px 0 0 2px;
}
.fa,
Expand All @@ -51,6 +48,10 @@
.pod-template-build {
.word-break();
}
.pod-template-detail {
flex: 1 1 0%;
min-width: 0; // so that .word-break() on children works
}
.pod-template-key {
font-weight: 600;
}
Expand Down Expand Up @@ -155,10 +156,19 @@ pod-donut[mini] {
}

.deployment-donut {
display: flex;
flex-direction: column;
justify-content: center;
.browse-deployment-donut & {
align-items: center;
}
.deployment-donut-column {
display: flex;
flex-direction: column;
}
.deployment-donut-row {
display: flex;
}
.scaling-controls {
justify-content: center;
font-size: 24px;
Expand Down
41 changes: 36 additions & 5 deletions app/styles/_core.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,12 @@ registry-imagestream-meta dt:after {
margin: 0 20px;
}

.quota-charts {
display: flex;
flex-wrap: wrap;
justify-content: center;
}

.route-service-bar-chart {
.service-name,
.service-weight {
Expand Down Expand Up @@ -1097,17 +1103,22 @@ a.disabled-link {
}

.status {
display: flex;
min-width: 130px;
// when status-icon is child of .status, add margin-right to the icon
// because the space resulting from display: inline-block collapses
status-icon {
margin-right: 3px;
}
}

.status-detail {
flex: 1 1 0%;
}

build-counts,
notification-icon,
status-icon {
// when status-icon is child of [row], add margin-right to the icon
// because the space resulting from display: inline-block collapses
[row] > & {
margin-right: 3px;
}
// so that status-icons have a fixed width (like .fa-fw, but better sized)
// this ensures when the icons change, the text that follows doesn't shift
.fa, .pficon {
Expand Down Expand Up @@ -1144,6 +1155,7 @@ pre.clipped {
}

.k8s-label {
display: flex;
margin-right: 5px;
// A bit more space below the actions button.
margin-top: 3px;
Expand All @@ -1153,6 +1165,7 @@ pre.clipped {
white-space: normal;
}
.label-pair {
display: flex;
margin-bottom: 2px;
max-width: 100%; // needed to enable truncation within table, but still allow inline display if room is available
.label {
Expand Down Expand Up @@ -1209,6 +1222,11 @@ pre.clipped {
}
}

.k8s-labels {
display: flex;
flex-wrap: wrap;
}

.action-divider {
color: @gray-light;
padding: 0 6px;
Expand Down Expand Up @@ -1325,3 +1343,16 @@ pre.clipped {
}
}
}

.init-container-status-detail {
flex: 1 1 0%;
}

.init-container-status,
.ui-select-choices-flex {
display: flex;
}

.ui-select-choices-flex {
justify-content: space-between;
}
3 changes: 3 additions & 0 deletions app/styles/_log.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
.h2();
.text-center();
}
log-viewer {
flex: 1 1 0%;
}
}
.log-title {
margin-top: 0;
Expand Down
117 changes: 33 additions & 84 deletions app/styles/_membership.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,88 +1,57 @@
.membership {
.action-set {
display: flex;
flex-direction: column;
justify-content: space-between;
width: 100%;
@media(min-width: @screen-sm-min) {
flex-wrap: nowrap;
}
@media(min-width: @screen-md-min) {
flex-direction: row;
flex: 1 1 auto;
@media(min-width: @screen-xs-min) {
max-width: 65%;
.container-pf-nav-pf-vertical.collapsed-nav & {
max-width: 60%;
}
}
}
.content-pane {
width: 100%;
.add-role-to {
margin-left: -1px;
}
.col-add-role {
width: 100%;
@media(min-width: @screen-xs-min) {
min-width: 245px;
width: auto;
}
.col-add-role-inputs {
display: flex;
}
.col-heading {
border-bottom: 1px solid #ededed;
display: none;
@media(min-width: @screen-xs-min) {
display: flex;
margin: 0;
}
}
.col-name {
align-items: center;
display: flex;
flex: 1 1 auto;
padding: 0 0 10px 0;
.word-break-all;
@media(min-width: @screen-xs-min) {
max-width: 30%;
max-width: 35%;
padding: 0 5px 0 0;
width: 100%;
.container-pf-nav-pf-vertical.collapsed-nav & {
max-width: 40%;
}
padding: 0 5px 0 0;
input {
max-width: 225px;
}
}
&.half-width {
max-width: 50%;
}
.word-break-all;
padding: 0 0px 10px 0;
width: 100%;
.new-project {
margin-top: 2px;
}
}
.col-roles {
display: flex;
flex-wrap: wrap;
padding-bottom: 5px;
@media(min-width: @screen-md-min) {
padding: 0;
}
}
.content-serviceaccount .form-new-role .col-roles {
display: block;
}
.form-new-role {
.col-roles {
display: none;
}
@media(min-width: @screen-md-min) {
.action-set {
flex-direction: column;
.col-add-role {
align-self: flex-end;
}
}
}
}
.input-name {
margin-bottom: 5px;
}
.item-row {
border-bottom: 1px solid #ededed;
padding: 10px 10px 10px 5px;
display: flex;
flex-direction: column;
padding: 10px 0;
@media(min-width: @screen-xs-min) {
flex-direction: row;
&.highlight-hover:hover {
background-color: #fafafa;
}
Expand All @@ -91,51 +60,31 @@
.membership-empty {
margin-top: 20px;
}
.show-hidden-roles .action-set {
display: flex;
flex-direction: row;
justify-content: flex-end;
}
.select-project {
width: 150px;
.show-hidden-roles {
text-align: right;
}
.select-role {
flex: 1 1 auto;
.active {
small {
color: #c0e0f0;
}
}
small {
color: #999;
display: inline-block;
line-height: 1.4;
white-space: pre-line;
}
.active {
small {
color: #c0e0f0;
}
}
}
.service-account {
@media(max-width: @screen-sm-max) {
flex-direction: column; // stack inputs because lack of horizontal space
}
.select-role {
padding-bottom: 5px;
width: auto;
@media(min-width: @screen-md-min) {
width: 150px;
}
flex-wrap: wrap;
margin-bottom: -5px;
.select-project,
.select-service-account {
margin-bottom: 5px;
}
}
// FIXME (bpeterse): to update in layout.attrs & eliminate the workaround here
// fix for collapse of flex items in IE
// https://github.com/philipwalton/flexbugs#1-minimum-content-sizing-of-flex-items-not-honored
[flex-collapse-fix],
[flex], // fixes ie flex-direction: column collapse issue
.col-add-role,
.col-heading,
.col-name,
.item-row {
flex-shrink: 0;
flex-basis: auto;
}
}
// allow for taller select due to role help text
.ui-select-bootstrap > .ui-select-choices {
Expand Down
3 changes: 0 additions & 3 deletions app/styles/_overview.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,9 +243,6 @@
}
}
.list-pf-expansion.in {
.deployment-donut > div[row] {
justify-content: center;
}
.empty-state-message {
margin-bottom: 30px;
margin-top: 20px;
Expand Down
1 change: 1 addition & 0 deletions app/styles/_pipeline.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@
}
.build-pipeline {
display: flex;
flex: 1 1 0%;
flex-direction: row;
.build-name {
white-space: nowrap;
Expand Down
Loading