kallithea Changeset - 4f3447149c98

Changeset - 4f3447149c98

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 8 years ago 2017-08-27 16:39:35
mads@kiilerich.com

changelog: update styling - don't restrict styling to graph when it is all for all changelog views

Be more specific when styling applies to all table#changesets or to columns in it.

2 files changed with 39 insertions and 74 deletions:

kallithea/public/css/style.css

kallithea/templates/changelog/changelog_table.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -1395,284 +1395,254 @@ BIN_FILENODE = 6 @@
     text-align: left;
+}
 #graph {
     position: relative;
     overflow: hidden;
+}
 #graph_nodes {
     position: absolute;
     width: 100px;
+}
 #graph_content,
 #graph_content_pr,
 #graph .info_box,
 #graph .container_header {
     margin-left: 100px;
+}
 #graph_content {
     position: relative;
+}
 #graph .container_header {
     padding: 10px;
     height: 25px;
+}
 #graph_content #rev_range_container {
     float: left;
     margin: 0px 0px 0px 3px;
+}
 #graph_content #rev_range_clear {
     float: left;
     margin: 0px 0px 0px 3px;
+}
 #graph_content #changesets {
 table#changesets {
     border-collapse: collapse;
     border: none;
     border-color: #cdcdcd;
+}
 tr.mergerow,
 tr.out-of-range {
 table#updaterevs-table tr.mergerow,
 table#updaterevs-table tr.out-of-range,
 table#changesets tr.mergerow,
 table#changesets tr.out-of-range {
     opacity: 0.6;
+}
-#graph_content #changesets td {
+table#changesets tr > td {
     height: 31px;
     border-color: #cdcdcd;
     text-align: left;
+}
-#graph_content tr .checkbox-column {
+table#changesets tr > td.checkbox-column {
     width: 14px;
     font-size: 0.85em;
+}
-#graph_content tr .status {
+table#changesets tr > td.status {
     width: 14px;
     font-size: 0.85em;
+}
-#graph_content tr .hash {
+table#changesets tr > td.hash {
     width: 100px;
     font-size: 0.85em;
+}
-#graph_content tr .date {
+table#changesets tr > td.date {
     width: auto !important;
     color: #666;
     font-size: 10px;
     white-space: nowrap;
+}
 #graph_content_pr .compare_view_commits .expand_commit,
-#graph_content tr .expand_commit {
+table#changesets tr > td.expand_commit {
     width: 24px;
     cursor: pointer;
     color: #999;
+}
 #graph_content tr .right {
     width: 120px;
     padding-right: 0px;
     overflow: visible;
     position: relative;
+}
 #graph_content tr .mid {
 table#changesets tr > td.mid {
     width: 100%;
     padding: 0;
+}
-#graph_content .log-container {
+table#changesets .log-container {
     position: relative;
     margin-top: 8px;
+}
 #graph_content tr #singlerange,
 #graph_content tr .changeset_range {
 table#changesets tr #singlerange,
 table#changesets tr .changeset_range {
     float: left;
     margin: 2px 0;
+}
-#graph_content tr .author img {
+table#changesets tr > td.author img {
     vertical-align: middle;
+}
-#graph_content tr .author .user {
+table#changesets tr > td.author .user {
     color: #444444;
+}
-#graph_content tr td.mid .message,
+table#changesets tr > td.mid .message,
 #graph_content_pr .compare_view_commits .message {
     white-space: nowrap;
     padding: 0;
     overflow: hidden;
+}
 #graph_content_pr .compare_view_commits .message {
     padding: 0 !important;
+}
-#graph_content tr td.mid .message.expanded,
+table#changesets tr > td.mid .message.expanded,
 #graph_content_pr .compare_view_commits .message.expanded {
     height: auto;
     overflow: initial;
+}
-#graph_content tr .extra-container {
+table#changesets 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,
+table#changesets .comments-container,
 #shortlog_data .comments-container,
-#graph_content .logtags {
+table#changesets .logtags {
     display: block;
     float: left;
     overflow: hidden;
     padding: 0;
     margin: 0;
     white-space: nowrap;
+}
-#graph_content .comments-container {
+table#changesets .comments-container {
     margin: 0.8em 0;
     margin-right: 0.5em;
+}
-#graph_content .tagcontainer {
+table#changesets .tagcontainer {
     width: 80px;
     position: relative;
     float: right;
     height: 100%;
     top: 7px;
     margin-left: 0.5em;
+}
-#graph_content .logtags {
+table#changesets .logtags {
     min-width: 80px;
     height: 1.1em;
     position: absolute;
     left: 0px;
     width: auto;
     top: 0px;
+}
-#graph_content .logtags.tags {
+table#changesets .logtags.tags {
     top: 14px;
+}
-#graph_content .logtags:hover {
+table#changesets .logtags:hover {
     overflow: visible;
     position: absolute;
     width: auto;
     right: 0;
     left: initial;
+}
 #graph_content .logtags .booktag,
 #graph_content .logtags .tagtag {
 table#changesets .logtags .booktag,
 table#changesets .logtags .tagtag {
     float: left;
     line-height: 1em;
     margin-bottom: 1px;
     margin-right: 1px;
     padding: 1px 3px;
     font-size: 10px;
+}
-#graph_content tr .mid .message a:hover {
+table#changesets tr > td.mid .message a:hover {
     text-decoration: none;
+}
 #updaterevs-graph {
     position: absolute;
     width: 40px;
+}
 #updaterevs-table {
     margin-left: 40px !important;
+}
 #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;
     color: #577632;
+}
 .revision-link {
     color: #3F6F9F;
     font-weight: bold !important;
+}
 .issue-tracker-link {
     color: #3F6F9F;
     font-weight: bold !important;
+}
 /* changeset statuses (must be the same name as the status) */
 .changeset-status-not_reviewed {
     color: #bababa;
+}
 .changeset-status-approved {
     color: #81ba51;
+}
 .changeset-status-rejected {
     color: #d06060;
+}
 .changeset-status-under_review {
     color: #ffc71e;
+}
 #graph_content .comments-cnt {
     color: rgb(136, 136, 136);
     padding: 5px 0;
+}
 #shortlog_data .comments-cnt {
     color: rgb(136, 136, 136);
     padding: 3px 0;
+}
 .pull-right .changes {
     clear: both;
+}
 .pull-right .changes .changed_total {
     display: block;
     float: right;
     text-align: center;
     min-width: 45px;
     cursor: pointer;
     color: #444444;
     background: #FEA;
     border-radius: 0px 0px 0px 6px;
     padding: 1px;
+}
 .pull-right .changes .added,
 .pull-right .changes .changed,
 .pull-right .changes .deleted {
     color: #444444;
+}
 .pull-right .changes .added {
     background: #CFC;
@@ @@ -1707,56 +1677,56 @@ div.panel-body #files_data .revision-lin @@
+}
 .phasetag, .bumpedtag, .divergenttag, .extincttag, .unstabletag, .repotag, .branchtag, .logtags .tagtag, .logtags .booktag {
     margin: 0px 2px;
+}
 .phasetag,
 .bumpedtag,
 .divergenttag,
 .extincttag,
 .unstabletag,
 .repotag,
 .branchtag,
 .tagtag,
 .booktag,
 .spantag {
     padding: 1px 3px 1px 3px;
     font-size: 10px;
     color: #577632;
     white-space: nowrap;
     border-radius: 4px;
     border: 1px solid #d9e8f8;
     line-height: 1.5em;
+}
 #graph_content .phasetag,
 #graph_content .bumpedtag,
 #graph_content .divergenttag,
 #graph_content .extincttag,
 #graph_content .unstabletag,
 #graph_content .branchtag,
 #graph_content .tagtag,
 #graph_content .booktag {
 table#changesets .phasetag,
 table#changesets .bumpedtag,
 table#changesets .divergenttag,
 table#changesets .extincttag,
 table#changesets .unstabletag,
 table#changesets .branchtag,
 table#changesets .tagtag,
 table#changesets .booktag {
     margin: 1.1em 0;
     margin-right: 0.5em;
+}
 .phasetag,
 .bumpedtag,
 .divergenttag,
 .extincttag,
 .unstabletag,
 .repotag,
 .branchtag,
 .tagtag,
 .booktag {
     float: left;
     display: inline-block;
+}
 .right .logtags .phasetag,
 .right .logtags .bumpedtag,
 .right .logtags .divergenttag,
 .right .logtags .extincttag,
 .right .logtags .unstabletag,
 .right .logtags .branchtag,
 .right .logtags .tagtag,
@@ @@ -2372,53 +2342,48 @@ div.form div.buttons { @@
+}
 #content div.panel div.action div.button {
     text-align: right;
     margin: 6px 0 0;
     padding: 0;
+}
 #login,
 #register {
     width: 520px;
     margin: 10% auto 0;
     padding: 0;
+}
 #register div.form div.form-group span.error-message {
     height: 1%;
     display: block;
     color: red;
     margin: 8px 0 0;
     padding: 0;
     max-width: 320px;
+}
 #changeset_content .changeset_content_header .wrapper,
 #graph_content tr .wrapper {
     width: 600px;
+}
 #changeset_content .changeset_content_header .date,
 .ac .match {
     font-weight: 700;
     padding-top: 5px;
     padding-bottom: 5px;
+}
 div#legend_container table td,
 div#legend_choices table td {
     border: none !important;
     height: 20px !important;
     padding: 0 !important;
+}
 .q_filter_box {
     border-radius: 4px;
     border: 0 none;
     margin-bottom: -4px;
     margin-top: -4px;
     padding-left: 3px;
+}
 #node_filter {
     border: 0px solid #545454;

kallithea/templates/changelog/changelog_table.html

➞

Show inline comments

@@ @@ -15,49 +15,49 @@ @@
           %if cs_statuses.get(cs.raw_id):
             %if cs_statuses.get(cs.raw_id)[2]:
               <a data-toggle="tooltip"
                   title="${_('Changeset status: %s by %s\nClick to open associated pull request %s') % (cs_statuses.get(cs.raw_id)[1], cs_statuses.get(cs.raw_id)[5].username, cs_statuses.get(cs.raw_id)[4])}"
                   href="${h.url('pullrequest_show',repo_name=cs_statuses.get(cs.raw_id)[3],pull_request_id=cs_statuses.get(cs.raw_id)[2])}">
                 <i class="icon-circle changeset-status-${cs_statuses.get(cs.raw_id)[0]}"></i>
               </a>
             %else:
               <a data-toggle="tooltip"
                   title="${_('Changeset status: %s by %s') % (cs_statuses.get(cs.raw_id)[1], cs_statuses.get(cs.raw_id)[5].username)}"
                   href="${cs_comments[cs.raw_id][0].url()}">
                 <i class="icon-circle changeset-status-${cs_statuses.get(cs.raw_id)[0]}"></i>
               </a>
             %endif
           %endif
         </td>
         <td class="author" data-toggle="tooltip" title="${cs.author}">
           ${h.gravatar(h.email_or_none(cs.author), size=16)}
           <span class="user">${h.person(cs.author)}</span>
         </td>
         <td class="hash">
           ${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=repo_name,revision=cs.raw_id), class_='changeset_hash')}
         </td>
         <td class="date">
-          <div class="date" data-toggle="tooltip" title="${h.fmt_date(cs.date)}">${h.age(cs.date,True)}</div>
           <div data-toggle="tooltip" title="${h.fmt_date(cs.date)}">${h.age(cs.date,True)}</div>
         </td>
         <% message_lines = cs.message.splitlines() %>
         %if len(message_lines) > 1:
         <td class="expand_commit" title="${_('Expand commit message')}">
           <i class="icon-align-left"></i>
         </td>
         %else:
         <td></td>
         %endif
         <td class="mid">
           <div class="log-container">
             <div class="message">
               <div class="message-firstline">${h.urlify_text(message_lines[0], c.repo_name,h.url('changeset_home',repo_name=repo_name,revision=cs.raw_id))}</div>
               %if len(message_lines) > 1:
               <div class="message-full hidden">${h.urlify_text(cs.message, repo_name)}</div>
               %endif
             </div>
             <div class="extra-container">
               %if cs_comments.get(cs.raw_id):
                 <a class="comments-container comments-cnt" href="${cs_comments[cs.raw_id][0].url()}" data-toggle="tooltip" title="${_('%s comments') % len(cs_comments[cs.raw_id])}">
                   ${len(cs_comments[cs.raw_id])}
                   <i class="icon-comment-discussion"></i>
                 </a>
               %endif

0 comments (0 inline, 0 general)