Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #53 from phpList/mantis-19207
mantis #0019207: 'generate from html' button is unformatted
  • Loading branch information
mariez committed May 20, 2018
2 parents 8d6e4f8 + 81198c8 commit 947459d
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion css/style.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/dist/phpList_ui_bootlist.js
Expand Up @@ -2033,7 +2033,7 @@ $('body.fixed li.list').each(function(){

/* BUTTONS */
$('button, #prev.prevtab, #next.nexttab').addClass('btn');
$('.submit, input[type=submit]').not('p.submit,body.import2 div.submit').addClass('btn btn-primary');
$('.submit, input[type=submit], #generatetextversion a.ajaxable').not('p.submit,body.import2 div.submit').addClass('btn btn-primary');
$('button[type=submit]').addClass('btn-primary');
$('.button').not('#wrapp > p.button.pull-right, form.spageEdit >.button.pull-right').addClass('btn btn-default');
$('table .button').addClass('btn-xs');
Expand Down
6 changes: 3 additions & 3 deletions js/dist/phpList_ui_bootlist.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/phpList3ToBootstrap.js
Expand Up @@ -47,7 +47,7 @@ $('body.fixed li.list').each(function(){

/* BUTTONS */
$('button, #prev.prevtab, #next.nexttab').addClass('btn');
$('.submit, input[type=submit]').not('p.submit,body.import2 div.submit').addClass('btn btn-primary');
$('.submit, input[type=submit], #generatetextversion a.ajaxable').not('p.submit,body.import2 div.submit').addClass('btn btn-primary');
$('button[type=submit]').addClass('btn-primary');
$('.button').not('#wrapp > p.button.pull-right, form.spageEdit >.button.pull-right').addClass('btn btn-default');
$('table .button').addClass('btn-xs');
Expand Down
1 change: 1 addition & 0 deletions less/legacy.less
Expand Up @@ -186,6 +186,7 @@ div.segment .clearfix{margin:20px 0 !important}
.sendTest input{margin:5px 0}
body.messages table.messagesendstats{ width: 49%; float: left; margin-left: 1%;}
.modal-content .openhelpimage{padding-top:0}
#generatetextversion{border:0; padding:0;width:auto;margin-right:0px}


/* # header *******************/
Expand Down

0 comments on commit 947459d

Please sign in to comment.