Skip to content

Commit 31def85

Browse files
committed
wiki preview for Redmine 4
1 parent 4845c0a commit 31def85

File tree

3 files changed

+27
-7
lines changed

3 files changed

+27
-7
lines changed

sass/_tabs.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
2+
#content .tabs {
3+
height: 2.8em;
4+
}

sass/_wiki.scss

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1+
$wiki-padding: 8px !default;
2+
13
// wiki
24
.controller-wiki {
35
div#content {
46
& > div.contextual {
57
margin-top: 3px;
68
}
79
& > div.wiki {
8-
padding: 0 8px 8px 8px;
10+
padding: 0 $wiki-padding $wiki-padding $wiki-padding;
911
}
1012
}
1113
}
@@ -155,8 +157,8 @@ div.wiki {
155157
font-weight: bold;
156158
}
157159
th, td {
158-
padding: 6px 13px;
159160
border: 1px solid #ddd;
161+
padding: 6px 13px;
160162
}
161163
tr {
162164
background-color: #fff;
@@ -167,9 +169,9 @@ div.wiki {
167169
}
168170

169171
img {
170-
max-width: 100%;
171-
box-sizing: content-box;
172172
background-color: #fff;
173+
box-sizing: content-box;
174+
max-width: 100%;
173175
}
174176
}
175177

@@ -208,13 +210,27 @@ div.wiki {
208210
border-bottom: 1px solid #eee;
209211
overflow: visible;
210212
&::before {
211-
display: table;
212213
content: "";
214+
display: table;
213215
}
214216
&::after {
215-
display: table;
216217
clear: both;
217218
content: "";
219+
display: table;
220+
}
221+
}
222+
}
223+
224+
// wiki-preview since Redmine 4
225+
.tabular {
226+
.jstEditor {
227+
.wiki-preview {
228+
padding: $wiki-padding;
229+
width: auto;
230+
231+
p {
232+
padding: 0 !important;
233+
}
218234
}
219235
}
220236
}

sass/application.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
@import 'themeheader';
44
@import 'variables';
5-
@import 'compass/css3';
65
@import 'mixins';
76

87
//@import 'ja';
@@ -340,6 +339,7 @@ img.gravatar {
340339
box-shadow: 0 3px 5px rgba(0, 0, 0, 0.05);
341340
}
342341

342+
@import 'tabs';
343343
@import 'wiki';
344344
@import 'projects';
345345

0 commit comments

Comments
 (0)