Skip to content

Conversation

@brianteeman
Copy link
Contributor

@brianteeman brianteeman commented May 2, 2016

Redo to resolve merge conflicts in #9871

@zero-24 can you retest this please to make sure I didnt miss anything in this redo

@zero-24
Copy link
Contributor

zero-24 commented May 2, 2016

@brianteeman i have just send you a PR for travis i will try to test this evening.

@andrepereiradasilva
Copy link
Contributor

travis still not happy

@brianteeman
Copy link
Contributor Author

travis is happy now

@zero-24
Copy link
Contributor

zero-24 commented May 3, 2016

I have tested this item ✅ successfully on 8f74e98

Works good! Thanks


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

@brianteeman
Copy link
Contributor Author

Moving to RTC as it was already tested before the redo for merge conflicts


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

@joomla-cms-bot joomla-cms-bot added the RTC This Pull Request is Ready To Commit label May 3, 2016
@brianteeman brianteeman added this to the Joomla! 3.6.0 milestone May 3, 2016
@rdeutz rdeutz merged commit 57025c3 into joomla:staging May 3, 2016
@brianteeman brianteeman deleted the sass3 branch May 3, 2016 09:34
@brianteeman brianteeman added Feature and removed RTC This Pull Request is Ready To Commit labels May 9, 2016
@C-Lodder
Copy link
Member

C-Lodder commented Nov 2, 2016

The SQL files also need updating too.

https://github.com/joomla/joomla-cms/blob/staging/installation/sql/mysql/joomla.sql#L506

"source_formats":"txt,less,ini,xml,js,php,css"

replace with:

"source_formats":"txt,less,ini,xml,js,php,css,sass,scss"

Unless this is done, people will manually need to go to the Template Options and manually add them.

Add a .scss or .sass to the Isis template directory and you'll notice it doesn't display the file when viewing the folder/files in the Template Manager.

@zero-24
Copy link
Contributor

zero-24 commented Nov 2, 2016

Correct for 3.x we need to do this as we cant and should not override the entry in the database that maybe has ben changed to something different.

@zero-24
Copy link
Contributor

zero-24 commented Nov 2, 2016

Ahhh ok i got you point now. I'm on a PR :)

@alikon
Copy link
Contributor

alikon commented Nov 2, 2016

@zero-24 maybe this time more fast than you... bored on train....

@zero-24
Copy link
Contributor

zero-24 commented Nov 2, 2016

Thanks 👍

zero-24 pushed a commit that referenced this pull request Nov 2, 2016
* support for scss,sass source formats

#10186 (comment)

* support for scss,sass source formats

* support for scss,sass source formats 

support for scss,sass source formats

* support for scss,sass source formats 

support for scss,sass source formats

* support for scss,sass source formats 

support for scss,sass source formats

* support for scss,sass source formats 

support for scss,sass source formats

* support for scss,sass source formats 

support for scss,sass source formats

* support for scss,sass source formats 

support for scss,sass source formats

* remove the full param update

* remove the full param update

* remove the full param update
nvyush pushed a commit to nvyush/joomla-cms that referenced this pull request Nov 9, 2016
* support for scss,sass source formats

joomla#10186 (comment)

* support for scss,sass source formats

* support for scss,sass source formats 

support for scss,sass source formats

* support for scss,sass source formats 

support for scss,sass source formats

* support for scss,sass source formats 

support for scss,sass source formats

* support for scss,sass source formats 

support for scss,sass source formats

* support for scss,sass source formats 

support for scss,sass source formats

* support for scss,sass source formats 

support for scss,sass source formats

* remove the full param update

* remove the full param update

* remove the full param update
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Feature Language Change This is for Translators

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants