allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [2/2] allura git commit: [#8172] support a light modal style and use it for markdown help, so colors and backgrounds are all normal and match the full-page markdown help and regular markdown content display
Date Tue, 16 Jan 2018 16:18:25 GMT
[#8172] support a light modal style and use it for markdown help, so colors and backgrounds
are all normal and match the full-page markdown help and regular markdown content display


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

Branch: refs/heads/db/8172
Commit: 82b2ab7b5f1f84c285e2e87d8166b5215eea003e
Parents: c8e6a16
Author: Dave Brondsema <dave@brondsema.net>
Authored: Tue Jan 16 11:17:50 2018 -0500
Committer: Dave Brondsema <dave@brondsema.net>
Committed: Tue Jan 16 11:17:50 2018 -0500

----------------------------------------------------------------------
 Allura/allura/nf/allura/css/site_style.css      | 31 ++++++++++++--------
 .../allura/templates/widgets/markdown_edit.html |  2 +-
 2 files changed, 19 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/82b2ab7b/Allura/allura/nf/allura/css/site_style.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index d8a5472..1134619 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -693,13 +693,24 @@ img.nav-logo {
   padding: 0 20px 20px;
 }
 /* modal */
-.modal {
+.modal:not(.lightmodal) {
   background: rgb(60, 60, 60) none;
   color: #fff;
+}
+.modal:not(.lightmodal) hr {
+  background-color: #595454;
+}
+.modal:not(.lightmodal) a {
+  color: #fff;
+}
+.modal.lightmodal {
+  background-color: #fff;
+}
+.modal {
   border-radius: 10px;
   display: inline-block;
   margin: 0 auto;
-  border: 3px solid #292929;
+  border: 2px solid #292929;
   top: 20px;
   left: 50%;
   margin-left: -312px;
@@ -724,7 +735,6 @@ img.nav-logo {
 .modal hr {
   border: none;
   padding: 0;
-  background-color: #595454;
 }
 input.validate_input:valid[type='text'] {
     border: 1px solid #d8ffd5;
@@ -734,7 +744,7 @@ input.validate_input:invalid[type='text'] {
     background: #fadad5;
 }
 .modal-form-error {
-    color: white;
+    color: red;
     padding: 2px;
     border-radius: 2px;
     font-size: smaller;
@@ -745,21 +755,12 @@ input.validate_input:invalid[type='text'] {
   margin: 0;
   display: block;
 }
-.modal img {
-  height: 335px;
-  width: 542px;
-  margin: 0 auto 10px;
-}
 .modal form {
   padding-top: 20px;
 }
 .modal a {
-  color: #fff;
   text-decoration: underline;
 }
-.modal .codehilite {
-  background-color: #777;
-}
 .modal .hidden_in_modal {
     display: none;
 }
@@ -768,6 +769,10 @@ input.validate_input:invalid[type='text'] {
   border: 1px solid black;
 }
 
+.modal.markdown_help .codehilitetable {
+  width: inherit;
+}
+
 .markdown_syntax_toc_crumb {
   float: right !important;
   margin-left: 20px;

http://git-wip-us.apache.org/repos/asf/allura/blob/82b2ab7b/Allura/allura/templates/widgets/markdown_edit.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/markdown_edit.html b/Allura/allura/templates/widgets/markdown_edit.html
index 8ed865d..1af3df9 100644
--- a/Allura/allura/templates/widgets/markdown_edit.html
+++ b/Allura/allura/templates/widgets/markdown_edit.html
@@ -19,7 +19,7 @@
 {% import 'allura:templates/jinja_master/lib.html' as lib with context %}
 <div class="markdown_edit">
   <textarea id="{{id or rendered_name}}" name="{{rendered_name}}" class="{{widget.css_class}}"
{{widget.j2_attrs(attrs)}}>{{value or ''}}</textarea>
-  <div class="modal markdown_help" style="display:none">
+  <div class="modal lightmodal markdown_help" style="display:none">
     {{ g.icons['close'].render(extra_css='close') }}
     <div class="markdown_help_contents" data-url="{{c.app.url}}markdown_syntax_dialog"></div>
   </div>


Mime
View raw message