From 73f62d5463a638bd644b69b63990d82b9ca9a1a5 Mon Sep 17 00:00:00 2001
From: Maxi Redigonda <maxiredigonda@gmail.com>
Date: Mon, 5 Aug 2019 22:06:04 -0300
Subject: [PATCH 1/2] Fixes UI for overflow of extremely long titles of
articles and article content
---
.../app/admin/panel/articles/admin-panel-view-article.scss | 6 +++++-
.../dashboard/dashboard-article/dashboard-article-page.js | 4 ++--
.../dashboard/dashboard-article/dashboard-article-page.scss | 3 ++-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/client/src/app/admin/panel/articles/admin-panel-view-article.scss b/client/src/app/admin/panel/articles/admin-panel-view-article.scss
index 431fe9a4..5c6b73b4 100644
--- a/client/src/app/admin/panel/articles/admin-panel-view-article.scss
+++ b/client/src/app/admin/panel/articles/admin-panel-view-article.scss
@@ -1,5 +1,9 @@
.admin-panel-view-article {
+ &__content {
+ word-break: break-word;
+ }
+
&__edit-buttons {
text-align: left;
margin-bottom: 20px;
@@ -23,4 +27,4 @@
&__button {
margin-right: 20px;
}
-}
\ No newline at end of file
+}
diff --git a/client/src/app/main/dashboard/dashboard-article/dashboard-article-page.js b/client/src/app/main/dashboard/dashboard-article/dashboard-article-page.js
index 19d17a3a..b7f0faa0 100644
--- a/client/src/app/main/dashboard/dashboard-article/dashboard-article-page.js
+++ b/client/src/app/main/dashboard/dashboard-article/dashboard-article-page.js
@@ -76,9 +76,9 @@ class DashboardArticlePage extends React.Component {
getClass() {
let classes = {
'dashboard-article-page': true,
- 'dashboard-article-page_wrapped': _.startsWith(this.props.location.pathname, '/article/')
+ 'dashboard-article-page_wrapped': _.startsWith(this.props.location.pathname, '/dashboard/article/')
};
-
+
return classNames(classes);
}
diff --git a/client/src/app/main/dashboard/dashboard-article/dashboard-article-page.scss b/client/src/app/main/dashboard/dashboard-article/dashboard-article-page.scss
index aa91618e..b7dd02c2 100644
--- a/client/src/app/main/dashboard/dashboard-article/dashboard-article-page.scss
+++ b/client/src/app/main/dashboard/dashboard-article/dashboard-article-page.scss
@@ -8,5 +8,6 @@
&_wrapped {
padding: 0 15px;
+ word-break: break-word;
}
-}
\ No newline at end of file
+}
From 3c82e87d08c1c592dd05587d3e9c2d6dae383150 Mon Sep 17 00:00:00 2001
From: Maxi Redigonda <maxiredigonda@gmail.com>
Date: Mon, 5 Aug 2019 22:11:31 -0300
Subject: [PATCH 2/2] Makes the fix more general to apply for the user version
too
---
.../dashboard/dashboard-article/dashboard-article-page.scss | 2 +-
.../dashboard-list-articles/dashboard-list-articles-page.js | 2 +-
.../dashboard-list-articles/dashboard-list-articles-page.scss | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/client/src/app/main/dashboard/dashboard-article/dashboard-article-page.scss b/client/src/app/main/dashboard/dashboard-article/dashboard-article-page.scss
index b7dd02c2..36e309a2 100644
--- a/client/src/app/main/dashboard/dashboard-article/dashboard-article-page.scss
+++ b/client/src/app/main/dashboard/dashboard-article/dashboard-article-page.scss
@@ -1,4 +1,5 @@
.dashboard-article-page {
+ word-break: break-word;
&__last-edited {
font-style: italic;
@@ -8,6 +9,5 @@
&_wrapped {
padding: 0 15px;
- word-break: break-word;
}
}
diff --git a/client/src/app/main/dashboard/dashboard-list-articles/dashboard-list-articles-page.js b/client/src/app/main/dashboard/dashboard-list-articles/dashboard-list-articles-page.js
index b76ecc9a..3ab6516a 100644
--- a/client/src/app/main/dashboard/dashboard-list-articles/dashboard-list-articles-page.js
+++ b/client/src/app/main/dashboard/dashboard-list-articles/dashboard-list-articles-page.js
@@ -76,7 +76,7 @@ class DashboardListArticlesPage extends React.Component {
getClass() {
let classes = {
'dashboard-list-articles-page': true,
- 'dashboard-list-articles-page_wrapped': (this.props.location.pathname == '/articles'),
+ 'dashboard-list-articles-page_wrapped': (this.props.location.pathname == '/dashboard/articles'),
'col-md-10 col-md-offset-1': (!this.props.config['user-system-enabled'])
};
diff --git a/client/src/app/main/dashboard/dashboard-list-articles/dashboard-list-articles-page.scss b/client/src/app/main/dashboard/dashboard-list-articles/dashboard-list-articles-page.scss
index 709461c1..8cea0a52 100644
--- a/client/src/app/main/dashboard/dashboard-list-articles/dashboard-list-articles-page.scss
+++ b/client/src/app/main/dashboard/dashboard-list-articles/dashboard-list-articles-page.scss
@@ -31,6 +31,7 @@
}
&_wrapped {
+ word-break: break-word;
padding: 0 15px;
}
-}
\ No newline at end of file
+}