Commit 85d37c09 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch 'variable-table-styles' into 'master'

Used fixed widths and ellipsis for variable table styles

Closes #25780

See merge request !10739
parents c52732f5 fcd727f1
...@@ -929,27 +929,23 @@ pre.light-well { ...@@ -929,27 +929,23 @@ pre.light-well {
} }
.variable-key { .variable-key {
width: 300px; max-width: 120px;
max-width: 300px;
overflow: hidden; overflow: hidden;
word-wrap: break-word; word-wrap: break-word;
white-space: nowrap;
// override bootstrap text-overflow: ellipsis;
white-space: normal!important;
@media (max-width: $screen-sm-max) {
width: 150px;
max-width: 150px;
}
} }
.variable-value { .variable-value {
@media(max-width: $screen-xs-max) {
width: 150px;
max-width: 150px; max-width: 150px;
overflow: hidden; overflow: hidden;
word-wrap: break-word; word-wrap: break-word;
white-space: nowrap;
text-overflow: ellipsis;
} }
.variable-menu {
text-align: right;
} }
} }
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
%tr %tr
%td.variable-key= variable.key %td.variable-key= variable.key
%td.variable-value{ "data-value" => variable.value }****** %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 = link_to namespace_project_variable_path(@project.namespace, @project, variable), class: "btn btn-transparent btn-variable-edit" do
%span.sr-only %span.sr-only
Update Update
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment