kallithea Changeset - c08d8395d565

Changeset - c08d8395d565

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

domruf - 9 years ago 2017-05-22 22:28:55
dominikruf@gmail.com

changelog: avoid conflict with Bootstrap '.container' - just use 'tr'

Patch modified by Mads Kiilerich.

3 files changed with 22 insertions and 21 deletions:

kallithea/public/css/style.css

kallithea/templates/changelog/changelog.html

kallithea/tests/functional/test_changelog.py

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -1503,105 +1503,105 @@ tr.out-of-range > td.mid .message > a { @@
     color: #aaa !important;
+}
 #graph_content #changesets td {
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
     height: 31px;
     border-color: #cdcdcd;
     text-align: left;
+}
-#graph_content .container .checkbox-column {
+#graph_content tr .checkbox-column {
     width: 14px;
     font-size: 0.85em;
+}
-#graph_content .container .status {
+#graph_content tr .status {
     width: 14px;
     font-size: 0.85em;
+}
-#graph_content .container .author {
+#graph_content tr .author {
    width: 105px;
+}
-#graph_content .container .hash {
+#graph_content tr .hash {
     width: 100px;
     font-size: 0.85em;
+}
-#graph_content #changesets .container .date {
+#graph_content tr .date {
     width: 76px;
     color: #666;
     font-size: 10px;
+}
 #graph_content_pr .compare_view_commits .expand_commit,
-#graph_content .container .expand_commit {
+#graph_content tr .expand_commit {
     width: 24px;
     cursor: pointer;
     color: #999;
+}
-#graph_content #changesets .container .right {
+#graph_content tr .right {
     width: 120px;
     padding-right: 0px;
     overflow: visible;
     position: relative;
+}
-#graph_content .container .mid {
+#graph_content tr .mid {
     padding: 0;
+}
 #graph_content .log-container {
     position: relative;
     margin-top: 8px;
+}
 #graph_content .container #singlerange,
 #graph_content .container .changeset_range {
 #graph_content tr #singlerange,
 #graph_content tr .changeset_range {
     float: left;
     margin: 2px 0;
+}
-#graph_content .container .author img {
+#graph_content tr .author img {
     vertical-align: middle;
+}
-#graph_content .container .author .user {
+#graph_content tr .author .user {
     color: #444444;
+}
-#graph_content .container .mid .message,
+#graph_content tr td.mid .message,
 #graph_content_pr .compare_view_commits .message {
     white-space: pre-wrap;
     padding: 0;
     overflow: hidden;
     height: 1.2em;
+}
 #graph_content_pr .compare_view_commits .message {
     padding: 0 !important;
+}
-#graph_content .container .mid .message.expanded,
+#graph_content tr td.mid .message.expanded,
 #graph_content_pr .compare_view_commits .message.expanded {
     height: auto;
     overflow: initial;
+}
-#graph_content .container .extra-container {
+#graph_content tr .extra-container {
     display: block;
     position: absolute;
     top: -15px;
     right: 0;
     padding-left: 5px;
     background: #FFFFFF;
     height: 41px;
+}
 #pull_request_overview .comments-container,
 #changeset_compare_view_content .comments-container,
 #graph_content .comments-container,
@@ @@ -1651,25 +1651,25 @@ tr.out-of-range > td.mid .message > a { @@
+}
 #graph_content .logtags .booktag,
 #graph_content .logtags .tagtag {
     float: left;
     line-height: 1em;
     margin-bottom: 1px;
     margin-right: 1px;
     padding: 1px 3px;
     font-size: 10px;
+}
-#graph_content .container .mid .message a:hover {
+#graph_content tr .mid .message a:hover {
     text-decoration: none;
+}
 #compare_branches + div.panel-body .revision-link,
 #compare_tags + div.panel-body .revision-link,
 #compare_bookmarks + div.panel-body .revision-link,
 div.panel-body #files_data .revision-link,
 #repos_list_wrap .revision-link,
 #shortlog_data .revision-link {
     font-weight: normal !important;
     font-family: monospace;
     font-size: 12px;
@@ @@ -2462,25 +2462,25 @@ div.form div.form-horizontal div.buttons @@
+}
 #register div.form div.form-horizontal div.form-group span.error-message {
     height: 1%;
     display: block;
     color: red;
     margin: 8px 0 0;
     padding: 0;
     max-width: 320px;
+}
 #changeset_content .container .wrapper,
-#graph_content .container .wrapper {
+#graph_content tr .wrapper {
     width: 600px;
+}
 #changeset_content .container .date,
 .ac .match {
     font-weight: 700;
     padding-top: 5px;
     padding-bottom: 5px;
+}
 div#legend_container table td,
 div#legend_choices table td {

kallithea/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -63,31 +63,32 @@ ${self.repo_context_bar('changelog', c.f @@
                         ${_("Branch filter:")} ${h.select('branch_filter',c.branch_name,c.branch_filters)}
                     </div>
                 </div>
                 <div id="graph_nodes">
                     <canvas id="graph_canvas" style="width:0"></canvas>
                 </div>
                 <div id="graph_content" style="${'margin: 0px' if c.changelog_for_path else ''}">
                 <table class="table" id="changesets">
                 <tbody>
                 %for cnt,cs in enumerate(c.pagination):
-                    <tr id="chg_${cnt+1}" class="container ${'mergerow' if len(cs.parents) > 1 else ''}">
                     <tr id="chg_${cnt+1}" class="${'mergerow' if len(cs.parents) > 1 else ''}">
                         <td class="checkbox-column">
                             %if c.changelog_for_path:
                                 ${h.checkbox(cs.raw_id,class_="changeset_range", disabled="disabled")}
                             %else:
                                 ${h.checkbox(cs.raw_id,class_="changeset_range")}
                             %endif
                         </td>
                         <td class="status">
                           %if c.statuses.get(cs.raw_id):
                             <div class="changeset-status-ico">
                             %if c.statuses.get(cs.raw_id)[2]:
                               <a data-toggle="tooltip" title="${_('Changeset status: %s by %s\nClick to open associated pull request %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[5].username, c.statuses.get(cs.raw_id)[4])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}">
                                 <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i>
                               </a>
                             %else:
                               <a data-toggle="tooltip" title="${_('Changeset status: %s by %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[5].username)}"
                                  href="${c.comments[cs.raw_id][0].url()}">
                                   <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i>
                               </a>
@@ @@ -270,25 +271,25 @@ ${self.repo_context_bar('changelog', c.f @@
                     graph.render(jsdata);
                 });
                 $('#singlerange').click(checkbox_checker);
                 $('#rev_range_clear').click(function(e){
                     $checkboxes.prop('checked', false);
                     checkbox_checker();
                     graph.render(jsdata);
                 });
                 var $msgs = $('.message');
                 // get first element height
-                var el = $('#graph_content .container')[0];
+                var el = $('#graph_content tr')[0];
                 var row_h = el.clientHeight;
                 $msgs.each(function() {
                     var m = this;
                     var h = m.clientHeight;
                     if(h > row_h){
                         var offset = row_h - (h+12);
                         $(m.nextElementSibling).css('display', 'block');
                         $(m.nextElementSibling).css('margin-top', offset+'px');
+                    }
                 });

kallithea/tests/functional/test_changelog.py

➞

Show inline comments

 from kallithea.tests.base import *
 class TestChangelogController(TestController):
     def test_index_hg(self):
         self.log_user()
         response = self.app.get(url(controller='changelog', action='index',
                                     repo_name=HG_REPO))
-        response.mustcontain('''id="chg_20" class="container mergerow"''')
         response.mustcontain('''id="chg_20" class="mergerow"''')
         response.mustcontain(
             """<input class="changeset_range" """
             """id="7b22a518347bb9bc19679f6af07cd0a61bfe16e7" """
             """name="7b22a518347bb9bc19679f6af07cd0a61bfe16e7" """
             """type="checkbox" value="1" />"""
+        )
         #rev 640: code garden
         response.mustcontain(
             """<a class="changeset_hash" href="/%s/changeset/0a4e54a4460401d6dbbd6a3604b17cd2b3606b82">r640:0a4e54a44604</a>""" % HG_REPO
+        )
         response.mustcontain("""code garden""")
@@ @@ -47,25 +47,25 @@ class TestChangelogController(TestContro @@
             """type="checkbox" value="1" />"""
+        )
         response.mustcontain(
             """<a class="changeset_hash" href="/vcs_test_hg/changeset/22baf968d547386b9516965ce89d189665003a31">r539:22baf968d547</a>"""
+        )
     def test_index_git(self):
         self.log_user()
         response = self.app.get(url(controller='changelog', action='index',
                                     repo_name=GIT_REPO))
-        response.mustcontain('''id="chg_20" class="container "''') # why no mergerow for git?
         response.mustcontain('''id="chg_20" class=""''') # why no mergerow for git?
         response.mustcontain(
             """<input class="changeset_range" """
             """id="95f9a91d775b0084b2368ae7779e44931c849c0e" """
             """name="95f9a91d775b0084b2368ae7779e44931c849c0e" """
             """type="checkbox" value="1" />"""
+        )
         response.mustcontain(
             """<a class="changeset_hash" href="/vcs_test_git/changeset/95f9a91d775b0084b2368ae7779e44931c849c0e">r613:95f9a91d775b</a>"""
+        )
         response.mustcontain("""fixing stupid typo in context for mercurial""")

0 comments (0 inline, 0 general)