allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jetm...@apache.org
Subject [32/50] [abbrv] allura git commit: [#7897] ticket:804 Add basic styles for new editor
Date Tue, 14 Jul 2015 15:03:13 GMT
[#7897] ticket:804 Add basic styles for new editor


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

Branch: refs/heads/ib/7897
Commit: 97cfa96df769dfcf800b8a48872bee728d89c0c6
Parents: 5e6ad0e
Author: Igor Bondarenko <jetmind2@gmail.com>
Authored: Tue Jul 7 11:38:29 2015 +0300
Committer: Igor Bondarenko <jetmind2@gmail.com>
Committed: Tue Jul 14 11:46:01 2015 +0300

----------------------------------------------------------------------
 Allura/allura/lib/widgets/form_fields.py        |  1 +
 .../lib/widgets/resources/css/markitup_sf.css   | 46 ++++++++++++++++++++
 2 files changed, 47 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/97cfa96d/Allura/allura/lib/widgets/form_fields.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/form_fields.py b/Allura/allura/lib/widgets/form_fields.py
index e6be401..df928d2 100644
--- a/Allura/allura/lib/widgets/form_fields.py
+++ b/Allura/allura/lib/widgets/form_fields.py
@@ -273,6 +273,7 @@ class MarkdownEdit(ew.TextArea):
             yield r
         yield ew.JSLink('js/jquery.lightbox_me.js')
         yield ew.CSSLink('css/markdown_editor/editor.css')
+        yield ew.CSSLink('css/markitup_sf.css')
         yield ew.JSLink('js/markdown_editor/editor.js')
         yield ew.JSLink('js/markdown_editor/marked.js')
         yield ew.JSLink('js/sf_markitup.js')

http://git-wip-us.apache.org/repos/asf/allura/blob/97cfa96d/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
new file mode 100644
index 0000000..7ac5814
--- /dev/null
+++ b/Allura/allura/lib/widgets/resources/css/markitup_sf.css
@@ -0,0 +1,46 @@
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
+.markdown_edit {
+  height: 200px;
+  width: 95%;
+  font-family: Consolas, "Andale Mono", "Lucida Console", monospace;
+
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  -o-border-radius: 4px;
+  -ms-border-radius: 4px;
+  -khtml-border-radius: 4px;
+  border-radius: 4px;
+  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4) inset,0 1px 0 rgba(255, 255, 255, 0.9);
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4) inset,0 1px 0 rgba(255, 255, 255, 0.9);
+  -o-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4) inset,0 1px 0 rgba(255, 255, 255, 0.9);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4) inset,0 1px 0 rgba(255, 255, 255, 0.9);
+  border: medium none;
+  margin-bottom: 5px;
+  margin-left: 2px;
+  border: 1px solid #aaaaaa;
+}
+
+.markdown_edit .editor-toolbar:before {
+  background: none;  /* hide toolbar's top border */
+}
+
+.markdown_edit .CodeMirror-scroll {
+  padding: 5px;
+}


Mime
View raw message