BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
85d37c09
Commit
85d37c09
authored
Apr 17, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Plain Diff
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
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
17 deletions
+13
-17
projects.scss
app/assets/stylesheets/pages/projects.scss
+12
-16
_table.html.haml
app/views/projects/variables/_table.html.haml
+1
-1
No files found.
app/assets/stylesheets/pages/projects.scss
View file @
85d37c09
...
...
@@ -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
;
}
}
...
...
app/views/projects/variables/_table.html.haml
View file @
85d37c09
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment