Skip to content

Commit

Permalink
Merge pull request #69 from C-Lodder/bs4-alpha5
Browse files Browse the repository at this point in the history 
Update to Bootstrap 4 - alpha.5
  • Loading branch information
@C-Lodder
C-Lodder authored Oct 21, 2016
2 parents 0289a55 + d94ab41 commit 6f2bd58
Show file tree
Hide file tree
Showing 116 changed files with 14,662 additions and 4,727 deletions.
2 changes: 1 addition & 1 deletion administrator/components/com_banners/views/banners/tmpl/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
</div>
</td>
<td class="nowrap has-context">
<div class="pull-xs-left">
<div class="float-xs-left">
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'banners.', $canCheckin); ?>
<?php endif; ?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_banners/views/clients/tmpl/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
</div>
</td>
<td class="nowrap has-context">
<div class="pull-xs-left">
<div class="float-xs-left">
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'clients.', $canCheckin); ?>
<?php endif; ?>
Expand Down
13 changes: 7 additions & 6 deletions administrator/components/com_config/view/component/tmpl/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,13 @@
<form action="<?php echo JRoute::_('index.php?option=com_config'); ?>" id="component-form" method="post" name="adminForm" autocomplete="off">
<div class="row">

<!-- Begin Sidebar -->
<?php // Begin Sidebar ?>
<div class="col-md-2" id="sidebar">
<div class="sidebar-nav">
<?php echo $this->loadTemplate('navigation'); ?>
</div>
</div><!-- End Sidebar -->
</div>
<?php // End Sidebar ?>

<div class="col-md-10" id="config">

Expand All @@ -70,9 +71,9 @@
<?php $rel = ' data-showon=\'' . json_encode($showonarr) . '\''; ?>
<?php endif; ?>
<?php $label = empty($fieldSet->label) ? 'COM_CONFIG_' . $name . '_FIELDSET_LABEL' : $fieldSet->label; ?>
<li<?php echo $rel; ?>><a data-toggle="tab" href="#<?php echo $name; ?>"><?php echo JText::_($label); ?></a></li>
<li class="nav-item"<?php echo $rel; ?>><a class="nav-link" data-toggle="tab" href="#<?php echo $name; ?>"><?php echo JText::_($label); ?></a></li>
<?php endforeach; ?>
</ul><!-- /configTabs -->
</ul>

<div class="tab-content" id="configContent">
<?php foreach ($this->fieldsets as $name => $fieldSet) : ?>
Expand Down Expand Up @@ -115,9 +116,9 @@
<?php endforeach; ?>
</div>
<?php endforeach; ?>
</div><!-- /configContent -->
</div>

</div><!-- /config -->
</div>

<input type="hidden" name="id" value="<?php echo $this->component->id; ?>" />
<input type="hidden" name="component" value="<?php echo $this->component->option; ?>" />
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_contact/views/contacts/tmpl/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
</div>
</td>
<td class="nowrap has-context">
<div class="pull-xs-left">
<div class="float-xs-left">
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'contacts.', $canCheckin); ?>
<?php endif; ?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_content/views/articles/tmpl/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
</div>
</td>
<td class="has-context">
<div class="pull-xs-left break-word">
<div class="float-xs-left break-word">
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'articles.', $canCheckin); ?>
<?php endif; ?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_content/views/featured/tmpl/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
</div>
</td>
<td class="has-context">
<div class="pull-xs-left break-word">
<div class="float-xs-left break-word">
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'articles.', $canCheckin); ?>
<?php endif; ?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_contenthistory/views/compare/tmpl/compare.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<fieldset>
<legend>
<?php echo JText::sprintf('COM_CONTENTHISTORY_COMPARE_TITLE'); ?>
<div class="btn-group pull-xs-right">
<div class="btn-group float-xs-right">
&nbsp;<button id="toolbar-all-rows" class="btn hasTooltip" title="<?php echo JText::_('COM_CONTENTHISTORY_BUTTON_COMPARE_ALL_ROWS_DESC'); ?>"
onclick="jQuery('.items-equal').show(); jQuery('#toolbar-all-rows').hide(); jQuery('#toolbar-changed-rows').show()"
style="display:none" >
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_contenthistory/views/history/tmpl/modal.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
?>
<div class="container-popup">

<div class="btn-group pull-xs-right">
<div class="btn-group float-xs-right">
<button id="toolbar-load" type="submit" class="btn hasTooltip" title="<?php echo JText::_('COM_CONTENTHISTORY_BUTTON_LOAD_DESC'); ?>" data-url="<?php echo JRoute::_($loadUrl);?>">
<span class="icon-upload"></span><span class="hidden-sm-down"><?php echo JText::_('COM_CONTENTHISTORY_BUTTON_LOAD'); ?></span></button>
<button id="toolbar-preview" type="button" class="btn hasTooltip" title="<?php echo JText::_('COM_CONTENTHISTORY_BUTTON_PREVIEW_DESC'); ?>" data-url="<?php echo JRoute::_('index.php?option=com_contenthistory&view=preview&layout=preview&tmpl=component&' . JSession::getFormToken() . '=1');?>">
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_finder/views/filter/tmpl/edit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<button class="btn btn-secondary" type="button" class="jform-rightbtn" onclick="jQuery('.filter-node').each(function () { this.click(); });">
<span class="icon-checkbox-partial"></span> <?php echo JText::_('JGLOBAL_SELECTION_INVERT'); ?></button>

<button class="btn btn-secondary pull-xs-right" type="button" id="rightbtn" ><?php echo JText::_('COM_FINDER_FILTER_SHOW_ALL'); ?></button>
<button class="btn btn-secondary float-xs-right" type="button" id="rightbtn" ><?php echo JText::_('COM_FINDER_FILTER_SHOW_ALL'); ?></button>
<hr>
<?php endif; ?>

Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_languages/views/overrides/tmpl/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<form action="<?php echo JRoute::_('index.php?option=com_languages&view=overrides'); ?>" method="post" name="adminForm" id="adminForm">
<div id="j-main-container">
<div id="filter-bar" class="btn-toolbar clearfix">
<div class="filter-search btn-group pull-xs-left">
<div class="filter-search btn-group float-xs-left">
<div class="input-group">
<input type="text" name="filter_search" id="filter_search" placeholder="<?php echo JText::_('JSEARCH_FILTER'); ?>" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" class="form-control hasTooltip" title="<?php echo JHtml::tooltipText('COM_LANGUAGES_VIEW_OVERRIDES_FILTER_SEARCH_DESC'); ?>" />
<div class="input-group-btn">
Expand All @@ -30,7 +30,7 @@
</div>
</div>
</div>
<div class="btn-group pull-xs-right hidden-sm-down">
<div class="btn-group float-xs-right hidden-sm-down">
<label for="limit" class="element-invisible"><?php echo JText::_('JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC'); ?></label>
<?php echo $this->pagination->getLimitBox(); ?>
</div>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_media/views/images/tmpl/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<button class="btn" type="button" id="upbutton" title="<?php echo JText::_('COM_MEDIA_DIRECTORY_UP') ?>"><?php echo JText::_('COM_MEDIA_UP') ?></button>
</div>
</div>
<div class="pull-xs-right">
<div class="float-xs-right">
<button class="btn btn-success button-save-selected" type="button" <?php if (!empty($onClick)) :
// This is for Mootools compatibility ?>onclick="<?php echo $onClick; ?>"<?php endif; ?> data-dismiss="modal"><?php echo JText::_('COM_MEDIA_INSERT') ?></button>
<button class="btn btn-outline-danger button-cancel" type="button" onclick="window.parent.jQuery('.modal.in').modal('hide');<?php if (!empty($onClick)) :
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_media/views/media/tmpl/default_folders.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
$target = str_replace('/', '-', $folder['data']->relative); ?>
<li id="<?php echo $target; ?>">
<a href="index.php?option=com_media&amp;view=mediaList&amp;tmpl=component&amp;folder=<?php echo $folder['data']->relative; ?>" target="folderframe">
<span class="icon-folder-2 pull-xs-left"></span>
<span class="icon-folder-2 float-xs-left"></span>
<?php echo $folder['data']->name; ?>
</a>
<?php echo $this->getFolderLevel($folder); ?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_media/views/medialist/tmpl/thumbs_docs.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<li class="imgOutline thumbnail height-80 width-80 center">
<?php if ($this->canDelete) : ?>
<a class="close delete-item" target="_top" href="index.php?option=com_media&amp;task=file.delete&amp;tmpl=index&amp;<?php echo JSession::getFormToken(); ?>=1&amp;folder=<?php echo $this->state->folder; ?>&amp;rm[]=<?php echo $doc->name; ?>" rel="<?php echo $doc->name; ?>" title="<?php echo JText::_('JACTION_DELETE');?>">&#215;</a>
<div class="pull-xs-left">
<div class="float-xs-left">
<?php echo JHtml::_('grid.id', $i, $doc->name, false, 'rm', 'cb-document'); ?>
</div>
<div class="clearfix"></div>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_media/views/medialist/tmpl/thumbs_folders.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<li class="imgOutline thumbnail height-80 width-80 center">
<?php if ($this->canDelete):?>
<a class="close delete-item" target="_top" href="index.php?option=com_media&amp;task=folder.delete&amp;tmpl=index&amp;<?php echo JSession::getFormToken(); ?>=1&amp;folder=<?php echo $this->state->folder; ?>&amp;rm[]=<?php echo $folder->name; ?>" rel="<?php echo $folder->name; ?> :: <?php echo $folder->files + $folder->folders; ?>" title="<?php echo JText::_('JACTION_DELETE');?>">&#215;</a>
<div class="pull-xs-left">
<div class="float-xs-left">
<?php echo JHtml::_('grid.id', $i, $folder->name, false, 'rm', 'cb-folder'); ?>
</div>
<div class="clearfix"></div>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_media/views/medialist/tmpl/thumbs_imgs.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<a class="close delete-item" target="_top"
href="index.php?option=com_media&amp;task=file.delete&amp;tmpl=index&amp;<?php echo JSession::getFormToken(); ?>=1&amp;folder=<?php echo $this->state->folder; ?>&amp;rm[]=<?php echo $img->name; ?>"
rel="<?php echo $img->name; ?>" title="<?php echo JText::_('JACTION_DELETE'); ?>">&#215;</a>
<div class="pull-xs-left">
<div class="float-xs-left">
<?php echo JHtml::_('grid.id', $i, $img->name, false, 'rm', 'cb-image'); ?>
</div>
<div class="clearfix"></div>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_media/views/medialist/tmpl/thumbs_videos.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<li class="imgOutline thumbnail height-80 width-80 center">
<?php if ($this->canDelete):?>
<a class="close delete-item" target="_top" href="index.php?option=com_media&amp;task=file.delete&amp;tmpl=index&amp;<?php echo JSession::getFormToken(); ?>=1&amp;folder=<?php echo $this->state->folder; ?>&amp;rm[]=<?php echo $video->name; ?>" rel="<?php echo $video->name; ?>" title="<?php echo JText::_('JACTION_DELETE');?>">&#215;</a>
<div class="pull-xs-left">
<div class="float-xs-left">
<?php echo JHtml::_('grid.id', $i, $video->name, false, 'rm', 'cb-video'); ?>
</div>
<div class="clearfix"></div>
Expand Down
14 changes: 7 additions & 7 deletions administrator/components/com_modules/views/module/tmpl/edit_assignment.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ function menuHide(val)
<a id="treeExpandAll" href="javascript://"><?php echo JText::_('JALL'); ?></a>,
<a id="treeCollapseAll" href="javascript://"><?php echo JText::_('JNONE'); ?></a>
</span>
<input type="text" id="treeselectfilter" name="treeselectfilter" class="form-control search-query pull-xs-right" size="16"
<input type="text" id="treeselectfilter" name="treeselectfilter" class="form-control search-query float-xs-right" size="16"
autocomplete="off" placeholder="<?php echo JText::_('JSEARCH_FILTER'); ?>" aria-invalid="false" tabindex="-1">
</div>

Expand All @@ -79,8 +79,8 @@ function menuHide(val)
<?php if (count($type->links)) : ?>
<?php $prevlevel = 0; ?>
<li>
<div class="treeselect-item pull-xs-left">
<label class="pull-xs-left nav-header"><?php echo $type->title; ?></label></div>
<div class="treeselect-item float-xs-left">
<label class="float-xs-left nav-header"><?php echo $type->title; ?></label></div>
<?php foreach ($type->links as $i => $link) : ?>
<?php
if ($prevlevel < $link->level)
Expand All @@ -105,9 +105,9 @@ function menuHide(val)
}
?>
<li>
<div class="treeselect-item pull-xs-left">
<input type="checkbox" class="pull-xs-left novalidate" name="jform[assigned][]" id="<?php echo $id . $link->value; ?>" value="<?php echo (int) $link->value; ?>"<?php echo $selected ? ' checked="checked"' : ''; ?> />
<label for="<?php echo $id . $link->value; ?>" class="pull-xs-left">
<div class="treeselect-item float-xs-left">
<input type="checkbox" class="float-xs-left novalidate" name="jform[assigned][]" id="<?php echo $id . $link->value; ?>" value="<?php echo (int) $link->value; ?>"<?php echo $selected ? ' checked="checked"' : ''; ?> />
<label for="<?php echo $id . $link->value; ?>" class="float-xs-left">
<?php echo $link->text; ?> <span class="small"><?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($link->alias));?></span>
<?php if (JLanguageMultilang::isEnabled() && $link->language != '' && $link->language != '*')
{
Expand Down Expand Up @@ -137,7 +137,7 @@ function menuHide(val)
<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
</div>
<div style="display:none" id="treeselectmenu">
<div class="pull-xs-left nav-hover treeselect-menu">
<div class="float-xs-left nav-hover treeselect-menu">
<div class="dropdown">
<a href="#" data-toggle="dropdown" class="dropdown-toggle btn btn-xs btn-secondary">
<span class="caret"></span>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_modules/views/modules/tmpl/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
</div>
</td>
<td class="has-context">
<div class="pull-xs-left">
<div class="float-xs-left">
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'modules.', $canCheckin); ?>
<?php endif; ?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
</div>
</td>
<td class="nowrap has-context">
<div class="pull-xs-left">
<div class="float-xs-left">
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'newsfeeds.', $canCheckin); ?>
<?php endif; ?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_templates/helpers/html/templates.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public static function thumb($template, $clientId = 0)

if (file_exists($preview))
{
$html = '<a href="#' . $template . '-Modal" role="button" class="thumbnail pull-xs-left hasTooltip" data-toggle="modal" title="' .
$html = '<a href="#' . $template . '-Modal" role="button" class="thumbnail float-xs-left hasTooltip" data-toggle="modal" title="' .
JHtml::tooltipText('COM_TEMPLATES_CLICK_TO_ENLARGE') . '">' . $html . '</a>';
}
}
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_templates/views/template/tmpl/default_description.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
defined('_JEXEC') or die;
?>

<div class="pull-xs-left">
<div class="float-xs-left">
<?php echo JHtml::_('templates.thumb', $this->template->element, $this->template->client_id); ?>
<?php echo JHtml::_('templates.thumbModal', $this->template->element, $this->template->client_id); ?>
</div>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_users/views/users/tmpl/modal.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<div class="container-popup">
<form action="<?php echo JRoute::_('index.php?option=com_users&view=users&layout=modal&tmpl=component&groups=' . $input->get('groups', '', 'BASE64') . '&excluded=' . $input->get('excluded', '', 'BASE64')); ?>" method="post" name="adminForm" id="adminForm">
<?php if (!$userRequired) : ?>
<div class="pull-xs-left">
<div class="float-xs-left">
<button type="button" class="btn button-select" data-user-value="0" data-user-name="<?php echo $this->escape(JText::_('JLIB_FORM_SELECT_USER')); ?>"
data-user-field="<?php echo $this->escape($field);?>" <?php if ($isMoo) : ?>value="" onclick="window.parent.jSelectUser(this)"<?php endif; ?>><?php echo JText::_('JOPTION_NO_USER'); ?></button>&nbsp;
</div>
Expand Down
2 changes: 1 addition & 1 deletion administrator/modules/mod_latest/tmpl/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<small class="hasTooltip" title="<?php echo JHtml::tooltipText('MOD_LATEST_CREATED_BY'); ?>">
<?php echo $item->author_name; ?>
</small>
<span class="tag tag-default tag-pill pull-xs-right">
<span class="tag tag-default tag-pill float-xs-right">
<span class="small">
<span class="icon-calendar"></span>
<?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC5')); ?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/modules/mod_logged/tmpl/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</small>
</div>
<div class="col-md-6 text-sm-right">
<div class="small pull-xs-right hasTooltip" title="<?php echo JHtml::tooltipText('MOD_LOGGED_LAST_ACTIVITY'); ?>">
<div class="small float-xs-right hasTooltip" title="<?php echo JHtml::tooltipText('MOD_LOGGED_LAST_ACTIVITY'); ?>">
<span class="icon-calendar"></span> <?php echo JHtml::_('date', $user->time, JText::_('DATE_FORMAT_LC5')); ?>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion administrator/modules/mod_menu/tmpl/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

defined('_JEXEC') or die;

$direction = JFactory::getDocument()->direction == 'rtl' ? 'pull-xs-right' : '';
$direction = JFactory::getDocument()->direction == 'rtl' ? 'float-xs-right' : '';

require JModuleHelper::getLayoutPath('mod_menu', $enabled ? 'default_enabled' : 'default_disabled');

Expand Down
2 changes: 1 addition & 1 deletion administrator/modules/mod_popular/tmpl/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>
<?php endif; ?>
</strong>
<span class="tag tag-default tag-pill pull-xs-right">
<span class="tag tag-default tag-pill float-xs-right">
<span class="small">
<span class="icon-calendar"></span>
<?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC5')); ?>
Expand Down
4 changes: 4 additions & 0 deletions administrator/templates/atum/_src/scss/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,7 @@ $font-size-h4: 1rem;
$font-size-h5: .9286rem;
$font-size-h6: .8571rem;
$fa-font-path: "../../../../media/vendor/font-awesome/fonts" !default;

// BS4-alpha.5 | custom-select SVG override
// This was broken in alpha.5 so be sure to remove this when it's fixed again
$custom-select-indicator: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='%23333' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E");
Loading

0 comments on commit 6f2bd58

Please sign in to comment.