mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-14 02:24:08 +02:00
Code Issues Releases Wiki Activity

Issue #2970 Bootstrap 3 pull-left/right combined with Bootstrap 4 float-left/right. News Email/Print icon default styles added.

Browse Source
This commit is contained in:
Cameron
2019-06-17 12:27:53 -07:00
parent d318b7a8fc
commit 26ff074ee5
28 changed files with 68 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_core/shortcodes/batch/comment_shortcodes.php
View File

@@ -237,7 +237,7 @@ class comment_shortcodes extends e_shortcode
$pid = ($this->var['action'] == 'reply') ? $this->var['pid'] : 0;
$class = "e-comment-submit ";
$class .= (!empty($parm['class'])) ? $parm['class'] : 'button btn btn-primary e-comment-submit pull-right';
$class .= (!empty($parm['class'])) ? $parm['class'] : 'button btn btn-primary e-comment-submit pull-right float-right';
$options = array(
'class' => $class,
'data-pid' => $pid,

4
e107_core/shortcodes/batch/news_shortcodes.php
View File

@@ -521,7 +521,7 @@ class news_shortcodes extends e_shortcode
return null;
}
$class = varset($parm['class']) ? " ".$parm['class'] : "";
$class = !empty($parm['class']) ? " ".$parm['class'] : " btn btn-default btn-secondary";
if(empty($this->param['commentlink']))
{
@@ -598,7 +598,7 @@ class news_shortcodes extends e_shortcode
$adop_icon = (file_exists(THEME."images/newsedit.png") ? "<img src='".THEME_ABS."images/newsedit.png' alt=\"".LAN_EDIT."\" class='icon' />" : $default);
$class = varset($parm['class']);
$class = varset($parm['class'], 'btn btn-default btn-secondary');
return "<a class='e-tip ".$class." hidden-print' rel='external' href='".e_ADMIN_ABS."newspost.php?action=edit&amp;id=".$this->news_item['news_id']."' title=\"".LAN_EDIT."\">".$adop_icon."</a>\n";
}

2
e107_core/templates/page_template.php
View File

@@ -22,7 +22,7 @@ $sc_style['CPAGESUBTITLE|default']['post'] = '</h2>';
$sc_style['CPAGEMESSAGE|default']['pre'] = '';
$sc_style['CPAGEMESSAGE|default']['post'] = '<div class="clear"><!-- --></div>';
$sc_style['CPAGENAV|default']['pre'] = '<div class="f-right pull-right col-md-3">';
$sc_style['CPAGENAV|default']['pre'] = '<div class="f-right pull-right float-right col-md-3">';
$sc_style['CPAGENAV|default']['post'] = '</div>';
#### default template - BC ####