allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kentontay...@apache.org
Subject [2/2] allura git commit: [#8245] rename .row to .comment-row and remove unused .column references, to avoid CSS conflicts with other frameworks
Date Wed, 17 Oct 2018 20:35:54 GMT
[#8245] rename .row to .comment-row and remove unused .column references, to avoid CSS conflicts
with other frameworks


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

Branch: refs/heads/master
Commit: 6392ede6982f3c8221ba200a9b6b52ad39fb53f5
Parents: b8e2f0d
Author: Dave Brondsema <dave@brondsema.net>
Authored: Wed Oct 17 12:15:14 2018 -0400
Committer: Kenton Taylor <ktaylor@slashdotmedia.com>
Committed: Wed Oct 17 20:35:14 2018 +0000

----------------------------------------------------------------------
 Allura/allura/lib/widgets/discuss.py            |  2 +-
 .../lib/widgets/resources/css/add_project.css   |  3 ---
 Allura/allura/nf/allura/css/site_style.css      | 24 ++++++++------------
 .../allura/templates/widgets/post_widget.html   |  4 ++--
 .../allura/templates/widgets/thread_widget.html |  6 ++---
 .../tests/functional/test_forum.py              | 10 ++++----
 6 files changed, 20 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/6392ede6/Allura/allura/lib/widgets/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/discuss.py b/Allura/allura/lib/widgets/discuss.py
index 9575c24..f7be446 100644
--- a/Allura/allura/lib/widgets/discuss.py
+++ b/Allura/allura/lib/widgets/discuss.py
@@ -353,7 +353,7 @@ class Post(HierWidget):
 
                 function spam_block_display($post, display_type) {
                     var spam_block = $post.find('.info.grid-15.spam-present');
-                    var row = $post.find('.row').eq(0);
+                    var row = $post.find('.comment-row').eq(0);
 
                     if (display_type == 'show_spam') {
                         spam_block.show();

http://git-wip-us.apache.org/repos/asf/allura/blob/6392ede6/Allura/allura/lib/widgets/resources/css/add_project.css
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/resources/css/add_project.css b/Allura/allura/lib/widgets/resources/css/add_project.css
index 9e27db5..f67cb61 100644
--- a/Allura/allura/lib/widgets/resources/css/add_project.css
+++ b/Allura/allura/lib/widgets/resources/css/add_project.css
@@ -23,9 +23,6 @@
 div.content {
     font-family: Helvetica;
 }
-div.content div.row > div.column {
-    width: 100%
-}
 div.welcome { margin: 2em 0 1em; }
 div.welcome input {
     width: 88%;

http://git-wip-us.apache.org/repos/asf/allura/blob/6392ede6/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 b124fbe..371f7be 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -2485,7 +2485,7 @@ div.attachment_item{
 }
 
 /* Discussion */
-#comment .row {
+#comment .comment-row {
   position: relative;
   float: right;
   clear: right;
@@ -2514,21 +2514,21 @@ div.attachment_item{
     max-width: 100%;
 }
 
-#comment .row .options {
+#comment .comment-row .options {
   position: relative;
   padding-top: 5px;
 }
 
-#comment ul ul .row .options {
+#comment ul ul .comment-row .options {
   right: 0;
 }
 
-#comment .row .options a.little_link {
+#comment .comment-row .options a.little_link {
   width: 50px;
   height: 20px;
 }
 
-#comment .row .options a.little_link span {
+#comment .comment-row .options a.little_link span {
   position: absolute;
   left: 27px;
 }
@@ -2567,19 +2567,15 @@ div.attachment_item{
   overflow: auto;
 }
 
-#comment ul .row {
+#comment ul .comment-row {
   margin: 0;
   padding-top: 1em;
 }
 
-#comment ul ul .row {
+#comment ul ul .comment-row {
   position: relative;
 }
 
-#comment ul .column.grid_8 {
-  width: 74%;
-}
-
 #comment .edit_post_form ul,
 #comment .reply_post_form ul,
 #comment .display_post ul {
@@ -3780,14 +3776,14 @@ fieldset.preferences legend {
     border-right-color: #e5e5e5;
 }
 
-:target > .row > .post-content {
+:target > .comment-row > .post-content {
     border-color: black;
 }
-:target > .row > .bubble::before {
+:target > .comment-row > .bubble::before {
     border-right-color: black;
 }
 
-.discussion-post .row .emboss{
+.discussion-post .comment-row .emboss{
     box-shadow: rgba(0, 0, 0, 0.0) 0 1px 5px 0;
     -webkit-box-shadow: rgba(0, 0, 0, 0.0) 0 1px 5px 0;
 

http://git-wip-us.apache.org/repos/asf/allura/blob/6392ede6/Allura/allura/templates/widgets/post_widget.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/post_widget.html b/Allura/allura/templates/widgets/post_widget.html
index 4add9ff..81be2e0 100644
--- a/Allura/allura/templates/widgets/post_widget.html
+++ b/Allura/allura/templates/widgets/post_widget.html
@@ -41,7 +41,7 @@
       <a href="{{value.thread.discussion.url()}}moderate?username={{value.author().username}}&status=pending">here</a>
     </div>
     {% endif %}
-    <div class="row">
+    <div class="comment-row">
       <div class="grid-2 tcenter gravatar">
        <p class="gravatar">
         {% set size = value.parent and 32 or 48 %}
@@ -143,7 +143,7 @@
     <ul>
       <li>
         {% if h.has_access(value.thread, 'post')() %}
-        <div class="row reply_post_form" style="display:none">
+        <div class="comment-row reply_post_form" style="display:none">
           <div class="reply">
             <div class="grid-2 tcenter">
               <p class="gravatar">

http://git-wip-us.apache.org/repos/asf/allura/blob/6392ede6/Allura/allura/templates/widgets/thread_widget.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/thread_widget.html b/Allura/allura/templates/widgets/thread_widget.html
index f9a6d9d..d060c4d 100644
--- a/Allura/allura/templates/widgets/thread_widget.html
+++ b/Allura/allura/templates/widgets/thread_widget.html
@@ -19,8 +19,7 @@
 {% import 'allura:templates/jinja_master/lib.html' as lib with context %}
 
 <div>
-  <div class="row">
-     <div class="column grid_12">
+  <div class="comment-row">
       {% if limit %}
         {{widgets.page_list.display(limit=limit, page=page, count=count)}}
       {% endif %}
@@ -46,13 +45,12 @@
       </div>
       {% endif %}
       <div style="clear:both"></div>
-    </div>
   </div>
 </div>
 {% if h.has_access(value, 'post')() %}
   <div id="new_post_holder">
     <span id="add_comment"></span>
-    <div class="row" style="padding-top:10px;">
+    <div class="comment-row" style="padding-top:10px;">
       <div class="reply">
         <div class="grid-2 tcenter">
           <p class="gravatar">

http://git-wip-us.apache.org/repos/asf/allura/blob/6392ede6/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
index 2684085..421f49a 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
@@ -539,7 +539,7 @@ class TestForum(TestController):
         assert_equal(spam_checker.check.call_args[0][0], 'Test Thread\nPost content')
 
         # assert unapproved thread replies do not appear
-        f = thread.html.find('div', {'class': 'row reply_post_form'}).find('form')
+        f = thread.html.find('div', {'class': 'comment-row reply_post_form'}).find('form')
         rep_url = f.get('action')
         params = dict()
         inputs = f.findAll('input')
@@ -617,7 +617,7 @@ class TestForum(TestController):
         url = thread.request.url
 
         # test reply to post
-        f = thread.html.find('div', {'class': 'row reply_post_form'}).find('form')
+        f = thread.html.find('div', {'class': 'comment-row reply_post_form'}).find('form')
         rep_url = f.get('action')
         params = dict()
         inputs = f.findAll('input')
@@ -633,7 +633,7 @@ class TestForum(TestController):
         assert thread.html.findAll(
             'div', {'class': 'display_post'})[1].find('p').string == 'bbb'
         assert thread.response.body.count(
-            '<div class="row reply_post_form') == 2
+            '<div class="comment-row reply_post_form') == 2
         assert thread.response.body.count('<div class="edit_post_form') == 2
 
         # test edit post
@@ -677,7 +677,7 @@ class TestForum(TestController):
                 params[field['name']] = field.get('value') or ''
         self.app.post(str(subscribe_url), params=params)
         self.app.post('/discussion/general/subscribe_to_forum', {'subscribe': True})
-        f = thread.html.find('div', {'class': 'row reply_post_form'}).find('form')
+        f = thread.html.find('div', {'class': 'comment-row reply_post_form'}).find('form')
         rep_url = f.get('action')
         params = dict()
         inputs = f.findAll('input')
@@ -835,7 +835,7 @@ class TestForum(TestController):
         url = thread.request.url
         # make a reply
         f = thread.html.find(
-            'div', {'class': 'row reply_post_form'}).find('form')
+            'div', {'class': 'comment-row reply_post_form'}).find('form')
         rep_url = f.get('action')
         params = dict()
         inputs = f.findAll('input')


Mime
View raw message