summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2017-08-06 12:34:42 -0400
committerJacob Schatz <jschatz1@gmail.com>2017-08-06 12:34:42 -0400
commit343a45dc588070cd7d0df30821dcec8c7b95a387 (patch)
tree662d11c7c168daa1b881c78113007fca6c3364db /app/assets/stylesheets
parentdee68253da2a57c918d9f19294a133f1a5139534 (diff)
downloadgitlab-ce-343a45dc588070cd7d0df30821dcec8c7b95a387.tar.gz
Use existing truncation.
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/framework/layout.scss7
-rw-r--r--app/assets/stylesheets/framework/mixins.scss7
-rw-r--r--app/assets/stylesheets/pages/repo.scss2
3 files changed, 1 insertions, 15 deletions
diff --git a/app/assets/stylesheets/framework/layout.scss b/app/assets/stylesheets/framework/layout.scss
index 09c596e168c..67c3287ed74 100644
--- a/app/assets/stylesheets/framework/layout.scss
+++ b/app/assets/stylesheets/framework/layout.scss
@@ -121,13 +121,6 @@ of the body element here, we negate cascading side effects but allow momentum sc
-webkit-overflow-scrolling: auto;
}
-.truncate {
- width: 250px;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
-}
-
.with-performance-bar .page-with-sidebar {
margin-top: $header-height + $performance-bar-height;
}
diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss
index 261642f4174..6f91d11b369 100644
--- a/app/assets/stylesheets/framework/mixins.scss
+++ b/app/assets/stylesheets/framework/mixins.scss
@@ -119,13 +119,6 @@
}
}
-@mixin truncate($width: 250px) {
- width: $width;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
-}
-
/*
* Mixin for status badges, as used for pipelines and commit signatures
*/
diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss
index 1a534b91d9c..a9c3e363170 100644
--- a/app/assets/stylesheets/pages/repo.scss
+++ b/app/assets/stylesheets/pages/repo.scss
@@ -44,7 +44,7 @@
}
.commit-message {
- @include truncate(250px);
+ @include str-truncated(250px);
}
#editable-mode {