kallithea Changeset - 482b6ac31603

Changeset - 482b6ac31603

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 9 years ago 2016-12-24 17:26:48
mads@kiilerich.com

style: template markup changes for changeset.html, preparing for Bootstrap

Based on work by Dominik Ruf.

2 files changed with 21 insertions and 17 deletions:

kallithea/public/css/style.css

kallithea/templates/changeset/changeset.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -1766,7 +1766,6 @@ h3.files_location { @@
+}
 #changeset_content .container {
     min-height: 100px;
     font-size: 1.2em;
     overflow: hidden;
+}
@@ @@ -2213,6 +2212,7 @@ BIN_FILENODE = 6 @@
     background: #FAA;
+}
 .right .mergetag,
 .right .merge {
     padding: 1px 3px 1px 3px;
     background-color: #fca062;
@@ @@ -2287,6 +2287,7 @@ BIN_FILENODE = 6 @@
 .right .logtags .branchtag,
 .right .logtags .tagtag,
 .right .logtags .booktag,
 .right .mergetag,
 .right .merge {
     float: right;
     line-height: 1em;
@@ @@ -4447,3 +4448,7 @@ body table.dataTable thead .sorting_desc @@
 .grid_edit a {
     text-decoration: none;
+}
 .changes_txt {
     clear: both;
+}

kallithea/templates/changeset/changeset.html

➞

Show inline comments

@@ @@ -68,24 +68,12 @@ ${self.repo_context_bar('changelog', c.c @@
             </div>
         </div>
         <div id="changeset_content">
             <div class="container">
+            <div class="form-group container">
                 <div class="right">
                     <div class="changes">
                         % if (len(c.changeset.affected_files) <= c.affected_files_cut_off) or c.fulldiff:
                          <span class="removed" title="${_('Removed')}">${len(c.changeset.removed)}</span>
                          <span class="changed" title="${_('Changed')}">${len(c.changeset.changed)}</span>
                          <span class="added" title="${_('Added')}">${len(c.changeset.added)}</span>
                         % else:
                          <span class="removed" title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span>
                          <span class="changed" title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span>
                          <span class="added"   title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span>
                         % endif
                     </div>
                     <span class="logtags">
                         %if len(c.changeset.parents)>1:
-                        <span class="merge">${_('Merge')}</span>
+                        <span class="mergetag">${_('Merge')}</span>
                         %endif
                         %if h.is_hg(c.db_repo_scm_instance):
@@ @@ -107,6 +95,18 @@ ${self.repo_context_bar('changelog', c.c @@
                          </span>
                         %endif
                     </span>
                     <div class="changes">
                         % if (len(c.changeset.affected_files) <= c.affected_files_cut_off) or c.fulldiff:
                          <span class="removed" title="${_('Removed')}">${len(c.changeset.removed)}</span>
                          <span class="changed" title="${_('Changed')}">${len(c.changeset.changed)}</span>
                          <span class="added" title="${_('Added')}">${len(c.changeset.added)}</span>
                         % else:
                          <span class="removed" title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span>
                          <span class="changed" title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span>
                          <span class="added"   title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span>
                         % endif
                     </div>
                 </div>
                 <div class="left">
                      <div class="author">
@@ @@ -154,10 +154,9 @@ ${self.repo_context_bar('changelog', c.c @@
                        % endfor
                      </div>
                      % endif
                      <div class="message">${h.urlify_text(c.changeset.message, c.repo_name)}</div>
                 </div>
             </div>
             <div class="message form-group">${h.urlify_text(c.changeset.message, c.repo_name)}</div>
             <div class="changes_txt">
               <% a_rev, cs_rev, file_diff_data = c.changes[c.changeset.raw_id] %>
               % if c.limited_diff:

0 comments (0 inline, 0 general)