Fix padding/margin related issues throughout

This commit is contained in:
gconsidine
2017-04-11 13:42:09 -04:00
parent 9747674cb3
commit 810e015ac3
9 changed files with 71 additions and 53 deletions

View File

@@ -132,7 +132,7 @@ table, tbody {
font-weight: normal; font-weight: normal;
padding: 2px 10px; padding: 2px 10px;
height: 14px; height: 14px;
margin: 3px 0; margin: 0;
background-color: @list-title-badge; background-color: @list-title-badge;
border-radius: 5px; border-radius: 5px;
} }
@@ -146,6 +146,8 @@ table, tbody {
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
margin-right: 10px; margin-right: 10px;
line-height: 0.8;
text-transform: uppercase;
} }
.List-actionHolder { .List-actionHolder {

View File

@@ -12,7 +12,7 @@
.DashboardList-header { .DashboardList-header {
display: flex; display: flex;
border-bottom: 1px solid @list-header-bord; border-bottom: 1px solid @list-header-bord;
height: 50px; margin-top: 20px;
} }
.DashboardList-headerText { .DashboardList-headerText {
@@ -21,8 +21,6 @@
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
color: @list-header-txt; color: @list-header-txt;
height: 50px;
line-height: 50px;
white-space: nowrap; white-space: nowrap;
padding-left: 20px; padding-left: 20px;
} }
@@ -34,12 +32,8 @@
.DashboardList-viewAll { .DashboardList-viewAll {
font-size: 11px; font-size: 11px;
margin-right: 15px; margin-right: 15px;
margin-top: 13px;
margin-bottom: 10px;
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
padding-bottom: 5px;
padding-top: 5px;
} }
.DashboardList-container { .DashboardList-container {

View File

@@ -71,10 +71,10 @@
width: 18px; width: 18px;
height: 18px; height: 18px;
width: 18px; width: 18px;
padding-left: 3.8px; padding: 1px 0 0 4px;
border-radius: 50%; border-radius: 50%;
margin-top: 10px; margin-top: 10px;
font-size: 12px; font-size: 11px;
background-color: @default-icon; background-color: @default-icon;
color: @default-bg; color: @default-bg;
} }

View File

@@ -161,6 +161,10 @@
flex-direction: column; flex-direction: column;
} }
.JobResults-panelRight .SmartSearch-bar {
width: 100%;
}
.JobResults-panelRightTitle{ .JobResults-panelRightTitle{
flex-wrap: wrap; flex-wrap: wrap;
} }
@@ -203,6 +207,7 @@ job-results-standard-out {
display: flex; display: flex;
border: 1px solid @d7grey; border: 1px solid @d7grey;
border-radius: 5px; border-radius: 5px;
margin-top: 20px;
} }
@media screen and (max-width: @breakpoint-md) { @media screen and (max-width: @breakpoint-md) {
job-results-standard-out { job-results-standard-out {

View File

@@ -8,7 +8,6 @@
.License-container{ .License-container{
.OnePlusTwo-container; .OnePlusTwo-container;
margin-bottom: 20px;
} }
.License-container--missing { .License-container--missing {
@@ -84,14 +83,12 @@
.License-fields{ .License-fields{
.OnePlusTwo-left--details; .OnePlusTwo-left--details;
} }
.License-details {
.OnePlusTwo-left--panel(650px);
}
.License-titleText { .License-titleText {
.OnePlusTwo-panelHeader; .OnePlusTwo-panelHeader;
} }
.License-management{ .License-management{
.OnePlusTwo-right--panel(650px); display: flex;
} }
.License-management--missingLicense{ .License-management--missingLicense{
height: auto; height: auto;
@@ -109,11 +106,19 @@
color:@default-bg !important; color:@default-bg !important;
} }
.License-submit--container{ .License-submit--container{
height: 33px; position: absolute;
right: 36px;
bottom: 20px;
} }
@media (min-width: 900px) {
.License-details {
margin-right: 20px;
}
}
.License-submit--success{ .License-submit--success{
line-height:33px; margin: 0;
margin: 0 10px 0 0;
} }
.License-file--container { .License-file--container {
input[type=file] { input[type=file] {

View File

@@ -2,7 +2,7 @@
ng-class="{'License-container--missing': licenseMissing}"> ng-class="{'License-container--missing': licenseMissing}">
<div class="License-details" ng-hide="licenseMissing"> <div class="License-details" ng-hide="licenseMissing">
<div class="Panel"> <div class="Panel">
<div class="License-titleText" translate>Details</div> <div class="List-titleText" translate>Details</div>
<div class="License-fields"> <div class="License-fields">
<div class="License-field"> <div class="License-field">
<div class="License-field--label" translate>License</div> <div class="License-field--label" translate>License</div>
@@ -73,7 +73,7 @@
</div> </div>
<div class="License-management" ng-class="{'License-management--missingLicense' : licenseMissing}"> <div class="License-management" ng-class="{'License-management--missingLicense' : licenseMissing}">
<div class="Panel"> <div class="Panel">
<div class="License-titleText">{{title}}</div> <div class="List-titleText">{{title}}</div>
<div class="License-body"> <div class="License-body">
<div class="License-helperText" ng-if="licenseMissing" translate>Welcome to Ansible Tower! Please complete the steps below to acquire a license.</div> <div class="License-helperText" ng-if="licenseMissing" translate>Welcome to Ansible Tower! Please complete the steps below to acquire a license.</div>
<div class="AddPermissions-directions" ng-if="licenseMissing"> <div class="AddPermissions-directions" ng-if="licenseMissing">
@@ -117,10 +117,10 @@
</label> </label>
</div> </div>
</div> </div>
<div class="License-submit--container"> <div class="License-submit--container">
<button ng-click="submit()" class="btn btn-success pull-right" ng-disabled="newLicense.file.license_key == null || newLicense.eula == null" translate>Submit</button> <button ng-click="submit()" class="btn btn-success pull-right" ng-disabled="newLicense.file.license_key == null || newLicense.eula == null" translate>Submit</button>
<span ng-show="success == true" class="License-greenText License-submit--success pull-right" translate>Save successful!</span> <span ng-show="success == true" class="License-greenText License-submit--success pull-right" translate>Save successful!</span>
</div> </div>
</form> </form>
</div> </div>
</div> </div>

View File

@@ -12,6 +12,10 @@
.List-tableHeader:last-of-type{ .List-tableHeader:last-of-type{
text-align:left; text-align:left;
} }
.List-header {
height: 20px;
}
} }
.PortalMode-panelHeader{ .PortalMode-panelHeader{
.OnePlusOne-panelHeader; .OnePlusOne-panelHeader;

View File

@@ -7,7 +7,7 @@
background-color: @panel-bg; background-color: @panel-bg;
border-radius: 5px; border-radius: 5px;
border: 1px solid @btn-bord; border: 1px solid @btn-bord;
min-height: 140px; min-height: 120px;
padding: 20px; padding: 20px;
margin-top: 20px; margin-top: 20px;
transition: background-color 0.2s; transition: background-color 0.2s;
@@ -25,12 +25,14 @@
margin-bottom: 15px; margin-bottom: 15px;
font-weight: 600; font-weight: 600;
text-transform: uppercase; text-transform: uppercase;
margin-top: 0;
} }
.SetupItem-description{ .SetupItem-description{
font-size: 12px; font-size: 12px;
color: @default-interface-txt; color: @default-interface-txt;
text-align: center; text-align: center;
margin-bottom: 0;
} }
@media (min-width: 1179px) { @media (min-width: 1179px) {

View File

@@ -18,35 +18,41 @@
border-color: @list-pagin-bord; border-color: @list-pagin-bord;
} }
.Paginate { .Paginate {
margin-top: 20px; margin-top: 20px;
font-size: 12px !important; font-size: 12px !important;
color: @list-pagin-text; color: @list-pagin-text;
text-transform: uppercase; text-transform: uppercase;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
} }
.Paginate-pager--pageof { .Paginate-pager--pageof {
line-height: 22px; line-height: 22px;
margin-left: 10px; margin-left: 10px;
} }
.Paginate-wrapper { .Paginate-wrapper {
display: flex; display: flex;
flex: 1 0 auto; flex: 1 0 auto;
} }
.Paginate-controls { .Paginate-controls {
margin-top: 0; margin-top: 0;
margin-bottom: 7px; margin-bottom: 0px;
display: inline-block; display: inline-block;
padding-left: 0; padding-left: 0;
border-radius: 4px; border-radius: 4px;
} }
.Paginate-controls--active { .Paginate-controls--active {
color: #fff !important; color: #fff !important;
border-color: @default-icon-hov !important; border-color: @default-icon-hov !important;
background-color: @default-icon-hov !important; background-color: @default-icon-hov !important;
} }
.Paginate-total {
display: flex;
align-items: flex-end;
margin-bottom: -2px;
}