Merge pull request #46 from colab-community/gitlab-fixes-wiki

Fixed gitlab wiki page creation

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