Adjusting pagination and form dialog buttons

This commit is contained in:
Bruno Alves de Faria 2017-06-09 16:14:27 -03:00 committed by Erik Ziegler
parent f33702541c
commit 66c27b408f
2 changed files with 16 additions and 12 deletions

View File

@ -6,17 +6,22 @@
}} }}
{{>dialogHeader this}} {{>dialogHeader this}}
<div class="modal-body"> <div class="modal-body">
{{this.bodyText}}
{{>UI.contentBlock}} {{>UI.contentBlock}}
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
{{>section 'dialogFooter'}} {{>section 'dialogFooter'}}
{{#button action='cancel' {{#unless this.hideCancel}}
class=(concat 'btn btn-cancel ' (choose this.cancelClass 'btn-default')) {{#button action='cancel'
tagAttributes=(extend this.tagAttributes data-dismiss='modal') class=(concat 'btn btn-cancel ' (choose this.cancelClass 'btn-default'))
}}{{choose this.cancelLabel 'Cancel'}}{{/button}} tagAttributes=(extend this.tagAttributes data-dismiss='modal')
{{#button action='confirm' }}{{choose this.cancelLabel 'Cancel'}}{{/button}}
class=(concat 'btn btn-confirm ' (choose this.confirmClass 'btn-primary')) {{/unless}}
}}{{choose this.confirmLabel 'Confirm'}}{{/button}} {{#unless this.hideConfirm}}
{{#button action='confirm'
class=(concat 'btn btn-confirm ' (choose this.confirmClass 'btn-primary'))
}}{{choose this.confirmLabel 'Confirm'}}{{/button}}
{{/unless}}
</div> </div>
{{/form}} {{/form}}
</div> </div>

View File

@ -47,8 +47,10 @@
color: white color: white
.disabled .disabled
a:hover a, a:hover, a:focus, a:active
color: inherit theme('background-color', '$uiGrayDarkest')
theme('border-color', '$uiGray')
theme('color', '$uiGrayLight')
&:not(.disabled):hover a &:not(.disabled):hover a
theme('background-color', '$uiGrayDark') theme('background-color', '$uiGrayDark')
@ -58,9 +60,6 @@
theme('background-color', '$uiGrayDark') theme('background-color', '$uiGrayDark')
theme('color', '$activeColor') theme('color', '$activeColor')
&.disabled a
theme('color', '$uiGrayLight')
@media only screen and (max-width: 1069px) @media only screen and (max-width: 1069px)
.studylistPagination > .row .studylistPagination > .row
margin-right: 0; margin-right: 0;