kallithea Changeset - 91182a358fb3

Changeset - 91182a358fb3

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 8 years ago 2017-08-14 00:40:04
mads@kiilerich.com

templates: drop odd grid_edit and grid_delete classes

We really should have both buttons inside the same float-left so they get
proper spacing ... but that doesn't work when one is wrapped in a form ...

2 files changed with 8 insertions and 12 deletions:

kallithea/public/css/style.css

kallithea/templates/data_table/_dt_elements.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -2860,414 +2860,410 @@ span.pr-closed-tag { @@
 #pr-edit-btn {
     margin: 20px 0 0 !important;
     position: absolute;
+}
 /****
   PERMS
 *****/
 #perms .perms_section_head {
     padding: 10px 10px 10px 0px;
     font-size: 16px;
     font-weight: bold;
     text-transform: capitalize;
+}
 #perms .perms_section_head label {
     margin-left: 10px;
+}
 #perms .perm_tag {
     position: relative;
     top: -2px;
     margin-left: 3px;
     padding: 3px 3px 1px 3px;
     font-size: 10px;
     font-weight: bold;
     text-transform: uppercase;
     white-space: nowrap;
     border-radius: 3px;
+}
 #perms .perm_tag.admin {
     background-color: #B94A48;
     color: #ffffff;
+}
 #perms .perm_tag.write {
     background-color: #DB7525;
     color: #ffffff;
+}
 #perms .perm_tag.read {
     background-color: #468847;
     color: #ffffff;
+}
 #perms .perm_tag.none {
     background-color: #bfbfbf;
     color: #ffffff;
+}
 input.perm_filter {
     position: relative;
     top: 2px;
+}
 .perm-gravatar {
     vertical-align: middle;
     padding: 2px;
+}
 .perm-gravatar-ac {
     vertical-align: middle;
     padding: 2px;
     width: 14px;
     height: 14px;
+}
 /*****************************************************************************
                                   DIFFS CSS
 ******************************************************************************/
 .diff-collapse {
     text-align: center;
     margin-bottom: 15px;
+}
 .diff-collapse-button {
     cursor: pointer;
     color: #666;
     font-size: 16px;
+}
 table.code-difftable {
     border-collapse: collapse;
     border-radius: 0px !important;
     width: 100%;
+}
 table.code-difftable td {
     padding: 0 !important;
     background: none !important;
     border: 0 !important;
     vertical-align: baseline !important
+}
 table.code-difftable .context {
     background: none repeat scroll 0 0 #DDE7EF;
     color: #999;
+}
 table.code-difftable .add {
     background: none repeat scroll 0 0 #DDFFDD;
+}
 table.code-difftable .add ins {
     background: none repeat scroll 0 0 #AAFFAA;
     text-decoration: none;
+}
 table.code-difftable .del {
     background: none repeat scroll 0 0 #FFDDDD;
+}
 table.code-difftable .del del {
     background: none repeat scroll 0 0 #FFAAAA;
     text-decoration: none;
+}
 table.code-highlighttable div.code-highlight pre u:before,
 table.code-difftable td.code pre u:before {
     content: "\21a6";
     display: inline-block;
     width: 0;
+}
 table.code-highlighttable div.code-highlight pre u.cr:before,
 table.code-difftable td.code pre u.cr:before {
     content: "\21a4";
     display: inline-block;
     color: rgba(0,0,0,0.5);
+}
 table.code-highlighttable div.code-highlight pre u,
 table.code-difftable td.code pre u {
     color: rgba(0,0,0,0.15);
+}
 table.code-highlighttable div.code-highlight pre i,
 table.code-difftable td.code pre i {
     border-style: solid;
     border-width: 0 0 0 1px;
     color: rgba(0,0,0,0.5);
+}
 /** LINE NUMBERS **/
 table.code-difftable .lineno {
     padding-left: 2px;
     padding-right: 2px !important;
     width: 30px;
     -moz-user-select: none;
     -webkit-user-select: none;
     border-right: 1px solid #CCC !important;
     border-left: 0px solid #CCC !important;
     border-top: 0px solid #CCC !important;
     border-bottom: none !important;
     vertical-align: middle !important;
     text-align: center;
+}
 table.code-difftable .lineno.new {
     text-align: right;
+}
 table.code-difftable .lineno.old {
     text-align: right;
+}
 table.code-difftable .lineno a {
     color: #aaa !important;
     font: 11px Lucida Console, Consolas, Monaco, Inconsolata, Liberation Mono, monospace !important;
     letter-spacing: -1px;
     padding-left: 10px;
     padding-right: 8px;
     box-sizing: border-box;
     cursor: pointer;
     display: block;
     width: 100%;
+}
 table.code-difftable .line:hover .lineno a {
     color: #333 !important;
+}
 table.code-difftable .lineno-inline {
     background: none repeat scroll 0 0 #FFF !important;
     padding-left: 2px;
     padding-right: 2px;
     text-align: right;
     width: 30px;
     -moz-user-select: none;
     -webkit-user-select: none;
+}
 /** CODE **/
 table.code-difftable .code {
     display: block;
     width: 100%;
+}
 table.code-difftable .code td {
     margin: 0;
     padding: 0;
+}
 table.code-difftable .code pre {
     margin: 0 0 0 12px !important;
     padding: 0;
     min-height: 17px;
     line-height: 17px;
     white-space: pre-wrap;
     word-break: break-all;
+}
 table.code-difftable .del .code pre:before {
     content: "-";
     color: #800;
     float: left;
     left: -1em;
     position: relative;
     width: 0;
+}
 table.code-difftable .add .code pre:before {
     content: "+";
     color: #080;
     float: left;
     left: -1em;
     position: relative;
     width: 0;
+}
 table.code-difftable .unmod .code pre:before {
     content: " ";
     float: left;
     left: -1em;
     position: relative;
     width: 0;
+}
 .add-bubble {
     position: relative;
     display: none;
     float: left;
     width: 0px;
     height: 0px;
     left: -8px;
     box-sizing: border-box;
+}
 /* comment bubble, only visible when in a commentable diff */
 .commentable-diff tr.line.add:hover td .add-bubble,
 .commentable-diff tr.line.del:hover td .add-bubble,
 .commentable-diff tr.line.unmod:hover td .add-bubble {
     display: block;
     z-index: 1;
+}
 .add-bubble div {
     background: #577632;
     width: 16px;
     height: 16px;
     cursor: pointer;
     padding: 0 2px 2px 0.5px;
     border: 1px solid #577632;
     border-radius: 3px;
     box-sizing: border-box;
+}
 .add-bubble div:before {
     font-size: 14px;
     color: #ffffff;
     font-family: "kallithea";
     content: '\1f5ea';
+}
 .add-bubble div:hover {
     transform: scale(1.2, 1.2);
+}
 /* show some context of link targets - but only works when the link target
    can be extended with any visual difference */
 div.comment:target:before {
   display: block;
   height: 100px;
   margin: -100px 0 0;
   content: "";
+}
 div.comment:target>.panel {
     border: solid 2px #ee0 !important;
+}
 .lineno:target a {
     border: solid 2px #ee0 !important;
     margin: -2px;
+}
 .btn-image-diff-show,
 .btn-image-diff-swap {
     margin: 5px;
+}
 .img-diff {
     max-width: 45%;
     height: auto;
     margin: 5px;
     /* http://lea.verou.me/demos/css3-patterns.html */
     background-image:
         linear-gradient(45deg, #888 25%, transparent 25%, transparent),
         linear-gradient(-45deg, #888 25%, transparent 25%, transparent),
         linear-gradient(45deg, transparent 75%, #888 75%),
         linear-gradient(-45deg, transparent 75%, #888 75%);
     background-size: 10px 10px;
     background-color: #999;
+}
 .img-preview {
     max-width: 100%;
     height: auto;
     margin: 5px;
+}
 div.comment-prev-next-links div.prev-comment,
 div.comment-prev-next-links div.next-comment {
     display: inline-block;
     min-width: 150px;
     margin: 3px 6px;
+}
 #comments-general-comments div.comment-prev-next-links div.prev-comment,
 #comments-general-comments div.comment-prev-next-links div.next-comment {
     margin-left: 0;
+}
 body table.dataTable thead .sorting {
   background-image: none;
+}
 body table.dataTable thead .sorting_asc {
   background-image: none;
+}
 body table.dataTable thead .sorting_desc {
   background-image: none;
+}
 body table.dataTable thead .sorting_asc_disabled {
   background-image: none;
+}
 body table.dataTable thead .sorting_desc_disabled {
   background-image: none;
+}
 body table.dataTable thead .sorting_asc::after {
   font-family: "kallithea";
   content: "\23f6";
+}
 body table.dataTable thead .sorting_desc::after {
   font-family: "kallithea";
   content: "\23f7";
+}
 .dataTables_wrapper .dataTables_left {
   float: left !important;
+}
 .dataTables_wrapper .dataTables_right {
   float: right;
+}
 .dataTables_wrapper .dataTables_right > div {
   padding-left: 30px;
+}
 .dataTables_wrapper .dataTables_info {
   clear: none;
   padding-top: 3px;
+}
 .dataTables_wrapper .dataTables_paginate {
   padding-top: 0;
+}
 .dataTables_wrapper .dataTables_paginate .paginate_button {
     padding: 3px 10px;
+}
 .dataTables_wrapper .dataTables_paginate > a.paginate_button {
   padding-top: 1px;
   border: 0 !important;
+}
 .dataTables_wrapper label {
     margin-bottom: 0;
     font-weight: inherit;
+}
 .text-muted {
     color: #777777;
+}
 .grid_edit a {
     text-decoration: none;
+}
 .changes_txt {
     clear: both;
+}
 .text-nowrap {
     white-space: nowrap;
+}
 div.codeblock div.code-header div.author {
     height: auto;
     min-height: 25px;
+}
 ul.user_group_member li {
     clear: both;
+}
 #content div.panel .changelog-panel > .changelog-heading,
 #content div.panel .changelog-panel > ul.pagination {
     margin-left: 100px;
+}
 textarea.commit-message {
     width: 100% !important;
     box-sizing: border-box;
+}

kallithea/templates/data_table/_dt_elements.html

➞

Show inline comments

 ## DATA TABLE RE USABLE ELEMENTS
 ## usage:
 ## <%namespace name="dt" file="/data_table/_dt_elements.html"/>
 <%namespace name="base" file="/base/base.html"/>
 <%def name="repo_name(name,rtype,rstate,private,fork_of,short_name=False,admin=False)">
     <%
     def get_name(name,short_name=short_name):
       if short_name:
         return name.split('/')[-1]
       else:
         return name
     %>
   <div class="dt_repo ${'dt_repo_pending' if rstate == 'repo_state_pending' else ''}">
     ${base.repotag(rtype)}
     %if private and c.visual.show_private_icon:
       <i class="icon-keyhole-circled" title="${_('Private repository')}"></i>
     %elif not private and c.visual.show_public_icon:
       <i class="icon-globe" title="${_('Public repository')}"></i>
     %else:
       <i class="icon-empty"></i>
     %endif
     <a href="${h.url('edit_repo' if admin else 'summary_home', repo_name=name)}">
         ${get_name(name)}
     </a>
     %if fork_of:
       <a href="${h.url('summary_home',repo_name=fork_of.repo_name)}"><i class="icon-fork"></i></a>
     %endif
     %if rstate == 'repo_state_pending':
       <i class="icon-wrench" title="${_('Repository creation in progress...')}"></i>
     %endif
   </div>
 </%def>
 <%def name="last_change(last_change)">
   <span data-toggle="tooltip" title="${h.fmt_date(last_change)}" date="${last_change}">${h.age(last_change)}</span>
 </%def>
 <%def name="revision(name,rev,tip,author,last_msg)">
   <div>
   %if rev >= 0:
       <a data-toggle="popover" title="${author | entity}" data-content="${last_msg | entity}" class="hash" href="${h.url('changeset_home',repo_name=name,revision=tip)}">${'r%s:%s' % (rev,h.short_id(tip))}</a>
   %else:
       ${_('No changesets yet')}
   %endif
   </div>
 </%def>
 <%def name="rss(name)">
   %if request.authuser.username != 'default':
     <a title="${_('Subscribe to %s rss feed')% name}" href="${h.url('rss_feed_home',repo_name=name,api_key=request.authuser.api_key)}"><i class="icon-rss-squared"></i></a>
   %else:
     <a title="${_('Subscribe to %s rss feed')% name}" href="${h.url('rss_feed_home',repo_name=name)}"><i class="icon-rss-squared"></i></a>
   %endif
 </%def>
 <%def name="atom(name)">
   %if request.authuser.username != 'default':
     <a title="${_('Subscribe to %s atom feed')% name}" href="${h.url('atom_feed_home',repo_name=name,api_key=request.authuser.api_key)}"><i class="icon-rss-squared"></i></a>
   %else:
     <a title="${_('Subscribe to %s atom feed')% name}" href="${h.url('atom_feed_home',repo_name=name)}"><i class="icon-rss-squared"></i></a>
   %endif
 </%def>
 <%def name="repo_actions(repo_name, super_user=True)">
   <div>
-    <div class="grid_edit pull-left">
     <div class="pull-left">
       <a href="${h.url('edit_repo',repo_name=repo_name)}" title="${_('Edit')}" class="btn btn-default btn-xs">
         <i class="icon-pencil"></i> ${_('Edit')}
       </a>
     </div>
-    <div class="grid_delete pull-left">
     <div class="pull-left">
       ${h.form(h.url('delete_repo', repo_name=repo_name))}
         <button name="${'remove_%s' % repo_name}" class="btn btn-default btn-xs"
             onclick="return confirm('${_('Confirm to delete this repository: %s') % repo_name}');">
           <i class="icon-minus-circled text-danger"></i> ${_('Delete')}
         </button>
       ${h.end_form()}
     </div>
   </div>
 </%def>
 <%def name="repo_state(repo_state)">
   <div>
     %if repo_state == u'repo_state_pending':
         <div class="label label-info">${_('Creating')}</div>
     %elif repo_state == u'repo_state_created':
         <div class="label label-success">${_('Created')}</div>
     %else:
         <div class="label label-danger" title="${repo_state}">invalid</div>
     %endif
   </div>
 </%def>
 <%def name="user_actions(user_id, username)">
- <div class="grid_edit pull-left">
  <div class="pull-left">
    <a href="${h.url('edit_user',id=user_id)}" title="${_('Edit')}" class="btn btn-default btn-xs">
      <i class="icon-pencil"></i> ${_('Edit')}
    </a>
  </div>
- <div class="grid_delete pull-left">
  <div class="pull-left">
   ${h.form(h.url('delete_user', id=user_id))}
     <button id="${'remove_user_%s' % user_id}" name="${'remove_user_%s' % repo_name}" class="btn btn-default btn-xs" title="${_('Delete')}"
         onclick="return confirm('${_('Confirm to delete this user: %s') % username}');">
       <i class="icon-minus-circled text-danger"></i> ${_('Delete')}
     </button>
   ${h.end_form()}
  </div>
 </%def>
 <%def name="user_group_actions(user_group_id, user_group_name)">
- <div class="grid_edit pull-left">
  <div class="pull-left">
     <a href="${h.url('edit_users_group', id=user_group_id)}" title="${_('Edit')}" class="btn btn-default btn-xs">
       <i class="icon-pencil"></i> ${_('Edit')}
     </a>
  </div>
- <div class="grid_delete pull-left">
  <div class="pull-left">
     ${h.form(h.url('delete_users_group', id=user_group_id))}
       <button id="${'remove_group_%s' % user_group_id}" name="${'remove_user_%s' % repo_name}" class="btn btn-default btn-xs" title="${_('Delete')}"
           onclick="return confirm('${_('Confirm to delete this user group: %s') % user_group_name}');">
         <i class="icon-minus-circled text-danger"></i> ${_('Delete')}
       </button>
     ${h.end_form()}
  </div>
 </%def>
 <%def name="repo_group_actions(repo_group_id, repo_group_name, gr_count)">
- <div class="grid_edit pull-left">
  <div class="pull-left">
     <a href="${h.url('edit_repo_group',group_name=repo_group_name)}" title="${_('Edit')}" class="btn btn-default btn-xs">
       <i class="icon-pencil"></i> ${_('Edit')}
     </a>
  </div>
- <div class="grid_delete pull-left">
  <div class="pull-left">
     ${h.form(h.url('delete_repo_group', group_name=repo_group_name))}
       <button id="${'remove_%s' % repo_group_name}" name="${'remove_%s' % repo_group_name}" class="btn btn-default btn-xs" title="${_('Delete')}"
           onclick="return confirm('${ungettext('Confirm to delete this group: %s with %s repository','Confirm to delete this group: %s with %s repositories',gr_count) % (repo_group_name, gr_count)}')">
         <i class="icon-minus-circled text-danger"></i> ${_('Delete')}
       </button>
     ${h.end_form()}
  </div>
 </%def>
 <%def name="user_name(user_id, username)">
     ${h.link_to(username,h.url('edit_user', id=user_id))}
 </%def>
 <%def name="repo_group_name(repo_group_name, children_groups)">
   <div class="text-nowrap">
   <a href="${h.url('repos_group_home',group_name=repo_group_name)}">
     <i class="icon-folder" title="${_('Repository group')}"></i> ${h.literal(' &raquo; '.join(children_groups))}</a>
   </div>
 </%def>
 <%def name="user_group_name(user_group_id, user_group_name)">
   <div class="text-nowrap">
   <a href="${h.url('edit_users_group', id=user_group_id)}">
     <i class="icon-users" title="${_('User group')}"></i> ${user_group_name}</a>
   </div>
 </%def>

0 comments (0 inline, 0 general)