kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Used fixed widths and ellipsis for variable table styles

Closes #25780

See merge request !10739
This commit is contained in:
Annabel Dunstone Gray 2017-04-17 20:15:53 +00:00
parent c52732f5d8 fcd727f1ef
commit 85d37c091c
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/assets/stylesheets/pages/projects.scss
View File

@ -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;
}
}

2
app/views/projects/variables/_table.html.haml
View File

@ -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