diff options
| author | Phil Hughes <me@iamphill.com> | 2016-10-20 11:39:29 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-10-20 11:39:29 +0100 |
| commit | 60a7cad96235d755f22249daf60b535fc4cc25dd (patch) | |
| tree | 420e90d25bb38febf6aae65e7603f5a6f8288a6d /app/assets | |
| parent | 033988cf32da4d7a0ecdffac6e5b8e1b88a264f4 (diff) | |
| parent | ba28a64ef93f44e45e6ec04a15f6170061f309e1 (diff) | |
| download | gitlab-ce-60a7cad96235d755f22249daf60b535fc4cc25dd.tar.gz | |
Merge branch 'master' into issue-board-sidebar
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/pages/boards.scss | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/boards.scss b/app/assets/stylesheets/pages/boards.scss index 641f35f1609..3dda2042cb3 100644 --- a/app/assets/stylesheets/pages/boards.scss +++ b/app/assets/stylesheets/pages/boards.scss @@ -1,4 +1,3 @@ -lex [v-cloak] { display: none; } @@ -145,7 +144,7 @@ lex } .board-blank-state { - height: 100%; + height: calc(100% - 49px); padding: $gl-padding; background-color: #fff; } diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index 247339648fa..dfaf1ab732d 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -643,6 +643,10 @@ &.pipelines { + .ci-table { + min-width: 900px; + } + .content-list.pipelines { overflow: auto; } |