Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
fd71e2e
brb
dgrammatiko Jan 31, 2022
1537b8c
pfff
dgrammatiko Jan 31, 2022
cc50aa4
stfu
dgrammatiko Jan 31, 2022
99b0dd1
enable the buttons again
dgrammatiko Jan 31, 2022
ef02f7b
Merge branch '4.1-dev' into 4.1-dev-fix-scss-div
dgrammatiko Feb 10, 2022
c7c76da
Update settings.json
dgrammatiko Feb 10, 2022
b2d74a2
Delete base.scss
dgrammatiko Feb 10, 2022
9ec387a
Delete choices.scss
dgrammatiko Feb 10, 2022
2cbc0f3
Update package.json
dgrammatiko Feb 10, 2022
c97ea0c
Update template.scss
dgrammatiko Feb 10, 2022
d323e56
Update _variables.scss
dgrammatiko Feb 10, 2022
322a2ec
Update fontawesome.scss
dgrammatiko Feb 10, 2022
635c3c3
Update joomla-fontawesome.scss
dgrammatiko Feb 10, 2022
1c83535
Update _variables.scss
dgrammatiko Feb 10, 2022
ae9ca99
Update settings.json
dgrammatiko Feb 10, 2022
470df6b
Update _metismenu.scss
dgrammatiko Feb 10, 2022
0b265f3
update the lock file
dgrammatiko Feb 10, 2022
bcc3ce8
Update codemirror.xml
dgrammatiko Feb 10, 2022
b896326
codemirror wrong version
dgrammatiko Feb 10, 2022
56eb971
Merge branch '4.1-dev-fix-scss-div' of github.com:dgrammatiko/joomla-…
dgrammatiko Feb 10, 2022
ea4dd99
Update build/media_source/com_media/scss/components/_media-infobar.scss
dgrammatiko Feb 11, 2022
65ccbab
Update build/media_source/templates/site/cassiopeia/scss/vendor/_chos…
dgrammatiko Feb 11, 2022
176a7a2
Update build/media_source/templates/site/cassiopeia/scss/vendor/metis…
dgrammatiko Feb 11, 2022
b1af679
Add the shims for B/C
dgrammatiko Feb 11, 2022
7df2fa6
Merge branch '4.1-dev-fix-scss-div' of github.com:dgrammatiko/joomla-…
dgrammatiko Feb 11, 2022
5799e92
Also here
dgrammatiko Feb 11, 2022
f743b5a
JS lint
dgrammatiko Feb 14, 2022
a64f70f
Fix it
dgrammatiko Feb 14, 2022
9f60419
Merge branch '4.1-dev' into 4.1-dev-fix-scss-div
dgrammatiko Feb 14, 2022
27eaa7b
Merge branch '4.1-dev' into 4.1-dev-fix-scss-div
dgrammatiko Feb 22, 2022
e9ba9c2
Merge branch '4.2-dev' into 36906-conflic-fix
roland-d Mar 9, 2022
5f4e32b
Merge pull request #11 from roland-d/36906-conflic-fix
dgrammatiko Mar 9, 2022
9b6d502
Merge branch '4.2-dev' into 4.1-dev-fix-scss-div
dgrammatiko Mar 9, 2022
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
7 changes: 7 additions & 0 deletions build/build-modules-js/init/patches.es6.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,11 @@ module.exports.patchPackages = async (options) => {
let ShortandsweetJs = await readFile(shortandsweetPath, { encoding: 'utf8' });
ShortandsweetJs = ShortandsweetJs.concat('shortAndSweet(\'textarea.charcount\', {counterClassName: \'small text-muted\'});');
await writeFile(shortandsweetPath, ShortandsweetJs, { encoding: 'utf8', mode: 0o644 });

// Include the v5 shim for Font Awesome
const faPath = join(mediaVendorPath, 'fontawesome-free/scss/fontawesome.scss');
const newScss = (await readFile(faPath, { encoding: 'utf8' })).concat(`
@import 'shims';
`);
await writeFile(faPath, newScss, { encoding: 'utf8', mode: 0o644 });
};
4 changes: 2 additions & 2 deletions build/media_source/com_media/scss/components/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
position: relative;
width: 100%;
min-height: 1px;
padding-right: ($col-gutter-width / 2);
padding-left: ($col-gutter-width / 2);
padding-right: $col-gutter-width * .5;
padding-left: $col-gutter-width * .5;
}

@media (min-width: var(--breakpoint-md)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
left: 0;
width: calc(#{$grid-item-icon-size} * 1.3);
height: calc(#{$grid-item-icon-size} * 1.3);
font-family: "Font Awesome 5 Free";
font-family: "Font Awesome 6 Free";
font-size: $grid-item-icon-size;
font-weight: 900;
line-height: calc(#{$grid-item-icon-size} * 1.3);
Expand Down Expand Up @@ -329,7 +329,7 @@
transition: all .2s cubic-bezier(.4, 0, .2, 1);
}
&::before {
font-family: "Font Awesome 5 Free";
font-family: "Font Awesome 6 Free";
color: $table-item-icon-color;
.selected & {
color: $table-item-icon-color-selected;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ $fa-css-prefix: fa;
dl {
display: flex;
flex-wrap: wrap;
margin-right: -($col-gutter-width / 2);
margin-left: -($col-gutter-width / 2);
margin-right: -($col-gutter-width * .5);
margin-left: -($col-gutter-width * .5);
}
dt, dd {
position: relative;
direction: ltr;
width: 100%;
min-height: 1px;
padding-right: ($col-gutter-width / 2);
padding-left: ($col-gutter-width / 2);
padding-right: $col-gutter-width * .5;
padding-left: $col-gutter-width * .5;
[dir=rtl] & {
text-align: end;
}
Expand Down
4 changes: 2 additions & 2 deletions build/media_source/com_media/scss/components/_media-tree.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ ul.media-tree {
display: block;
&::before {
position: absolute;
top: ($sidebar-tree-line-height / 2);
top: $sidebar-tree-line-height * .5;
left: 0;
width: 10px;
height: 1px;
Expand All @@ -61,7 +61,7 @@ ul.media-tree {
}
&:last-child {
&::after {
height: ($sidebar-tree-line-height / 2);
height: $sidebar-tree-line-height * .5;
}
}
li {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ table.phpdebugbar-widgets-languageStrings span.phpdebugbar-widgets-eye-dash {

table.phpdebugbar-widgets-languageStrings span.phpdebugbar-widgets-eye:before,
table.phpdebugbar-widgets-languageStrings span.phpdebugbar-widgets-eye-dash:before {
font-family:"Font Awesome 5 Free";
font-family:"Font Awesome 6 Free";
margin-right: 4px;
/*font-size: 12px;*/
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-eye:before,
div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-eye-dash:before,
div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-stmt-id:before,
div.phpdebugbar-widgets-sqlqueries a.phpdebugbar-widgets-editor-link:before {
font-family: "Font Awesome 5 Free";
font-family: "Font Awesome 6 Free";
margin-right: 4px;
font-size: 12px;
font-weight: 900;
Expand Down
4 changes: 2 additions & 2 deletions build/media_source/system/scss/fields/switcher.scss
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,12 @@ $switcher-height: 28px;
.switcher .toggle-inside {
position: absolute;
left: 0;
width: ($switcher-width - 6) / 2;
width: ($switcher-width - 6) * .5;
height: $switcher-height;
background: #fff;
transition: .4s ease all;
}

.switcher input ~ input:checked ~ .toggle-outside .toggle-inside {
left: ($switcher-width / 2) - 1;
left: ($switcher-width * .5) - 1;
}
2 changes: 1 addition & 1 deletion build/media_source/system/scss/joomla-fontawesome.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
$fa-font-path: "../../../media/vendor/fontawesome-free/webfonts" !default;
$fa-font-display: block !default;

// Font Awesome 5 Free
// Font Awesome 6 Free
@import "../../../../media/vendor/fontawesome-free/scss/fontawesome";
@import "../../../../media/vendor/fontawesome-free/scss/regular";
@import "../../../../media/vendor/fontawesome-free/scss/solid";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ body:not(.contentpane) .main-card {
// external links with icons
a[target="_blank"]::before {
padding-inline-end: 3px;
font-family: "Font Awesome 5 Free";
font-family: "Font Awesome 6 Free";
font-size: 14px;
font-weight: 900;
content: "\f35d";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

&::before {
margin-right: .5rem;
font-family: "Font Awesome 5 Free";
font-family: "Font Awesome 6 Free";
font-weight: 900;
content: "\f054";

Expand All @@ -33,7 +33,7 @@
&::after {
[dir="rtl"] & {
margin-inline-end: .5rem;
font-family: "Font Awesome 5 Free";
font-family: "Font Awesome 6 Free";
font-weight: 900;
content: "\f053";
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
align-items: center;
justify-content: center;
width: 2rem;
font-family: "Font Awesome 5 Free";
font-family: "Font Awesome 6 Free";
font-weight: 900;

[dir="ltr"] & {
Expand Down Expand Up @@ -267,7 +267,7 @@

.navbar-toggler-icon::before {
display: inline-block;
font: normal normal 900 28px/1 "Font Awesome 5 Free";
font: normal normal 900 28px/1 "Font Awesome 6 Free";
color: var(--toggle-color);
content: "\f00d";
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@

&::after {
width: 2.375rem;
font-family: "Font Awesome 5 Free";
font-family: "Font Awesome 6 Free";
font-weight: 900;
content: "\f078";
border: 0;
Expand Down Expand Up @@ -170,7 +170,7 @@
border-radius: 30px;

.toggler-toolbar-icon::before {
font: normal normal 900 28px/1 "Font Awesome 5 Free";
font: normal normal 900 28px/1 "Font Awesome 6 Free";
color: var(--toggle-color);
content: "\f00d";
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,19 @@
$fa-css-prefix: fa;
$fa-font-path: "../../../../../../vendor/fontawesome-free/webfonts" !default;

// Font Awesome 5 Free
// Font Awesome 6 Free
@import "../../../../../../../../media/vendor/fontawesome-free/scss/fontawesome";
@import "../../../../../../../../media/vendor/fontawesome-free/scss/regular";
@import "../../../../../../../../media/vendor/fontawesome-free/scss/solid";

// Brands must be imported last
@import "../../../../../../../../media/vendor/fontawesome-free/scss/brands";

// B/C with Font Awesome 5
@import "../../../../../../../../media/vendor/fontawesome-free/scss/shims";

// B/C for Icomoon
@import "../../../../../../system/scss/icomoon";
@import "../../../../../../../../media/system/scss/icomoon";

// RTL override
html[dir=rtl] .float-right {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
inset-inline-end: 1rem;
bottom: 1rem;
z-index: 10000;
padding: $cassiopeia-grid-gutter/2;
padding: $cassiopeia-grid-gutter * .5;
color: var(--cassiopeia-color-primary, $standard-color-primary);
pointer-events: all;
background-color: var(--white, $white);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
.grid-child {
align-items: center;
justify-content: space-between;
padding: 2.5rem ($cassiopeia-grid-gutter/2);
padding: 2.5rem ($cassiopeia-grid-gutter * .5);
}

a {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ a {
.btn-group {
margin-bottom: $cassiopeia-grid-gutter;
> input {
padding: $cassiopeia-grid-gutter/2;
padding: $cassiopeia-grid-gutter * .5;
border: 1px solid $gray-400;
@include border-start-radius($border-radius);
@include border-end-radius(0);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
}

.grid-child {
padding: ($cassiopeia-grid-gutter / 2);
padding: $cassiopeia-grid-gutter * .5;
}

nav {
padding: 0;
margin-top: $cassiopeia-grid-gutter / 2;
margin-top: $cassiopeia-grid-gutter * .5;
}

.site-description {
Expand Down Expand Up @@ -210,7 +210,7 @@
}

.container-search {
margin-top: $cassiopeia-grid-gutter / 2;
margin-top: $cassiopeia-grid-gutter * .5;
}

.mod-finder {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
position: relative;
> * {
flex: 1;
margin: ($cassiopeia-grid-gutter / 2) 0;
margin: ($cassiopeia-grid-gutter * .5) 0;
}

@include media-breakpoint-down(lg) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@
flex-wrap: wrap;
width: 100%;
padding: 0;
margin-right: -($cassiopeia-grid-gutter / 2);
margin-right: -($cassiopeia-grid-gutter * .5);
margin-bottom: $cassiopeia-grid-gutter;
margin-left: -($cassiopeia-grid-gutter / 2);
margin-left: -($cassiopeia-grid-gutter * .5);

@include media-breakpoint-up(lg) {
&.columns-2 {
Expand All @@ -113,7 +113,7 @@
.blog-item {
display: flex;
flex-direction: column;
padding: 0 ($cassiopeia-grid-gutter / 2) $cassiopeia-grid-gutter;
padding: 0 ($cassiopeia-grid-gutter * .5) $cassiopeia-grid-gutter;
overflow: hidden;

.boxed & {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@

&::after {
width: 2.375rem;
font-family: "Font Awesome 5 Free";
font-family: "Font Awesome 6 Free";
font-weight: 900;
content: "\f078";
border: 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ $chosen-select-padding-y: $form-select-padding-y + .21;
&::before {
position: absolute;
top: 6px;
right: ($chosen-multi-close-width / 4);
right: $chosen-multi-close-width * .25;
font-size: $font-size-base;
color: $white;
content: "\00d7";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
display: flex;
flex-wrap: wrap;
align-items: center;
padding: ($cassiopeia-grid-gutter/2) $cassiopeia-grid-gutter;
padding: ($cassiopeia-grid-gutter * .5) $cassiopeia-grid-gutter;
font-size: 1.1rem;
line-height: 1.5;

Expand Down Expand Up @@ -138,8 +138,8 @@
position: relative;
top: 0;
flex-basis: calc(100% + #{$cassiopeia-grid-gutter});
margin-top: ($cassiopeia-grid-gutter/2);
margin-bottom: ($cassiopeia-grid-gutter/-2);
margin-top: $cassiopeia-grid-gutter * .5;
margin-bottom: $cassiopeia-grid-gutter * -.5;
background-color: hsla(0, 0%, 0%, .03);
box-shadow: none;
}
Expand Down
3 changes: 3 additions & 0 deletions installation/template/scss/template.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ $fa-font-path: "../../../media/vendor/fontawesome-free/webfonts";
@import "../../../media/vendor/fontawesome-free/scss/solid";
@import "../../../media/vendor/fontawesome-free/scss/brands"; // order of loading is important.

// B/C with Font Awesome 5
@import "../../../media/vendor/fontawesome-free/scss/shims";

// B/C for Icomoon
@import "../../../build/media_source/system/scss/icomoon";

Expand Down
Loading