External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-19 09:57:33 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'blank-column-2-orgs' of https://github.com/mabashian/ansible-tower into mabashian-blank-column-2-orgs

Browse Source 
# Conflicts:
#	awx/ui/client/src/helpers/Parse.js
This commit is contained in:
Michael Abashian
2016-06-16 14:36:05 -04:00
parent 3d9baea3e3 db11075ced
commit a8eb8073bc
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/ui/client/src/organizations/orgcards.block.less
View File

@@ -5,7 +5,8 @@
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
width: 100%; width: 100%;
justify-content: space-between; width: ~"calc(100% + 20px)";
margin: 0px -10px;
} }
.OrgCards-search tag-search{ .OrgCards-search tag-search{
@@ -38,7 +39,9 @@
flex-wrap: wrap; flex-wrap: wrap;
align-items: baseline; align-items: baseline;
margin-top: 20px; margin-top: 20px;
width: 32% width: ~"calc(33.333% - 20px)";
margin-left: 10px;
margin-right: 10px;
} }
.OrgCards-card--selected { .OrgCards-card--selected {
@@ -104,13 +107,12 @@
@media (max-width: 840px) { @media (max-width: 840px) {
.OrgCards-card { .OrgCards-card {
width: 100%; width: ~"calc(100% - 20px)";
margin-right: 0px;
} }
} }
@media (min-width: 840px) and (max-width: 1240px) { @media (min-width: 840px) and (max-width: 1240px) {
.OrgCards-card { .OrgCards-card {
width: ~"calc(50% - 10px)"; width: ~"calc(50% - 20px)";
} }
} }