Merge pull request 'Merci Xefir ?!!' (#15 ) from color into master

Reviewed-on: #15
Merge pull request 'franchement, je n'y crois plus ...' (#14 ) from color into master
2024-02-04 13:58:20 +00:00 · 2024-02-03 11:58:31 +00:00 · 2024-02-03 11:52:32 +00:00 · 2024-02-03 11:49:58 +00:00 · 2024-02-03 11:45:49 +00:00 · 2024-02-03 11:41:29 +00:00
3 changed files with 8 additions and 2 deletions
--- a/.discourse-compatibility
+++ b/.discourse-compatibility
@ -0,0 +1 @@
+< 3.2.0.beta2: 1cc5d51137652c3977640f064739a08b1d1fe1be
--- a/desktop/desktop.scss
+++ b/desktop/desktop.scss
@ -6,7 +6,7 @@
  margin-right: 5px;
 }

-[data-wrap="columns"] > p, [data-wrap="floatl"] > p, [data-wrap="floatr"] > p {
+[data-wrap="columns"] > p, [data-wrap="floatl"] > p, [data-wrap="floatr"] > p, [data-wrap="floatc"] > p {
    margin-top: 0;
    margin-bottom: 0;
 }
@ -20,3 +20,7 @@
  float: right;
  margin-left: 10px;
 }
+
+[data-wrap="floatc"] {
+  clear: both;
+}
--- a/mobile/mobile.scss
+++ b/mobile/mobile.scss
@ -14,4 +14,5 @@

 [data-wrap="floatr"] {
 }
-
+[data-wrap="floatc"] {
+}
Author	SHA1	Message	Date
Esenjin_Asakha	fbc0b6f741	Merge pull request 'Merci Xefir ?!!' (#15 ) from color into master Reviewed-on: #15	2024-02-04 13:58:20 +00:00
Esenjin_Asakha	76d29a0dab	Merge pull request 'franchement, je n'y crois plus ...' (#14 ) from color into master Reviewed-on: #14	2024-02-03 11:58:31 +00:00
Esenjin_Asakha	b0aa329c42	Merge pull request 'on avance .. je crois ..' (#13 ) from color into master Reviewed-on: #13	2024-02-03 11:52:32 +00:00
Esenjin_Asakha	0955e2cfc3	Merge pull request 'je ne galère presque pas non ..' (#12 ) from color into master Reviewed-on: #12	2024-02-03 11:49:58 +00:00
Esenjin_Asakha	776f8a2844	Merge pull request 'vois-je le bout du tunnel ?' (#11 ) from color into master Reviewed-on: #11	2024-02-03 11:45:49 +00:00
Esenjin_Asakha	73770ff339	Merge pull request 'est-ce mieux ?' (#10 ) from color into master Reviewed-on: #10	2024-02-03 11:41:29 +00:00
Esenjin_Asakha	dacd97fd7b	Merge pull request 'chatgpt m'as-tu sauvé ?' (#9 ) from color into master Reviewed-on: #9	2024-02-03 11:36:25 +00:00
Esenjin_Asakha	d7cdaa9856	Merge pull request 'et là tu fais quoi ?!' (#8 ) from color into master Reviewed-on: #8	2024-02-03 11:26:32 +00:00
Esenjin_Asakha	816e6bc85a	Merge pull request 'et maintenant ? c'est ok ? =D' (#7 ) from color into master Reviewed-on: #7	2024-02-03 11:17:12 +00:00
Esenjin_Asakha	55b9205d2b	Merge pull request 'merci chatgpt ?' (#6 ) from color into master Reviewed-on: #6	2024-02-03 11:08:02 +00:00
Esenjin_Asakha	7bdc97dbd5	Merge pull request 'Revert "et comme ça ? T_T"' (#5 ) from color into master Reviewed-on: #5	2024-02-03 10:56:26 +00:00
Esenjin_Asakha	5f271cb06b	Merge pull request 'et comme ça ? T_T' (#4 ) from color into master Reviewed-on: #4	2024-02-03 10:55:11 +00:00
Esenjin_Asakha	047a5a6359	Merge pull request '(-) trad fr' (#3 ) from color into master Reviewed-on: #3	2024-02-03 10:44:41 +00:00
Esenjin_Asakha	c8b4156eba	Merge pull request 'mieux comme ça ?' (#2 ) from color into master Reviewed-on: #2	2024-02-03 10:41:10 +00:00
Esenjin	2ec1ebccc6	Merge branch 'color' # Conflicts: # desktop/head_tag.html # mobile/head_tag.html	2024-02-03 11:27:02 +01:00
Steven (Mon-Discourse)	3f167f5242	Merge pull request #12 from Arkshine/user-new-api DEV: Switch to new addComposerToolbarPopupMenuOption plugin API	2023-11-07 13:31:56 +01:00
Arkshine	0a735d72d9	DEV: Switch to new addComposerToolbarPopupMenuOption plugin API	2023-11-07 00:05:58 +01:00
Steven (Mon-Discourse)	1cc5d51137	Merge pull request #11 from kewisch/floatclear Offer floatc to clear floats	2023-08-25 19:19:49 +02:00
Philipp Kewisch	d0f1138305	Offer floatc to clear floats	2023-08-25 16:59:34 +02:00
mondiscourse	65cb9b10e7	Merge branch 'master' of https://github.com/MonDiscourse/md-composer-extras	2023-01-16 18:58:17 +01:00
mondiscourse	7ff1bf5869	FIX "sup" on mobile Reported by Dan DeMontmorency on meta	2023-01-16 18:58:14 +01:00
Steven (Mon-Discourse)	796fe3e2f7	Merge pull request #10 from pfaffman/patch-1 Update head_tag.html	2022-03-03 21:20:57 +01:00
Jay Pfaffman	bd353201e3	Update head_tag.html Fixes: ``` To prevent errors in tests, add a `pluginId` key to your `modifyClass` call. This will ensure the modification is only applied once. ```	2022-03-03 06:20:43 -08:00
				`@ -0,0 +1 @@`
				`< 3.2.0.beta2: 1cc5d51137652c3977640f064739a08b1d1fe1be`