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

@@ @@ -1509,93 +1509,93 @@ tr.out-of-range > td.mid .message > a { @@
     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;
@@ @@ -1657,13 +1657,13 @@ tr.out-of-range > td.mid .message > a { @@
     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,
@@ @@ -2468,13 +2468,13 @@ div.form div.form-horizontal div.buttons @@
     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;

kallithea/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -69,19 +69,20 @@ ${self.repo_context_bar('changelog', c.f @@
                 </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>
@@ @@ -276,13 +277,13 @@ ${self.repo_context_bar('changelog', c.f @@
                     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){

kallithea/tests/functional/test_changelog.py

➞

Show inline comments

@@ @@ -5,13 +5,13 @@ class TestChangelogController(TestContro @@
     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" />"""
+        )
@@ @@ -53,13 +53,13 @@ class TestChangelogController(TestContro @@
     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" />"""
+        )

0 comments (0 inline, 0 general)