summaryrefslogtreecommitdiffstats
path: root/public/stylesheets
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2018-09-26 07:27:30 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2018-09-26 07:27:30 +0000
commitb9fa262165601a3b348d22ca1d8da53bda99e55b (patch)
tree21bd632e051addfee01ab7a568b01f5b6428051a /public/stylesheets
parentc171797673f549e434dd6b94f7262fd31a77b533 (diff)
downloadredmine-b9fa262165601a3b348d22ca1d8da53bda99e55b.tar.gz
redmine-b9fa262165601a3b348d22ca1d8da53bda99e55b.zip
Adds preview option to the wiki toolbar (#27758).
Patch by Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/trunk@17521 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'public/stylesheets')
-rw-r--r--public/stylesheets/application.css20
-rw-r--r--public/stylesheets/jstoolbar.css32
2 files changed, 45 insertions, 7 deletions
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index c680fac92..e98350679 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -274,7 +274,6 @@ tr.issue.idnt-8 td.subject {padding-left: 136px; background-position: 120px 50%;
tr.issue.idnt-9 td.subject {padding-left: 152px; background-position: 136px 50%;}
table.issue-report {table-layout:fixed;}
-table.issue-report th {white-space: normal;}
tr.entry { border: 1px solid #f8f8f8; }
tr.entry td { white-space: nowrap; }
@@ -678,7 +677,6 @@ span.pagination>span {white-space:nowrap;}
min-height: 2em;
clear:left;
}
-
html>body .tabular p {overflow:hidden;}
.tabular input, .tabular select {max-width:95%}
@@ -730,11 +728,25 @@ label.no-css {
input#time_entry_comments { width: 90%;}
input#months { width: 30px; }
-fieldset.preview {margin-top: 1em; min-width: inherit; background: url(../images/draft.png)}
+.jstBlock .jstTabs, .jstBlock .wiki-preview { width: 99%; }
+
+.jstBlock .jstTabs { padding-right: 6px; }
+.jstBlock .wiki-preview { padding: 2px; }
+.jstBlock .wiki-preview p:first-child { padding-top: 0 !important;}
+.jstBlock .wiki-preview p:last-child { padding-bottom: 0 !important;}
+#content .box .jstBlock .jstTabs li { background-color: #f6f6f6; }
+
+.tabular .wiki-preview, .tabular .jstTabs {width: 95%;}
+.tabular.settings .wiki-preview, .tabular.settings .jstTabs { width: 99%; }
+.tabular .wiki-preview p {
+ min-height: initial;
+ padding: 1em 0 1em 0 !important;
+ overflow: initial;
+}
.tabular.settings p{ padding-left: 300px; }
.tabular.settings label{ margin-left: -300px; width: 295px; }
-.tabular.settings textarea { width: 99%; }
+.tabular.settings textarea, .tabular.settings .wiki-preview, .tabular.settings .jstTabs { width: 99%; }
.settings.enabled_scm table {width:100%}
.settings.enabled_scm td.scm_name{ font-weight: bold; }
diff --git a/public/stylesheets/jstoolbar.css b/public/stylesheets/jstoolbar.css
index 4bf674556..dc195b279 100644
--- a/public/stylesheets/jstoolbar.css
+++ b/public/stylesheets/jstoolbar.css
@@ -1,19 +1,45 @@
+.jstBlock .hidden {
+ display: none;
+}
.jstEditor {
padding-left: 0px;
}
.jstEditor textarea, .jstEditor iframe {
margin: 0;
}
-
.jstHandle {
height: 10px;
font-size: 0.1em;
cursor: s-resize;
/*background: transparent url(img/resizer.png) no-repeat 45% 50%;*/
}
-
+#content .jstTabs.tabs {
+ margin-bottom: 10px;
+}
+#content .jstTabs.tabs li {
+ height: 42px;
+}
+#content .jstTabs.tabs li:before{
+ content: '';
+ display: inline-block;
+ vertical-align: middle;
+ height: 100%;
+}
+#content .jstTabs.tabs li a {
+ display: inline-block;
+ vertical-align: bottom;
+ line-height: 19px;
+}
.jstElements {
- padding: 3px 3px 3px 0;
+ display: inline-block;
+ vertical-align: bottom;
+ border-bottom: 1px solid #bbbbbb;
+ padding-left: 6px;
+ height: 26px;
+}
+.wiki-preview {
+ background-color: #ffffff;
+ border: 1px solid #bbbbbb;
}
.jstElements button {