summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2017-01-24 21:51:23 +0000
committerJames Lopez <james@jameslopez.es>2017-01-25 11:05:28 +0100
commit45ad9402e05ec86b6bc13a26542e2d319af75a8a (patch)
treeb8b729ec6fa66bc9fcf30f79826b2adad0d8215f /app
parent84d3133efc7549464767a96d586531d664032ac3 (diff)
downloadgitlab-ce-45ad9402e05ec86b6bc13a26542e2d319af75a8a.tar.gz
Merge branch '25780-reveal-variables-button-may-overrun-width-of-screen' into 'master'
Resolve "Reveal Variables button may overrun width of screen" Closes #25780 See merge request !8221
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/pages/projects.scss26
1 files changed, 25 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index cd0839e58ea..1b0bf4554e6 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -929,8 +929,32 @@ pre.light-well {
.variables-table {
table-layout: fixed;
+ &.table-responsive {
+ border: none;
+ }
+
.variable-key {
- width: 30%;
+ width: 300px;
+ max-width: 300px;
+ overflow: hidden;
+ word-wrap: break-word;
+
+ // override bootstrap
+ white-space: normal!important;
+
+ @media (max-width: $screen-sm-max) {
+ width: 150px;
+ max-width: 150px;
+ }
+ }
+
+ .variable-value {
+ @media(max-width: $screen-xs-max) {
+ width: 150px;
+ max-width: 150px;
+ overflow: hidden;
+ word-wrap: break-word;
+ }
}
}