Commit 35e7f249fc49bc482a77a4cab71b90efde76bf10
Exists in
master
and in
39 other branches
Merge pull request #46 from colab-community/gitlab-fixes-wiki
Fixed gitlab wiki page creation
Showing
2 changed files
with
12 additions
and
0 deletions
Show diff stats
src/proxy/gitlab/diazo.xml
| @@ -7,6 +7,10 @@ | @@ -7,6 +7,10 @@ | ||
| 7 | <before css:theme-children="#main-content" css:content-children="body" /> | 7 | <before css:theme-children="#main-content" css:content-children="body" /> |
| 8 | 8 | ||
| 9 | <merge attributes="class" css:theme="body" css:content="body" /> | 9 | <merge attributes="class" css:theme="body" css:content="body" /> |
| 10 | + | ||
| 11 | + <!-- Add gitlab properties --> | ||
| 12 | + <merge attributes="data-page" css:theme="body" css:content="body" /> | ||
| 13 | + <merge attributes="data-project-id" css:theme="body" css:content="body" /> | ||
| 10 | 14 | ||
| 11 | <drop css:content="#top-panel" /> | 15 | <drop css:content="#top-panel" /> |
| 12 | <drop css:content=".navbar-gitlab" /> | 16 | <drop css:content=".navbar-gitlab" /> |
src/proxy/gitlab/templates/proxy/gitlab.html
| @@ -3,6 +3,14 @@ | @@ -3,6 +3,14 @@ | ||
| 3 | 3 | ||
| 4 | {% block head_css %} | 4 | {% block head_css %} |
| 5 | <style> | 5 | <style> |
| 6 | + /* Reset left and with for .modal-dialog style (like gitlab does), | ||
| 7 | + the bootstrap.css one makes it small */ | ||
| 8 | + @media screen and (min-width: 768px) { | ||
| 9 | + .modal-dialog { | ||
| 10 | + left: auto; | ||
| 11 | + width: auto; | ||
| 12 | + } | ||
| 13 | + } | ||
| 6 | div#main-content { | 14 | div#main-content { |
| 7 | margin-top: 65px; | 15 | margin-top: 65px; |
| 8 | } | 16 | } |