jenkins-bot has submitted this change and it was merged.
Change subject: Force word breaks in the various user content areas
......................................................................
Force word breaks in the various user content areas
Bug: 57962
Change-Id: I305137c97de89deef9426bede2409e048b60fe0e
---
A modules/base/styles/mixins/wordbreak.less
M modules/base/styles/preview.less
M modules/discussion/styles/post.less
M modules/discussion/styles/topic.less
M modules/header/styles/base.less
5 files changed, 28 insertions(+), 0 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/base/styles/mixins/wordbreak.less
b/modules/base/styles/mixins/wordbreak.less
new file mode 100644
index 0000000..89b6e6b
--- /dev/null
+++ b/modules/base/styles/mixins/wordbreak.less
@@ -0,0 +1,13 @@
+
+.wordbreak-all() {
+ word-wrap: break-word;
+ //
http://css-tricks.com/snippets/css/prevent-long-urls-from-breaking-out-of-container/
+ -ms-word-break: break-all;
+ /* Be VERY careful with this, breaks normal words wh_erever */
+ word-break: break-all;
+ /* Non standard for webkit */
+ word-break: break-word;
+ -webkit-hyphens: auto;
+ -moz-hyphens: auto;
+ hyphens: auto;
+}
diff --git a/modules/base/styles/preview.less b/modules/base/styles/preview.less
index 3472fb8..20638e0 100644
--- a/modules/base/styles/preview.less
+++ b/modules/base/styles/preview.less
@@ -1,4 +1,8 @@
+@import 'mixins/wordbreak.less';
+
.flow-content-preview {
+ .wordbreak-all();
+
background-color: #FDFFE7;
border: 1px solid #FCEB92;
padding: 5px;
diff --git a/modules/discussion/styles/post.less
b/modules/discussion/styles/post.less
index 9fad0b4..8c1193a 100644
--- a/modules/discussion/styles/post.less
+++ b/modules/discussion/styles/post.less
@@ -2,6 +2,7 @@
@import 'mediawiki.mixins.less';
@import 'mixins/moderation.less';
@import '../../base/styles/settings/paths.less';
+@import '../../base/styles/mixins/wordbreak.less';
.flow-post-container {
clear: both;
@@ -50,6 +51,9 @@
color: @post-content-color;
max-height: 2000px;
overflow: auto;
+ // force wordbreaks, don't allow extra long text to break out
+ // of the content box.
+ .wordbreak-all();
*:first-child {
margin-top: 0;
@@ -70,6 +74,7 @@
counter-increment: flow-mwNumberedExternalLinkNode;
}
+
// Make the last paragraph of a post inline in case we put a
// "content-modified" icon after it.
p:last-of-type {
diff --git a/modules/discussion/styles/topic.less
b/modules/discussion/styles/topic.less
index b6c87f6..96d7cb5 100644
--- a/modules/discussion/styles/topic.less
+++ b/modules/discussion/styles/topic.less
@@ -3,6 +3,7 @@
@import 'mixins/moderation.less';
@import 'mediawiki.mixins.less';
@import '../../base/styles/settings/paths.less';
+@import '../../base/styles/mixins/wordbreak.less';
.flow-topic-container {
padding-bottom: 20px;
@@ -18,6 +19,7 @@
h2 {
&.flow-realtitle {
display: inline;
+ .wordbreak-all();
}
}
}
diff --git a/modules/header/styles/base.less b/modules/header/styles/base.less
index 3bc0c66..4cb395a 100644
--- a/modules/header/styles/base.less
+++ b/modules/header/styles/base.less
@@ -1,5 +1,7 @@
@import 'settings/colors.less';
@import 'mediawiki.mixins.less';
+@import '../../base/styles/mixins/wordbreak.less';
+
#flow-header {
// should be about 30px total; taking the content line-height into
account,
@@ -7,6 +9,8 @@
padding-bottom: 25px;
#flow-header-content {
+ .wordbreak-all();
+
// Only apply these styles when empty or on plain-text content
&.flow-header-empty, > p {
font-weight: bold;
--
To view, visit https://gerrit.wikimedia.org/r/108972
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I305137c97de89deef9426bede2409e048b60fe0e
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Werdna <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: Matthias Mullie <[email protected]>
Gerrit-Reviewer: Werdna <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
