allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [35/41] allura git commit: [#7897] ticket:820 Add top and bottom margins to separate editor from buttons
Date Wed, 29 Jul 2015 21:10:35 GMT
[#7897] ticket:820 Add top and bottom margins to separate editor from buttons


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/42b50145
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/42b50145
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/42b50145

Branch: refs/heads/master
Commit: 42b501457fd48fbb31f65520efc3ebe2b8f24341
Parents: 19b0683
Author: Igor Bondarenko <jetmind2@gmail.com>
Authored: Tue Jul 14 17:27:51 2015 +0300
Committer: Igor Bondarenko <jetmind2@gmail.com>
Committed: Mon Jul 27 14:23:56 2015 +0300

----------------------------------------------------------------------
 Allura/allura/lib/widgets/resources/css/markitup_sf.css | 2 ++
 ForgeWiki/forgewiki/templates/wiki/page_edit.html       | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/42b50145/Allura/allura/lib/widgets/resources/css/markitup_sf.css
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/resources/css/markitup_sf.css b/Allura/allura/lib/widgets/resources/css/markitup_sf.css
index 059721a..c673765 100644
--- a/Allura/allura/lib/widgets/resources/css/markitup_sf.css
+++ b/Allura/allura/lib/widgets/resources/css/markitup_sf.css
@@ -19,6 +19,8 @@
 .markdown_edit {
   width: 95%;
   background: white;
+  margin-top: 5px;
+  margin-bottom: 5px;
 }
 .markdown_edit .CodeMirror {
   min-height: 120px;

http://git-wip-us.apache.org/repos/asf/allura/blob/42b50145/ForgeWiki/forgewiki/templates/wiki/page_edit.html
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/templates/wiki/page_edit.html b/ForgeWiki/forgewiki/templates/wiki/page_edit.html
index 2bcb94b..fa0e95e 100644
--- a/ForgeWiki/forgewiki/templates/wiki/page_edit.html
+++ b/ForgeWiki/forgewiki/templates/wiki/page_edit.html
@@ -64,11 +64,9 @@
 	  {{c.markdown_editor.display(id='text', name='text',value=page.text)}}
 	</div>
 	<div style="clear:both;"></div>
-  <div style="margin-top: 1em;">
 	<label class="grid-4">Labels:</label>
 	<div class="grid-14" style="margin-left:0">
 		{{c.label_edit.display(id='labels', name='labels', value=page.labels)}}
-	</div>
   </div>
   <div class="grid-19">
     <input type="submit" value="Save">


Mime
View raw message