shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 18:21:12 +03:00
Code Releases Activity

update general styling of first-time license page

Browse Source
This commit is contained in:
John Mitchell 2016-05-03 14:48:34 -04:00
parent adb4703d45
commit 5987d86a4b
3 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/footer/footer.block.less
View File

@ -3,7 +3,7 @@
.Footer { .Footer {
height: 40px; height: 40px;
background-color: @default-no-items-bord; background-color: @default-secondary-bg;
color: @default-interface-txt; color: @default-interface-txt;
width: 100%; width: 100%;
z-index: 1040; z-index: 1040;

29
awx/ui/client/src/license/license.block.less
View File

@ -10,6 +10,13 @@
.License-container{ .License-container{
.OnePlusTwo-container; .OnePlusTwo-container;
} }
.License-container--missing {
max-width: 800px;
margin: 0 auto;
padding: 0 20px;
}
.License-field--label{ .License-field--label{
.OnePlusTwo-left--detailsLabel; .OnePlusTwo-left--detailsLabel;
} }
@ -33,10 +40,22 @@
.License-submit--success.ng-hide{ .License-submit--success.ng-hide{
opacity: 0; opacity: 0;
} }
.License-eula textarea{
.License-eulaNotice{
font-size: 12px;
width: 100%; width: 100%;
height: 200px; max-height: 129px;
padding: 15px;
padding-top: 10px;
margin-bottom: 10px;
border-radius: 4px;
border: 1px solid @login-notice-border;
background-color: @login-notice-bg;
color: @login-notice-text;
overflow-y: scroll;
overflow-x: visible;
} }
.License-field label{ .License-field label{
width: 155px; width: 155px;
} }
@ -76,9 +95,11 @@
color:@default-bg; color:@default-bg;
} }
.License-downloadLicenseButton:hover{ .License-downloadLicenseButton:hover{
background-color: @default-link-hov !important;
color:@default-bg !important; color:@default-bg !important;
} }
.License-downloadLicenseButton:focus{ .License-downloadLicenseButton:focus{
background-color: @default-link-hov !important;
color:@default-bg !important; color:@default-bg !important;
} }
.License-submit--container{ .License-submit--container{
@ -111,3 +132,7 @@
border-top-right-radius: 4px !important; border-top-right-radius: 4px !important;
border-bottom-right-radius: 4px !important; border-bottom-right-radius: 4px !important;
} }
.License-detailsGroup {
margin-bottom: 20px;
}

19
awx/ui/client/src/license/license.partial.html
View File

@ -1,4 +1,5 @@
<div class="License-container"> <div class="License-container"
ng-class="{'License-container--missing': licenseMissing}">
<div class="License-details" ng-if="!licenseMissing"> <div class="License-details" ng-if="!licenseMissing">
<div class="Panel"> <div class="Panel">
<div class="License-titleText">Details</div> <div class="License-titleText">Details</div>
@ -102,14 +103,18 @@
<span class="License-fileName" ng-class="{'License-helperText' : fileName == 'No file selected.'}">{{fileName}}</span> <span class="License-fileName" ng-class="{'License-helperText' : fileName == 'No file selected.'}">{{fileName}}</span>
<input id="License-file" class="form-control" type="file" file-on-change="getKey"/> <input id="License-file" class="form-control" type="file" file-on-change="getKey"/>
</div> </div>
<div class="License-subTitleText prepend-asterisk"> End User License Agreement</div> <div class="License-subTitleText prepend-asterisk"> End User License Agreement
<div class="form-group License-eula">
<textarea class="form-control">{{license.eula}}
</textarea>
</div> </div>
<div class="form-group"> <div id="eula_notice"
class="License-eulaNotice">
{{ license.eula }}
</div>
<div class="form-group License-detailsGroup">
<div class="checkbox"> <div class="checkbox">
<div class="License-details--label"><input type="checkbox" ng-model="newLicense.eula" required> I agree to the End User License Agreement</div> <label class="License-details--label">
<input type="checkbox" ng-model="newLicense.eula" required>
I agree to the End User License Agreement
</label>
</div> </div>
</div> </div>
<div class="License-submit--container"> <div class="License-submit--container">