diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-04-17 20:15:53 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-04-17 20:15:53 +0000 |
| commit | 85d37c091c69b23a4395f43f6894b59245ae7e7c (patch) | |
| tree | 71f8669327ce90688e0b92de7efa888cbe181525 /app | |
| parent | c52732f5d863b4440d1e7f23e6f41e3b24263bf9 (diff) | |
| parent | fcd727f1ef27a1a3727bb2463448a383d82f2ddd (diff) | |
| download | gitlab-ce-85d37c091c69b23a4395f43f6894b59245ae7e7c.tar.gz | |
Merge branch 'variable-table-styles' into 'master'
29224-incorrect-loading-of-no_avatar
Used fixed widths and ellipsis for variable table styles
Closes #25780
See merge request !10739
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 28 | ||||
| -rw-r--r-- | app/views/projects/variables/_table.html.haml | 2 |
2 files changed, 13 insertions, 17 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 717ebb44a23..a9e2a034790 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -929,27 +929,23 @@ pre.light-well { } .variable-key { - width: 300px; - max-width: 300px; + max-width: 120px; overflow: hidden; word-wrap: break-word; - - // override bootstrap - white-space: normal!important; - - @media (max-width: $screen-sm-max) { - width: 150px; - max-width: 150px; - } + white-space: nowrap; + text-overflow: ellipsis; } .variable-value { - @media(max-width: $screen-xs-max) { - width: 150px; - max-width: 150px; - overflow: hidden; - word-wrap: break-word; - } + max-width: 150px; + overflow: hidden; + word-wrap: break-word; + white-space: nowrap; + text-overflow: ellipsis; + } + + .variable-menu { + text-align: right; } } diff --git a/app/views/projects/variables/_table.html.haml b/app/views/projects/variables/_table.html.haml index c7cebf45160..0ce597dcf21 100644 --- a/app/views/projects/variables/_table.html.haml +++ b/app/views/projects/variables/_table.html.haml @@ -14,7 +14,7 @@ %tr %td.variable-key= variable.key %td.variable-value{ "data-value" => variable.value }****** - %td + %td.variable-menu = link_to namespace_project_variable_path(@project.namespace, @project, variable), class: "btn btn-transparent btn-variable-edit" do %span.sr-only Update |