diff options
| author | Phil Hughes <me@iamphill.com> | 2016-03-03 08:47:44 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-03-03 16:13:56 -0500 |
| commit | 2c760487be653a3cc4f9214a72d9c9149147263e (patch) | |
| tree | 479b187145ddb3631bf05fe7fd2c9fab5d739226 | |
| parent | 0f237dd8fa842941dd51419dbd8095f3a6f2cb5e (diff) | |
| download | gitlab-ce-2c760487be653a3cc4f9214a72d9c9149147263e.tar.gz | |
SSH key ellipsis on mobile
| -rw-r--r-- | app/assets/stylesheets/pages/profile.scss | 14 | ||||
| -rw-r--r-- | app/views/profiles/keys/_key.html.haml | 4 |
2 files changed, 16 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss index 877a7c90a57..4826b994e37 100644 --- a/app/assets/stylesheets/pages/profile.scss +++ b/app/assets/stylesheets/pages/profile.scss @@ -146,6 +146,20 @@ } } +.key-list-item { + .key-list-item-info { + @media (min-width: $screen-sm-min) { + float: left; + } + } + + .description { + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + } +} + .key-icon { color: $ssh-key-icon-color; font-size: $ssh-key-icon-size; diff --git a/app/views/profiles/keys/_key.html.haml b/app/views/profiles/keys/_key.html.haml index 08a11fad001..25e9e8ff008 100644 --- a/app/views/profiles/keys/_key.html.haml +++ b/app/views/profiles/keys/_key.html.haml @@ -1,7 +1,7 @@ %li.key-list-item .pull-left.append-right-10 - = icon 'key', class: "key-icon" - .pull-left + = icon 'key', class: "key-icon hidden-xs" + .key-list-item-info = link_to path_to_key(key, is_admin), class: "title" do = key.title .description |