Commit Graph

14 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
Joffrey JAFFEUX a239900522
UI: reduces category row description margin (#9834) 2020-05-19 20:44:54 +02:00
Joffrey JAFFEUX bd0abddf6f
UX: attempts to have a better use of available space with sk (#9639) 2020-05-05 12:59:47 +02:00
Joffrey JAFFEUX 82b43451b3
FIX: Inner content of a row could have no max-width and be very large (#9532) 2020-04-23 19:18:01 +02:00
Kris 10c2087a02 UX: Prevent category dropdown from wrapping count, limit mobile width 2020-04-13 17:23:37 -04:00
Krzysztof Kotlarek f59647cd55
FIX: move IE specific CSS rules to discourse-internet-explorer plugin (#8567) 2019-12-18 15:25:16 +11:00
Joe 59950b0f95
UX: category description display issue
html tags like `<strong>` are displayed on separate lines inside a flexbox with `flex-wrap`
2018-07-10 13:51:46 +08: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
Kris f587fb7cc7 FIX: Select-kit category dropdown issues in IE11 2018-01-26 15:51:44 -05:00
Joffrey JAFFEUX 262f795a4b
FIX: better handling of collection height 2018-01-24 16:42:13 +01:00
Joffrey JAFFEUX 3a290ee625
FEATURE: replaces category/tag dropdowns by select-kit 2018-01-24 11:48:20 +01:00
Joffrey JAFFEUX f06f7161ea
FIX: category badge when using box style on long category names 2018-01-22 18:26:54 +01:00
Joffrey JAFFEUX 3a7d2da633
FIX: category badges css refactoring/fixes
This commit fixes multiple css issues with category badges in select-kit and outside of select-kit. It also contains refactoring of components impacted by those changes.
2018-01-11 13:05:29 +01:00