Skip to content

Commit

Permalink
0018912: Styling of "import emails" page sub menu is inconsistent
Browse files Browse the repository at this point in the history
  • Loading branch information
@mariez
mariez committed Nov 18, 2017
1 parent 16f0208 commit 4058d49
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 24 deletions.
2 changes: 1 addition & 1 deletion css/style.css
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions js/dist/phpList_ui_bootlist.js
View file
Expand Up @@ -2025,7 +2025,7 @@ $('body.fixed li.list').each(function(){
$(this).find('b').before('<label for="'+iname+'" class="btn btn-default"><span class="[ glyphicon glyphicon-ok ]"></span><span>&nbsp;</span></label>').wrap('<label for="'+iname+'" class="btn btn-default active" />');
});
/* STRUCTURE */
$('.content, body.configure fieldset, body.adminattributes table.attributeSet,body.adminattributes table.attributeNew,table.spageeditListing,body.reconcileusers #content form,body.export #content form').not('.accordion .content, .content table .content,body.dbcheck table, body.adminattributes .content').addClass('well');
$('.content, body.configure fieldset, body.adminattributes table.attributeSet,body.adminattributes table.attributeNew,table.spageeditListing,body.reconcileusers #content form,body.export #content form').not('.usermgt .content, .accordion .content, .content table .content,body.dbcheck table, body.adminattributes .content').addClass('well');
$('.fleft').addClass('pull-left');

/* languageswitcher */
Expand Down Expand Up @@ -2240,8 +2240,8 @@ if(!$('#dropdown-tabs').hasClass('btn-group')){
$('.step-nav .back').html('<span class="glyphicon glyphicon-arrow-left" />');
$('.step-nav .next').html('<span class="glyphicon glyphicon-arrow-right" />');
$('.import #wrapp ul, .system #wrapp ul.dashboard_button, .usermgt #wrapp ul, ul.navigation_list').addClass('nav nav-pills nav-stacked');
$('.import #wrapp ul li a, .system #wrapp ul li a,.usermgt #wrapp ul li a, ul.navigation_list li a').not('#newsfeed ul li a').addClass('glyphicon glyphicon-menu-right');
$('#wrapp .nav.nav-pills li ul').addClass('small');
/* $('.import #wrapp ul li a, .system #wrapp ul li a,.usermgt #wrapp ul li a, ul.navigation_list li a').not('#newsfeed ul li a').addClass('glyphicon glyphicon-menu-right');
$('#wrapp .nav.nav-pills li ul').addClass('small');*/
$('.updatepluginbutton').addClass('btn-xs');
$('body.initialise #continuesetup .btn').addClass('btn-primary');

Expand Down
10 changes: 5 additions & 5 deletions js/dist/phpList_ui_bootlist.min.js
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions js/phpList3ToBootstrap.js
View file
Expand Up @@ -39,7 +39,7 @@ $('body.fixed li.list').each(function(){
$(this).find('b').before('<label for="'+iname+'" class="btn btn-default"><span class="[ glyphicon glyphicon-ok ]"></span><span>&nbsp;</span></label>').wrap('<label for="'+iname+'" class="btn btn-default active" />');
});
/* STRUCTURE */
$('.content, body.configure fieldset, body.adminattributes table.attributeSet,body.adminattributes table.attributeNew,table.spageeditListing,body.reconcileusers #content form,body.export #content form').not('.accordion .content, .content table .content,body.dbcheck table, body.adminattributes .content').addClass('well');
$('.content, body.configure fieldset, body.adminattributes table.attributeSet,body.adminattributes table.attributeNew,table.spageeditListing,body.reconcileusers #content form,body.export #content form').not('.usermgt .content, .accordion .content, .content table .content,body.dbcheck table, body.adminattributes .content').addClass('well');
$('.fleft').addClass('pull-left');

/* languageswitcher */
Expand Down Expand Up @@ -254,8 +254,8 @@ if(!$('#dropdown-tabs').hasClass('btn-group')){
$('.step-nav .back').html('<span class="glyphicon glyphicon-arrow-left" />');
$('.step-nav .next').html('<span class="glyphicon glyphicon-arrow-right" />');
$('.import #wrapp ul, .system #wrapp ul.dashboard_button, .usermgt #wrapp ul, ul.navigation_list').addClass('nav nav-pills nav-stacked');
$('.import #wrapp ul li a, .system #wrapp ul li a,.usermgt #wrapp ul li a, ul.navigation_list li a').not('#newsfeed ul li a').addClass('glyphicon glyphicon-menu-right');
$('#wrapp .nav.nav-pills li ul').addClass('small');
/* $('.import #wrapp ul li a, .system #wrapp ul li a,.usermgt #wrapp ul li a, ul.navigation_list li a').not('#newsfeed ul li a').addClass('glyphicon glyphicon-menu-right');
$('#wrapp .nav.nav-pills li ul').addClass('small');*/
$('.updatepluginbutton').addClass('btn-xs');
$('body.initialise #continuesetup .btn').addClass('btn-primary');

Expand Down
31 changes: 19 additions & 12 deletions less/navbar.less
View file
Expand Up @@ -66,17 +66,24 @@
font-weight:600;
}
}
#container #content #wrapp .nav.nav-pills{
height:auto;
}
#container #content #wrapp .nav.nav-pills{
a{ font-family:inherit; }
a:before{ font-family:'Glyphicons Halflings';padding-right:10px}
}
.nav.nav-pills > li{
padding-left:20px;
a {
padding-left:0;
display:inline-block;
}
height:auto;
max-width: 450px;
border-radius: 5px;
padding: 15px 15px 15px 0;
li{
opacity:0.95;
padding-left:15px;
padding-top: 10px;
background: rgba(200,200,200,0.3);
color: lighten(@black,20%);
a{
font-family:inherit;
background: rgba(200,200,200,0.2);
margin-left: -15px;
margin-top: -10px;
color:darken(@black,10%);
}
a:hover{background:@brand-primary;color:#FFF}
}
}

0 comments on commit 4058d49

Please sign in to comment.