Skip to content
This repository has been archived by the owner on Jan 24, 2023. It is now read-only.

SUSE EULA for when built and distributed by SUSE for their CAP product. #1404

Merged
merged 1 commit into from
Dec 7, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion components/about-app/src/about-app.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="action-bar col-md-12 panel-less">
<div class="about-action-panel action-bar col-md-12 panel-less">
<div ng-if="!applicationsListCtrl.needAdminSetup" class="applications-header font-semi-bold pull-left" translate>about</div>
</div>

Expand Down Expand Up @@ -28,5 +28,11 @@
</div>
</div>
</div>
<div class="eula-message" translate-cloak="product.eula-message" translate>product.eula-message</div>
<div class="eula" translate-cloak="product.eula">
<div>
<div ng-if="('product.eula' | translate) !== 'product.eula'" ng-include="'product.eula' | translate"></div>
</div>
</div>
<page-footer context="about.footer" class="about-branding"></page-footer>
</div>
34 changes: 34 additions & 0 deletions components/about-app/src/about-app.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,40 @@
$about-title-font-size: 24px;
$about-color-bg: $page-footer-color-bg;
$about-color-fg: $page-footer-color-fg;
$about-action-bar-height: $console-unit-space * 3;
$eula-min-size: 300px;

.about-panel {
flex: 1 1 0;
height: calc(100% - #{$about-action-bar-height});
display: flex;
flex-direction: column;
}

.cluster-settings.user-summary.about-summary {
flex: 0 0 auto;
}

.eula {
flex: 1 0 auto;
overflow-y: scroll;
height: 0;
min-height: $eula-min-size;
border: 1px solid $gray-light;
padding: 4px;
margin-top: $console-half-space;
}

.eula-message {
flex: 0 0 auto;
margin-top: $console-half-space;
font-weight: $console-font-weight-bold;
font-size: $font-size-medium;
}

page-footer.about-branding {
flex: 0 0 48px;
}

.cluster-settings.user-summary {
.cluster.row {
Expand Down
Loading