David Yip a6fb1c58ee Merge remote-tracking branch 'origin/master' into merge-upstream ...

Conflicts:
	.env.production.sample
	app/controllers/auth/confirmations_controller.rb
	db/schema.rb

2018-02-04 16:36:19 -06:00

..

_mixins.scss

Restore vanilla components

2017-11-17 19:29:16 -08:00

about.scss

Fix padding bug in landing page column header (#6374)

2018-01-29 01:10:59 +01:00

accounts.scss

Fix font-weight of <strong> element for CJK fonts (#5914)

2017-12-07 16:01:52 +01:00

admin.scss

Fix overflowing audit logs (#6184)

2018-01-04 19:38:46 +01:00

basics.scss

Restore vanilla components

2017-11-17 19:29:16 -08:00

boost.scss

Restore vanilla components

2017-11-17 19:29:16 -08:00

compact_header.scss

Restore vanilla components

2017-11-17 19:29:16 -08:00

components.scss

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

2018-02-02 08:39:52 -06:00

containers.scss

Restore vanilla components

2017-11-17 19:29:16 -08:00

emoji_picker.scss

Fix emoji picker scrollbar (regression from #5046) (#5901)

2017-12-06 12:18:27 +01:00

footer.scss

Restore vanilla components

2017-11-17 19:29:16 -08:00

forms.scss

CAS + SAML authentication feature (#6425)

2018-02-04 05:42:13 +01:00

landing_strip.scss

Fix font-weight of <strong> element for CJK fonts (#5914)

2017-12-07 16:01:52 +01:00

lists.scss

Restore vanilla components

2017-11-17 19:29:16 -08:00

modal.scss

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-01-19 15:22:10 -06:00

reset.scss

Restore vanilla components

2017-11-17 19:29:16 -08:00

rtl.scss

Fix layout for RTL (#6014)

2017-12-13 18:28:13 +01:00

stream_entries.scss

Fix font-weight of <strong> element for CJK fonts (#5914)

2017-12-07 16:01:52 +01:00

tables.scss

Fix font-weight of <strong> element for CJK fonts (#5914)

2017-12-07 16:01:52 +01:00

variables.scss

ReFix font-weight of <strong> element for CJK fonts (#5920)

2017-12-07 21:35:19 +01:00