Conflicting Files ? Pending

User tests: Successful: Unsuccessful:

avatar ciar4n
ciar4n
24 Oct 2019

Pull Request for Issue #26759 .

Summary of Changes

Consistent line-breaks, indents, and spacing across all Atum template SCSS using the following...

"end_with_newline": true,
"indent_char": " ",
"indent_size": 2,
"newline_between_rules": true,
"selector_separator_newline": true,
"space_around_combinator": true,

Testing Instructions

Code review

avatar ciar4n ciar4n - open - 24 Oct 2019
avatar ciar4n ciar4n - change - 24 Oct 2019
Status New Pending
avatar joomla-cms-bot joomla-cms-bot - change - 24 Oct 2019
Category Administration Templates (admin)
avatar Quy
Quy - comment - 20 Nov 2019

Please fix conflicts.

avatar ciar4n ciar4n - change - 24 Nov 2019
Labels Added: ?
avatar ciar4n
ciar4n - comment - 24 Nov 2019

Conflicts fixed

avatar Quy Quy - test_item - 24 Nov 2019 - Tested successfully
avatar Quy
Quy - comment - 24 Nov 2019

I have tested this item successfully on 57334fe


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/26793.

avatar wilsonge
wilsonge - comment - 18 Jan 2020

Sorry I just came back to this :( shouldn’t have merged the other part first, if you do this and ping me wildly I’ll try and get it merged fast this time :(

avatar ciar4n
ciar4n - comment - 19 Jan 2020

If you don't mind, Im gonna close this and create a new pr. Hard negotiating some of these conflicts.

avatar ciar4n ciar4n - change - 19 Jan 2020
Status Pending Closed
Closed_Date 0000-00-00 00:00:00 2020-01-19 12:01:33
Closed_By ciar4n
Labels Added: Conflicting Files
avatar ciar4n ciar4n - close - 19 Jan 2020
avatar wilsonge
wilsonge - comment - 21 Jan 2020

Sure. Just ping me when it's in and i'll try and get it in asap

Add a Comment

Login with GitHub to post a comment