Skip to content

Commit

Permalink
FIXES ON FORMS:
Browse files Browse the repository at this point in the history
--------------
- remove width 100% on inputs and selects in desktop view
- remove form-inline not needed anymore
- keep 100% width on inputs and selects in mobile view (less than 768)  to override "size" already present in phplist3 html.
- add 5px space to labels and buttons by default
- Mantis #0018564: Layout problem with the Import pages

FIXES ON TABLES:
---------------
- remove horizontal scrolling div (table-responsive) on tables that can adapt ok to small screens.
- on tables that need horizontal scrolling, change scrollbar position from bottom to top (css solution)
  • Loading branch information
mariez committed Jun 4, 2017
1 parent 7d34f8c commit f456aff
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 10 deletions.
2 changes: 1 addition & 1 deletion css/style.css

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions js/dist/phpList_ui_bootstrap.js
Expand Up @@ -2092,7 +2092,6 @@ if(!$('#dropdown-tabs').hasClass('btn-group')){
$('body.configure div.shade1, body.configure div.shade2').addClass('form-group');
$('div, label').removeClass('label');
$('#sendTest br').remove();
$('body.editattributes form').addClass('form-inline');
if (!$('body').hasClass('modal-open')){
$('.accordion label,#sendmessageform .well label').not('.checkbox label,.radio label').before('<div class="clearfix break"></div>');
$('label[for=htmlchoice], label[for=emaildoubleentry]').after('<div class="clearfix break"></div>');
Expand Down Expand Up @@ -2222,7 +2221,7 @@ if(!$('#dropdown-tabs').hasClass('btn-group')){
});

/* tables*/
$('.content').not('.listingelement .content, body.import1 .content, body.import2 .content').addClass('table-responsive');
$('body.userhistory #subscription .content, body.statsoverview .content, body.domainstats .content,body.dbcheck .content,body.bouncerules .content,body.plugins .content').addClass('table-responsive');
$('table').not('table.table').attr('border',null);
$('.listingelement table,body.dbcheck table, table.spageeditListing').not('table.table').addClass('table-condensed');
$('table.spageeditListing tr:first-child,table.attributeSet tr:first-child').addClass('info');
Expand Down
4 changes: 2 additions & 2 deletions js/dist/phpList_ui_bootstrap.min.js

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions js/phpList3ToBootstrap.js
Expand Up @@ -106,7 +106,6 @@ if(!$('#dropdown-tabs').hasClass('btn-group')){
$('body.configure div.shade1, body.configure div.shade2').addClass('form-group');
$('div, label').removeClass('label');
$('#sendTest br').remove();
$('body.editattributes form').addClass('form-inline');
if (!$('body').hasClass('modal-open')){
$('.accordion label,#sendmessageform .well label').not('.checkbox label,.radio label').before('<div class="clearfix break"></div>');
$('label[for=htmlchoice], label[for=emaildoubleentry]').after('<div class="clearfix break"></div>');
Expand Down Expand Up @@ -236,7 +235,7 @@ if(!$('#dropdown-tabs').hasClass('btn-group')){
});

/* tables*/
$('.content').not('.listingelement .content, body.import1 .content, body.import2 .content').addClass('table-responsive');
$('body.userhistory #subscription .content, body.statsoverview .content, body.domainstats .content,body.dbcheck .content,body.bouncerules .content,body.plugins .content').addClass('table-responsive');
$('table').not('table.table').attr('border',null);
$('.listingelement table,body.dbcheck table, table.spageeditListing').not('table.table').addClass('table-condensed');
$('table.spageeditListing tr:first-child,table.attributeSet tr:first-child').addClass('info');
Expand Down
16 changes: 13 additions & 3 deletions less/legacy.less
Expand Up @@ -82,8 +82,10 @@ span.glyphicon{margin:5px}
.well{background-color:#FCFCFC}
.btn.disabled{opacity:0.2}
.tab-content ul.list-unstyled li{margin-bottom:15px}
.form-control{max-width: 100% !important}
label,.form-control,.btn:not(table .btn-xs){margin-top:5px;margin-bottom:5px;margin-right:5px}
.form-control{max-width: 100% !important}
select.form-control,input.form-control{display:inline-block;width:auto}
label,.form-control,.btn{margin:5px}
.toggle-group label,.toggle-group span{margin:0}
.panel-collapse, .panel-body{margin-top:0px !important}
body.list,body.mviews,body.templates,body.eventlog,body.spage{
.table-striped > tbody > tr:nth-of-type(2n+1) { border-bottom:2px solid #999}
Expand All @@ -99,6 +101,11 @@ table.well tr td{padding:10px 20px;padding-right:20px}
.navbar-brand{padding-top:7px}
.navbar-default{padding:10px}
.alert{margin:10px 0}
.table-responsive, .table-responsive .table{
transform:rotateX(180deg);
-ms-transform:rotateX(180deg); /* IE 9 */
-webkit-transform:rotateX(180deg); /* Safari and Chrome */
}

@media screen and (max-width: 768px){
#content #wrapp .nav-tabs > li {
Expand All @@ -116,7 +123,11 @@ table.well tr td{padding:10px 20px;padding-right:20px}
#navigation .navbar-toggle{
margin-top:14px
}
.well{padding:0}
/* need this to overwrite sizes of inputs */
input.form-control,select.form-control{width:100%}
}

@media screen and (min-width: 768px){
.dl-horizontal dt{ text-align:left}
.dl-horizontal dd{
Expand Down Expand Up @@ -352,7 +363,6 @@ div.tab-content {padding:20px;border:1px solid #CCC;background-color:#FFF;margin
/*input[type="checkbox"].styled:checked + label:after, */input[type="radio"].styled:checked + label:after { font-family:'Glyphicons Halflings'; content:"\e013"}
/*input[type="checkbox"] .styled:checked + label::before, */input[type="radio"] .styled:checked + label::before { color:#fff}
/*input[type="checkbox"] .styled:checked + label::after, */ input[type="radio"] .styled:checked + label::after { color:#fff}
select.form-control{display:inline-block;width:auto}
input[type="checkbox"]{margin:6px;vertical-align:middle}


Expand Down

0 comments on commit f456aff

Please sign in to comment.