Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
96befdd
Added grunt for compiling
Aug 16, 2024
2be1f64
Added DXB-Slider to theme
Aug 19, 2024
93c9d92
Removed jQuery from Drupal.behaviors.dxpr_themeSettingsColors
Aug 19, 2024
05f3c9c
Replaced jQuery vith vanilla JS for no preview icons
Aug 19, 2024
8804f2d
Replaced jQuery with vanilla JS for massageValue()
Aug 20, 2024
af81b3f
Replaced jQuery with vanilla JS for getCssVariables()
Aug 20, 2024
b4e3420
Replaced jQuery with vanilla JS for toggleElement()
Aug 20, 2024
447de57
Added roughly DXP-slider
Aug 21, 2024
9285b42
Changed dxb-slider.js to work correctly with decimals and modified co…
Aug 21, 2024
9f36db9
Styled new sliders
Aug 21, 2024
7d1af34
Replaced all sliders from bootstrap to DXB
Aug 21, 2024
aad1e2c
Replaced new commit of DXB slider what fixes decimal issues
Aug 22, 2024
a35cfd9
Replaced bootstrap-slider relayout() with relayoutSlider()
Aug 22, 2024
09cd18b
Replaced jQuery to Vanilla JS in Typographic Scale Master Slider
Aug 22, 2024
5972f86
Replaced all jQuery with vanilla JS dxpr-theme-settings.admin.js
Aug 22, 2024
4e4fd6d
Fixed all live preview sliders
Aug 23, 2024
90eedda
Completely removed the boostrap-slider
Aug 23, 2024
531d080
Replaced jQuery with Vanilla JS in dxpr-theme-full-screen-search.js
Aug 23, 2024
a969faf
Replaced jQuery with Vanilla JS in dxpr-theme-header.js
Aug 26, 2024
6ef503d
Removed all jquery except from animate.css and eslint
Aug 26, 2024
c94861e
Replaced animate.css with custom animations-dxpr.css animation
Aug 26, 2024
0eb6e03
Removed additional jquery
Aug 26, 2024
f79b805
Replaced core/modernizr with vendor/modernizr
Aug 26, 2024
98b6308
Merge branch '6.x' into drale1/6.x/#526-jQuery-free-and-implement-DXB…
drale1 Aug 27, 2024
99abe1f
Updated DXB Slider with newest version
Sep 2, 2024
5733c96
After eslint fix
Sep 2, 2024
8e4808e
Added touchstart and Rect in .eslintrc for skipping
Sep 3, 2024
2643831
Added shell script for updating DXB-slider and changed dxpr_theme.lib…
Sep 6, 2024
ede3a1a
Refactor slider initialization to use direct input elements with 'ran…
Sep 6, 2024
5031f71
Resolved merge conflicts between drale1/6.x/#526-jQuery-free-and-impl…
Sep 7, 2024
a04c975
Update package-lock.json
deuxcode Sep 10, 2024
f2d974a
Fixed scss files using stylelint and page_title-theme-settings.inc
Sep 10, 2024
1211672
Fixed issues according to drupal-lint page_title-theme-settings.inc
Sep 11, 2024
e5d90e3
Fixed issues according to drupal-lint page_title-theme-settings.inc C…
Sep 11, 2024
3f2b85f
Replaced change with input on few places, removed console.log and pre…
Sep 12, 2024
562263b
Fixed bug Divider Spacing missing unit px
Sep 12, 2024
aae71ce
Added modernizr override and minified
Sep 12, 2024
e817d8a
Moved update-dxb-slider.sh to scripts folder
Sep 12, 2024
9913219
Returned dxpr-theme-tabs.js lines to Gruntfile.js from remote branch 6.x
Sep 14, 2024
f2b9909
Fix live slider update issue: Apply changes immediately while dragging
Sep 17, 2024
0d7b83c
Restored core Modernizr dependency and ensured it loads before other …
Sep 17, 2024
fb76931
Removed console.log
Sep 17, 2024
28f35f5
Removed modernizr from dxpr_theme.libraries.yml
Sep 18, 2024
edabd26
Refactor slider initialization by centralizing configuration into a s…
Sep 18, 2024
fe8cf92
After eslint fix
Sep 18, 2024
2a8a46f
After eslint fix CORRECT
Sep 19, 2024
a00f9c2
Returned - core/modernizr as dependency in dxpr_theme.libraries.yml
Sep 20, 2024
a99d55e
Removed residual jquery-ui.scss
Sep 23, 2024
d9ad0e0
Fixed typography sliders on mobile (<768)
Sep 23, 2024
a6846dd
Fixed live slider implementation on Body Font Size, Main menu Font Si…
Sep 23, 2024
ce9be39
Fixed live slider Typography > Divider Position
Sep 24, 2024
58fcd48
Fixed background typo
Sep 24, 2024
8a94374
Commented non existing sliders in dxpr-theme-settings.admin.js and re…
Sep 24, 2024
5300076
Prevent sliders box-max-width and layout-max-width to be dynamic
Sep 24, 2024
e0b51b9
Removed no preview icon from page-title-breadcrumbs
Sep 24, 2024
b7237b8
I've put back a part of the code that works together with the divider…
Sep 26, 2024
184ccce
Replaced --dxt-setting- with dynamic cssVarSettingsPrefix constant on…
Sep 26, 2024
55c8394
Fixed dynamic sliders on Sticky header Height Background Opacity
Sep 28, 2024
0443640
Fixed duplicate slider variables, corrected slider type names, and up…
Oct 6, 2024
861210f
After eslint fix
Oct 6, 2024
bc53dcf
Fixing sliders headings-letter-spacing header-side-width and header-s…
Oct 7, 2024
31b515d
fix invalid selector "> li because it was causing js error"
Oct 15, 2024
c475cf1
example DXB Slider implementation
Oct 15, 2024
416e3a1
Fixed sliders on layout-theme-settings.inc and header-theme-settings.inc
Oct 17, 2024
daed500
Fixed sliders on page_title-theme-settings.inc
Oct 17, 2024
b55e622
Fixed sliders on typography-theme-settings.inc
Oct 17, 2024
17a34f4
Fixed sliders on block-design-theme-settings.inc
Oct 17, 2024
579aa13
Small fix and commenting js generating sliders
Oct 17, 2024
be984c0
After eslint and drupal-lint; Removed commented code on dxpr-theme-se…
Oct 17, 2024
6796886
Merge remote-tracking branch 'origin/drale1/6.x/#526-jQuery-free-and-…
Oct 17, 2024
cfb399f
Fixed live slider change
Oct 18, 2024
37e8ba3
Additionally fixed layout-theme-settings.inc header-theme-settings.inc
Oct 18, 2024
c59ab3d
Additionally fixed page_title-theme-settings.inc typography-theme-set…
Oct 18, 2024
6bf22ff
Additionally fixed block-design-theme-settings.inc
Oct 18, 2024
85e1917
Added novalidate attribute to fix saving issue with sliders
Oct 19, 2024
5721f16
Fixed flex displaying in Typography
Oct 19, 2024
9d700c2
Fixed eslint issue and removed dynamic change from box-max-width layo…
Oct 20, 2024
3ed7801
fix grunt setup
Oct 21, 2024
fd88e07
Fix: Set Block Preset to custom only when a change is detected in Blo…
Oct 22, 2024
e1a428c
Hide divider sliders when block_divider and block_divider_custom are …
Oct 22, 2024
6b52445
Hide 'Boxed Container Max-width' slider when 'boxed_layout' is unchecked
Oct 22, 2024
83e23d2
Fixed Sticky Header Height max to 200
Oct 22, 2024
be11313
After eslint and drupal lint
Oct 22, 2024
aa85d0a
Removed eye from no-preview class from children from .form-radios and…
Oct 29, 2024
4e50e88
Manually removed eye from class no-preview in block_card and block_di…
Oct 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 19 additions & 17 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
{
"parser": "@babel/eslint-parser",
"plugins": [
"jquery",
"prettier",
"spellcheck"
],
"extends": [
"airbnb",
"plugin:jquery/deprecated",
"prettier"
],
"rules": {
Expand All @@ -28,7 +26,7 @@
"no-constant-condition": 2,
"no-new": 0,
"no-param-reassign": 0,
"no-shadow" : 2,
"no-shadow": 2,
"no-undef": 2,
"no-underscore-dangle": 0,
"no-unused-vars": [2, {"vars": "local", "args": "none"}],
Expand Down Expand Up @@ -56,20 +54,25 @@
"identifiers": false,
"lang": "en_US",
"skipWords": [
"accessor",
"checkbox",
"dom",
"dropdown",
"Drupal",
"DXPR",
"Glyphicons",
"accessor",
"checkbox",
"dom",
"dropdown",
"Drupal",
"DXPR",
"Glyphicons",
"jslint",
"Jur",
"Jur",
"multivar",
"namespace",
"Pixeden",
"namespace",
"Pixeden",
"plusplus",
"undef"
"undef",
"touchstart",
"Rect",
"Breakpoint",
"keyup",
"calc"
],
"skipIfMatch": [
"{\\w+}", // E.g. "{paramName}"
Expand Down Expand Up @@ -97,7 +100,6 @@
"DXPRTextEditor": true,
"fetch": true,
"getBootstrapBreakPoints": true,
"jQuery": true,
"liveEditingManager": true,
"matchMedia": true,
"Modernizr": true,
Expand All @@ -107,5 +109,5 @@
"Twig": true,
"window": true,
"WOW": true
},
}
}
}
119 changes: 68 additions & 51 deletions Gruntfile.js
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know some of these changes was in relation to the lint checks issue, but after the main merge, none of these changes are actually relevant to the issue. This whole file can be reverted.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a note that this file doesn't actually contain any relevant changes, but we can keep it as is.

Original file line number Diff line number Diff line change
@@ -1,89 +1,106 @@
module.exports = function(grunt) {
const sass = require('sass');
const sass = require("sass");
const autoprefixer = require("autoprefixer");
const postcssPxtorem = require("postcss-pxtorem");

module.exports = function (grunt) {
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
pkg: grunt.file.readJSON("package.json"),
babel: {
options: {
sourceMap: false
sourceMap: false,
},
dist: {
files: {
'js/minified/dxpr-theme-full-screen-search.min.js': 'js/dist/dxpr-theme-full-screen-search.js',
'js/minified/dxpr-theme-header.min.js': 'js/dist/dxpr-theme-header.js',
'js/minified/dxpr-theme-multilevel-mobile-nav.min.js': 'js/dist/dxpr-theme-multilevel-mobile-nav.js',
'js/minified/dxpr-theme-settings.admin.min.js': 'js/dist/dxpr-theme-settings.admin.js',
'js/minified/dxpr-theme-tabs.min.js': 'js/dist/dxpr-theme-tabs.js',
}
}
"js/minified/dxpr-theme-full-screen-search.min.js":
"js/dist/dxpr-theme-full-screen-search.js",
"js/minified/dxpr-theme-header.min.js":
"js/dist/dxpr-theme-header.js",
"js/minified/dxpr-theme-multilevel-mobile-nav.min.js":
"js/dist/dxpr-theme-multilevel-mobile-nav.js",
"js/minified/dxpr-theme-settings.admin.min.js":
"js/dist/dxpr-theme-settings.admin.js",
"js/minified/dxpr-theme-tabs.min.js": "js/dist/dxpr-theme-tabs.js",
},
},
},
terser: {
options: {
ecma: 2015
ecma: 2015,
},
main: {
files: {
'js/minified/classie.min.js': ['vendor/classie.js'],
'js/minified/dxpr-theme-full-screen-search.min.js': ['js/minified/dxpr-theme-full-screen-search.min.js'],
'js/minified/dxpr-theme-header.min.js': ['js/minified/dxpr-theme-header.min.js'],
'js/minified/dxpr-theme-multilevel-mobile-nav.min.js': ['js/minified/dxpr-theme-multilevel-mobile-nav.min.js'],
'js/minified/dxpr-theme-settings.admin.min.js': ['js/minified/dxpr-theme-settings.admin.min.js'],
'js/minified/dxpr-theme-tabs.min.js': ['js/minified/dxpr-theme-tabs.min.js'],
}
}
"js/minified/classie.min.js": ["vendor/classie.js"],
"js/minified/dxpr-theme-full-screen-search.min.js": [
"js/minified/dxpr-theme-full-screen-search.min.js",
],
"js/minified/dxpr-theme-header.min.js": [
"js/minified/dxpr-theme-header.min.js",
],
"js/minified/dxpr-theme-multilevel-mobile-nav.min.js": [
"js/minified/dxpr-theme-multilevel-mobile-nav.min.js",
],
"js/minified/dxpr-theme-settings.admin.min.js": [
"js/minified/dxpr-theme-settings.admin.min.js",
],
"js/minified/dxpr-theme-tabs.min.js": [
"js/minified/dxpr-theme-tabs.min.js",
],
},
},
},
sass: {
options: {
implementation: sass,
sourceMap: false,
outputStyle: 'compressed'
outputStyle: "compressed",
},
dist: {
files: [{
expand: true,
cwd: 'scss/',
src: '**/*.scss',
dest: 'css/',
ext: '.css',
extDot: 'last'
}]
}
files: [
{
expand: true,
cwd: "scss/",
src: "**/*.scss",
dest: "css/",
ext: ".css",
extDot: "last",
},
],
},
},
postcss: {
options: {
processors: [
require('autoprefixer'),
require('postcss-pxtorem')({
autoprefixer,
postcssPxtorem({
rootValue: 16, // The root element font size.
unitPrecision: 5, // The decimal precision.
propList: ['*'], // Properties to convert.
propList: ["*"], // Properties to convert.
selectorBlackList: [], // Selectors to ignore.
replace: true, // Replace the original value.
mediaQuery: true, // Allow px to be converted in media queries.
minPixelValue: 0 // Set the minimum pixel value to replace.
})
]
minPixelValue: 0, // Set the minimum pixel value to replace.
}),
],
},
dist: {
src: 'css/**/*.css'
}
src: "css/**/*.css",
},
},
watch: {
css: {
files: ['scss/*.scss', 'scss/**/*.scss'],
tasks: ['sass', 'postcss']
files: ["scss/*.scss", "scss/**/*.scss"],
tasks: ["sass", "postcss"],
},
js: {
files: ['js/dist/*.js'],
tasks: ['babel', 'terser']
}
}
files: ["js/dist/*.js"],
tasks: ["babel", "terser"],
},
},
});

grunt.loadNpmTasks('grunt-babel');
grunt.loadNpmTasks('grunt-terser');
grunt.loadNpmTasks('grunt-sass');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('@lodder/grunt-postcss');
grunt.registerTask('default', ['watch']);
grunt.loadNpmTasks("grunt-babel");
grunt.loadNpmTasks("grunt-terser");
grunt.loadNpmTasks("grunt-sass");
grunt.loadNpmTasks("grunt-contrib-watch");
grunt.loadNpmTasks("@lodder/grunt-postcss");
grunt.registerTask("default", ["watch"]);
};
1 change: 0 additions & 1 deletion config/install/dxpr_theme.settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -210,5 +210,4 @@ hidden_regions:
popover_placement: top
tooltip_placement: 'auto top'
modal_enabled: 0
modal_jquery_ui_bridge: 0
cdn_provider: ''
1 change: 1 addition & 0 deletions css/animations-dxpr.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading