Clean up markup

- Avoid nested rows without cols in them
- Use .row-spaced instead of empty rows to space content
This commit is contained in:
Alberto Fernández Capel 2018-06-06 15:24:24 +01:00
parent 553878064b
commit b308dcef63
2 changed files with 9 additions and 19 deletions

View file

@ -13,30 +13,24 @@ block content
-if (query.expired)
.alert.alert-warning #{translate("email_link_expired")}
.row
div  
.row
.row.row-spaced
.col-md-8.col-md-offset-2(ng-cloak)
.card(ng-controller="DomainSubscriptionJoinController")
.page-header
h1.text-centered #{translate("you_are_invited_to_group", {groupName:licenceName})}
div(ng-show="view =='personalSubscription'").row.text-centered
div(ng-show="view =='personalSubscription'").text-centered
div #{translate("cancel_personal_subscription_first")}
.row
.col-md-12  
.row
.row.row-spaced
.col-md-12
a.btn.btn.btn-default(ng-click="keepPersonalSubscription()", ng-disabled="inflight") #{translate("not_now")}
span  
a.btn.btn.btn-primary(ng-click="cancelSubscription()", ng-disabled="inflight") #{translate("cancel_your_subscription")}
div(ng-show="view =='domainSubscriptionJoin'").row.text-centered
div(ng-show="view =='domainSubscriptionJoin'").text-centered
.row
.col-md-12 #{translate("group_provides_you_with_premium_account", {groupName:licenceName})}
.row
.col-md-12  
.row
.row.row-spaced
.col-md-12
.text-center
a.btn.btn-default(href="/project") #{translate("not_now")}
@ -44,11 +38,9 @@ block content
a.btn.btn.btn-primary(ng-click="joinGroup()", ng-disabled="inflight") #{translate("verify_email_address")}
span(ng-show="view =='requestSent'").row.text-centered.text-center
span(ng-show="view =='requestSent'").text-centered.text-center
.row
.col-md-12 #{translate("check_email_to_complete_the_upgrade")}
.row
.col-md-12  
.row
.row.row-spaced
.col-md-12
a.btn.btn.btn-primary(href="/project") #{translate("done")}

View file

@ -14,15 +14,13 @@ block content
-if (query.expired)
.alert.alert-warning #{translate("email_link_expired")}
.row
div  
.row
.row.row-spaced
.col-md-8.col-md-offset-2(ng-cloak)
.card(ng-controller="TeamInviteController")
.page-header
h1.text-centered #{translate("invited_to_group", {inviterName: inviterName, appName: appName})}
div(ng-show="view =='personalSubscription'").row.text-centered.message
div(ng-show="view =='personalSubscription'").text-centered.message
p #{translate("cancel_personal_subscription_first")}
.row
.col-md-12