Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
sysadmin
mattermost
mattermost-webapp
Commits
3242b678
Commit
3242b678
authored
Jun 13, 2018
by
Harrison Healey
Committed by
Carlos Tadeu Panato Junior
Jun 13, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MM-10845 Allowed system console error message to wrap to 2 lines (#1312)
parent
9d3508b1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
3 deletions
+16
-3
sass/routes/_admin-console.scss
sass/routes/_admin-console.scss
+2
-3
sass/utils/_mixins.scss
sass/utils/_mixins.scss
+14
-0
No files found.
sass/routes/_admin-console.scss
View file @
3242b678
...
...
@@ -437,11 +437,10 @@
}
.error-message
{
overflow
:
hidden
;
.control-label
{
padding
:
0
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
white-space
:
nowrap
;
@include
text-clamp
(
2
,
20
);
}
}
.reset-defaults-btn
{
...
...
sass/utils/_mixins.scss
View file @
3242b678
...
...
@@ -36,3 +36,17 @@
}
}
}
// From https://gist.github.com/kaelig/7528069
@mixin
text-clamp
(
$lines
:
2
,
$line-height
:
false
)
{
overflow
:
hidden
;
display
:
-
webkit-box
;
-webkit-box-orient
:
vertical
;
-webkit-line-clamp
:
$lines
;
// Fallback for non-Webkit browsers
// (won't show `…` at the end of the block)
@if
$line-height
{
max-height
:
$line-height
*
$lines
*
1px
;
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment