Skip to content

Studio HTTPS Fonts (re-enable) - #1975

Merged
singingwolfboy merged 1 commit into
masterfrom
db/revert-revert-https-fonts
Dec 22, 2013
Merged

Studio HTTPS Fonts (re-enable)#1975
singingwolfboy merged 1 commit into
masterfrom
db/revert-revert-https-fonts

Conversation

@singingwolfboy

Copy link
Copy Markdown
Contributor

Now that #1966 is merged, the tests should pass.

Reviewers: @marcotuts @talbs

@tusbar

tusbar commented Dec 18, 2013

Copy link
Copy Markdown
Contributor

I think that #1956 is a better way to fix this issue since this version of saas supports CSS imports.

@singingwolfboy

Copy link
Copy Markdown
Contributor Author

@tusbar should I remove the changes to _fonts.scss from this PR? There's still a change to tiny-mce.css that we can keep.

@singingwolfboy

Copy link
Copy Markdown
Contributor Author

Now that #1956 has been merged, I rebased this PR and dropped the changes to _fonts.scss.

@talbs

talbs commented Dec 20, 2013

Copy link
Copy Markdown
Contributor

@tusbar, thanks so much for your help in cleaning up our web font references. I agree that the syntax used in #1956 is what we want to apply to common/static/css/tiny-mce.css as well.

I've talked to @singingwolfboy, and we settled on me testing out that syntax in a new PR (which I'll reference here). We'll then rebase this PR onto master/that work to make sure you're added to our contributors list officially (to acknowledge all of the help you've provided).

I'll be in touch shortly with a new PR reference. Feel free to review that work as well. Thanks again!

@talbs

talbs commented Dec 21, 2013

Copy link
Copy Markdown
Contributor

Hi, all.

I've merged in #2019. @singingwolfboy, mind rebasing and removing common/static/css/tiny-mce.css from changed files in this PR as we talked about? This PR will essentially be then getting @tusbar the proper recognition he deserves for helping make these bits better. Thanks again, @tusbar!

To acknowledge his help with refactoring URLs in our CSS to be
protocol-relative
singingwolfboy added a commit that referenced this pull request Dec 22, 2013
@singingwolfboy
singingwolfboy merged commit abdc5d1 into master Dec 22, 2013
@singingwolfboy
singingwolfboy deleted the db/revert-revert-https-fonts branch May 5, 2014 14:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants