Skip to content

Commit 18e7594

Browse files
C-LodderDimitri Grammatikogianni
authored andcommitted
Dropdown v2 (#146)
* toolbar SCSS tweaks * whitespace + comment block tweaks * Update mediaelement to v2.23.4 * Update autoprefixer and scss_lint dependencies
1 parent df05d03 commit 18e7594

File tree

79 files changed

+2793
-1254
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+2793
-1254
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
source 'http://rubygems.org'
22

3-
gem 'scss_lint', '~> 0.50.2'
3+
gem 'scss_lint', '~> 0.50.3'

administrator/includes/toolbar.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -649,9 +649,9 @@ public static function saveGroup($buttons = array(), $class = 'btn-success')
649649
$options['class'] = $class;
650650

651651
$validOptions = array(
652-
'apply' => 'JTOOLBAR_APPLY',
653-
'save' => 'JTOOLBAR_SAVE',
654-
'save2new' => 'JTOOLBAR_SAVE_AND_NEW',
652+
'apply' => 'JTOOLBAR_APPLY',
653+
'save' => 'JTOOLBAR_SAVE',
654+
'save2new' => 'JTOOLBAR_SAVE_AND_NEW',
655655
'save2copy' => 'JTOOLBAR_SAVE_AS_COPY'
656656
);
657657

administrator/templates/atum/css/template.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8458,6 +8458,7 @@ small, .small {
84588458
background: #fff; }
84598459

84608460
.content {
8461+
margin-top: 50px;
84618462
background: #fff; }
84628463

84638464
.admin.com_modules .js-stools-container-bar .btn-toolbar {
@@ -8488,6 +8489,7 @@ small, .small {
84888489
background: #eaebec; }
84898490

84908491
.com_cpanel .content {
8492+
margin-top: 0;
84918493
background: none; }
84928494

84938495
.com_cpanel .card {

administrator/templates/atum/css/template.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

administrator/templates/atum/css/template.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

administrator/templates/atum/index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<?php // Subheader ?>
112112
<a class="btn btn-subhead hidden-md-up" data-toggle="collapse" data-target=".subhead-collapse"><?php echo JText::_('TPL_ATUM_TOOLBAR'); ?>
113113
<span class="icon-wrench"></span></a>
114-
<div class="subhead-collapse" style="margin: -18px -15px 0 -15px;" data-scroll="<?php echo $hidden; ?>">
114+
<div class="subhead-collapse" data-scroll="<?php echo $hidden; ?>">
115115
<div id="subhead" class="subhead">
116116
<div class="container-fluid">
117117
<div id="container-collapse" class="container-collapse"></div>

administrator/templates/atum/scss/template.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ small, .small {
7171
background: $white;
7272
}
7373
.content {
74+
margin-top: 50px;
7475
background: $white;
7576
}
7677

@@ -119,6 +120,7 @@ small, .small {
119120
background: #eaebec;
120121
}
121122
.content {
123+
margin-top: 0;
122124
background: none;
123125
}
124126
.card {

grunt_settings.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ vendors:
2626
'version': '1.12.1'
2727
'dependencies': 'jquery'
2828
'mediaelement':
29-
'version': '2.22.0'
29+
'version': '2.23.4'
3030
'dependencies': 'jquery'
3131
'punycode':
3232
'version': '1.4.1'

libraries/joomla/form/fields/switcher.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313

1414
/**
1515
* Form Field class for the Joomla Platform.
16-
* Provides radio button inputs
16+
* Provides switcher inputs
1717
*
1818
* @link http://www.w3.org/TR/html-markup/command.radio.html#command.radio
19-
* @since 11.1
19+
* @since __DEPLOY_VERSION__
2020
*/
2121
class JFormFieldSwitcher extends JFormFieldList
2222
{
@@ -37,7 +37,7 @@ class JFormFieldSwitcher extends JFormFieldList
3737
protected $layout = 'joomla.form.field.switcher';
3838

3939
/**
40-
* Method to get the radio button field input markup.
40+
* Method to get the switcher field input markup.
4141
*
4242
* @return string The field input markup.
4343
*

media/vendor/codemirror/addon/comment/comment.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)