Commit Graph

8 Commits

Author SHA1 Message Date
Michael Brown d9a02d1336
Revert "Revert "Merge branch 'master' of https://github.com/discourse/discourse""
This reverts commit 20780a1eee.

* SECURITY: re-adds accidentally reverted commit:
  03d26cd6: ensure embed_url contains valid http(s) uri
* when the merge commit e62a85cf was reverted, git chose the 2660c2e2 parent to land on
  instead of the 03d26cd6 parent (which contains security fixes)
2020-05-23 00:56:13 -04:00
Jeff Atwood 20780a1eee Revert "Merge branch 'master' of https://github.com/discourse/discourse"
This reverts commit e62a85cf6f, reversing
changes made to 2660c2e21d.
2020-05-22 20:25:56 -07:00
Kris eef47a26d9 UX: More consistent mobile banner/alert styles, css cleanup 2020-05-20 17:17:47 -04:00
Kris 7d92fa3a5e Mobile SCSS cleanup and removing unused styles 2019-01-23 14:36:53 -05:00
Joffrey JAFFEUX 174d392e5a
DEV: adds prettier (#5956)
Run `prettier --write "app/assets/stylesheets/**/*.scss" "plugins/**/*.scss"` after making sure you installed it with `yarn`

It's recommended to configure your editor to run prettier on file save.
2018-06-08 11:49:31 +02:00
Jeff Atwood 567bc70391 make #banner full width on mobile 2015-10-22 14:37:00 -07:00
Régis Hanol 38f52f0f8e FIX: banner topic's max-width & max-height on both mobile & desktop 2014-08-28 16:15:48 +02:00
Régis Hanol 4f60eb6c77 FIX: banner on mobile 2014-08-08 12:31:32 +02:00