Mercurial > kallithea
changeset 6700:c08d8395d565
changelog: avoid conflict with Bootstrap '.container' - just use 'tr'
Patch modified by Mads Kiilerich.
author | domruf <dominikruf@gmail.com> |
---|---|
date | Mon, 22 May 2017 22:28:55 +0200 |
parents | 428c1193ee40 |
children | f2c7bf6f72d5 |
files | kallithea/public/css/style.css kallithea/templates/changelog/changelog.html kallithea/tests/functional/test_changelog.py |
diffstat | 3 files changed, 22 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/public/css/style.css Thu May 18 21:09:15 2017 +0200 +++ b/kallithea/public/css/style.css Mon May 22 22:28:55 2017 +0200 @@ -1512,46 +1512,46 @@ 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; } @@ -1560,21 +1560,21 @@ 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; @@ -1586,13 +1586,13 @@ 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; @@ -1660,7 +1660,7 @@ font-size: 10px; } -#graph_content .container .mid .message a:hover { +#graph_content tr .mid .message a:hover { text-decoration: none; } @@ -2471,7 +2471,7 @@ } #changeset_content .container .wrapper, -#graph_content .container .wrapper { +#graph_content tr .wrapper { width: 600px; }
--- a/kallithea/templates/changelog/changelog.html Thu May 18 21:09:15 2017 +0200 +++ b/kallithea/templates/changelog/changelog.html Mon May 22 22:28:55 2017 +0200 @@ -72,13 +72,14 @@ <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"> @@ -279,7 +280,7 @@ 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;
--- a/kallithea/tests/functional/test_changelog.py Thu May 18 21:09:15 2017 +0200 +++ b/kallithea/tests/functional/test_changelog.py Mon May 22 22:28:55 2017 +0200 @@ -8,7 +8,7 @@ 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" """ @@ -56,7 +56,7 @@ 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" """