kallithea Changeset - c65b440540da

Changeset - c65b440540da

Parent rev.

Child rev.

[Not reviewed]

beta

0 5 0

Leonardo Carneiro - 13 years ago 2013-03-11 16:43:41
leonardo@unity3d.com

Style clean up, and comments removal.

3 files changed with 3 insertions and 221 deletions:

rhodecode/public/css/contextbar.css

rhodecode/public/css/style.css

rhodecode/templates/changelog/changelog.html

105

0 comments (0 inline, 0 general)

rhodecode/public/css/contextbar.css

➞

Show inline comments

@@ @@ -52,25 +52,23 @@ @@
 }
 #header #header-inner #quick a:hover,
 #content #context-bar a:hover,
 #content #context-bar button:hover {
  	text-decoration: none;
 /* 	color: #bfe3ff;*/
 }
 #content #context-bar .icon {
 	display: inline-block;
 	width: 16px;
 	height: 16px;
 	vertical-align: text-bottom;
 }
 ul.horizontal-list {
 	display: block;
 /*	overflow: hidden;*/
 }
 ul.horizontal-list > li {
 	float: left;
 	position: relative;
 }
@@ @@ -127,25 +125,24 @@ ul.horizontal-list li a { @@
 	position: relative;
 	overflow: hidden;
 	border-bottom: 1px solid #003162;
 	padding: 5px;
 }
 /*#quick,*/
 #header #header-inner #quick ul,
 #revision-changer,
 #context-pages,
 #context-pages ul /*,
 ul#context-actions */{
 #context-pages ul {
 	background: #3b6998; /* Old browsers */
 	background: -moz-linear-gradient(top, #4574a2 0%, #2f5d8b 100%); /* FF3.6+ */
 	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#4574a2), color-stop(100%,#2f5d8b)); /* Chrome,Safari4+ */
 	background: -webkit-linear-gradient(top, #4574a2 0%, #2f5d8b 100%); /* Chrome10+,Safari5.1+ */
 	background: -o-linear-gradient(top, #4574a2 0%, #2f5d8b 100%); /* Opera 11.10+ */
 	background: -ms-linear-gradient(top, #4574a2 0%, #2f5d8b 100%); /* IE10+ */
 	background: linear-gradient(to bottom, #4574a2 0%, #2f5d8b 100%); /* W3C */
     /*Filter on IE will also use overflow:hidden implicitly, and that would clip our inner menus.*/
 	/*filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#4574a2', endColorstr='#2f5d8b',GradientType=0 ); /* IE6-9 */*/
 }
 #header #header-inner #quick a,
 #context-actions a,
 #context-pages a {
@@ @@ -160,15 +157,13 @@ ul#context-actions */{ @@
 }
 ul#context-actions {
 	display: inline-block;
 	float: right;
 	border-radius: 4px;
 	/*background-color:#3b6998;*/
 	background-image: linear-gradient(top, #4574a2 0%, #2f5d8b 100%);
 /*	padding: 5px;*/
 }
 #content ul#context-actions li {
 	padding: 0px;
 	border-right: 1px solid rgba(0,0,0,0.1);
 	border-left: 1px solid rgba(255,255,255,0.1);
 }
@@ @@ -182,43 +177,33 @@ ul#context-actions { @@
 	margin: 0px;
 	height: auto;
 	padding: 10px 10px 10px 30px;
 	background-repeat: no-repeat;
 	background-position: 10px 50%;
 	font-size: 1em;
 	/*padding-top: 24px;*/
 }
 #context-actions a {
 	padding: 11px 10px 12px 30px;
 }
 /*#context-actions button{
 	padding-top: 22px;
 	height: 40px;
 }*/
 #header #header-inner #quick li:hover,
 #revision-changer:hover,
 #context-pages li:hover,
 #context-actions li:hover,
 #content #context-actions li:hover,
 #header #header-inner #quick li.current,
 #context-pages li.current {
 	/*background: rgba(255,255,255,0.2);*/
 	background: #6388ad; /* Old browsers */
 	background: -moz-linear-gradient(top, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* FF3.6+ */
 	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,255,255,0.1)), color-stop(100%,rgba(255,255,255,0))); /* Chrome,Safari4+ */
 	background: -webkit-linear-gradient(top, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* Chrome10+,Safari5.1+ */
 	background: -o-linear-gradient(top, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* Opera 11.10+ */
 	background: -ms-linear-gradient(top, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* IE10+ */
 	background: linear-gradient(to bottom, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* W3C */
 	/*filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#88bfe8', endColorstr='#70b0e0',GradientType=0 ); /* IE6-9 */*/
 	background-image: -webkit-gradient(linear, left top, left bottom, rgb(255,255,255) 0%, rgb(255,255,255) 100%);
 	/*border-radius: 4px;*/
 }
 #content #context-actions li:first-child {
 	border-left: none;
 	border-radius:4px 0 0px 4px;
@@ @@ -257,19 +242,17 @@ ul#context-actions { @@
 }
 #context-state {
 	background-color: #336699;
 	border-top: 1px solid #517da8;
 	min-height: 36px;
 /*	overflow: hidden;*/
 }
 #context-pages {
 	float: right;
 	border-left: 1px solid rgba(0,0,0,0.1);
 /*	overflow: hidden;*/
 }
 #context-pages li.curreasdnt{
 	background: #535353; /* Old browsers */
 	background: -moz-linear-gradient(top, #5d5d5d 0%, #484848 100%); /* FF3.6+ */
 	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#5d5d5d), color-stop(100%,#484848)); /* Chrome,Safari4+ */

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -402,50 +402,20 @@ div:hover > a.permalink { @@
     list-style-type: none;
     list-style-position: outside;
     margin: 4px 8px 0 0;
     padding: 0;
     border-radius: 4px;
+}
 /*
 #header #header-inner #quick > li {
     position: relative;
     float: left;
     margin: 0 5px 0 0;
     padding: 0;
+}
 #header #header-inner #quick li a.menu_link {
     top: 0;
     left: 0;
     height: 1%;
     display: block;
     clear: both;
     overflow: hidden;
     color: #FFF;
     font-weight: 700;
     text-decoration: none;
     background: #369;
     padding: 0;
     -webkit-border-radius: 4px 4px 4px 4px;
     -khtml-border-radius: 4px 4px 4px 4px;
     border-radius: 4px 4px 4px 4px;
+}
 */
 #header #header-inner #quick li span.short {
     padding: 9px 6px 8px 6px;
+}
 #header #header-inner #quick li span {
     /*top: 0;
     right: 0;
     height: 1%;*/
     display: inline;
     /*float: left;*/
     /*border-left: 1px solid #3f6f9f;*/
     margin: 0;
     /*padding: 10px 12px 8px 10px;*/
+}
 #header #header-inner #quick li span.normal {
     border: none;
     padding: 10px 12px 8px;
+}
@@ @@ -466,31 +436,12 @@ div:hover > a.permalink { @@
 #header #header-inner #quick li span.icon img, #header #header-inner #quick li span.icon_short img {
     vertical-align: middle;
     margin-bottom: 2px;
+}
 /*#header #header-inner #quick > li.current > a,
 #header #header-inner #quick > li > a:hover*/ {
     background-color: #4e4e4e;
+}
 /*
 #header #header-inner #quick li.current a span,
 #header #header-inner #quick li a:hover span {
     border-left: 1px solid #545454;
+}
 */
 /*
 #header #header-inner #quick li.current a span.icon,
 #header #header-inner #quick li.current a span.icon_short,
 #header #header-inner #quick li a:hover span.icon,
 #header #header-inner #quick li a:hover span.icon_short {
     border-left: none;
     border-right: 1px solid #464646;
+}
 */
 #header #header-inner #quick ul.repo_switcher {
     max-height: 275px;
     overflow-x: hidden;
     overflow-y: auto;
+}
@@ @@ -952,13 +903,12 @@ tbody .yui-dt-editable { cursor: pointer @@
 #content #right {
     margin: 0 60px 10px 290px;
+}
 #content div.box {
     clear: both;
 /*    overflow: hidden;*/
     background: #fff;
     margin: 0 0 10px;
     padding: 0 0 10px;
     -webkit-border-radius: 4px 4px 4px 4px;
     -khtml-border-radius: 4px 4px 4px 4px;
     border-radius: 4px 4px 4px 4px;
@@ @@ -1723,14 +1673,12 @@ div.form div.fields div.field div.button @@
 #content div.box div.traffic table td.legendLabel {
     padding: 0 3px 2px;
+}
 #content div.box #summary {
     /*float: left;*/
     /*width: 80%;*/
     margin-right: 200px;
+}
 #summary-menu-stats{
     float: left;
     width: 180px;
@@ @@ -1765,13 +1713,12 @@ div.form div.fields div.field div.button @@
 #summary-menu-stats a.settings          { background-image: url('../images/icons/cog_edit.png')}
 #summary-menu-stats a.feed              { background-image: url('../images/icons/rss_16.png')}
 #summary-menu-stats a.repo-size         { background-image: url('../images/icons/server.png')}
 #summary-menu-stats a {
     display: block;
     /*color: #000000;*/
     padding: 12px 30px;
     background-repeat: no-repeat;
     background-position: 10px 50%;
     padding-right: 10px;
+}
@@ @@ -2587,17 +2534,12 @@ h3.files_location { @@
     width: 120px;
     padding-right: 0px;
     overflow: visible;
     position: relative;
+}
 /*
 #graph_content .container .column3 {
     width: 12%
+}
 */
 #graph_content .container .mid {
     padding: 0;
+}
 #graph_content .log-container{
     position: relative;
@@ @@ -2644,13 +2586,12 @@ h3.files_location { @@
     overflow: hidden;
     padding: 0;
     margin: 0;
+}
 #graph_content .comments-container {
     /*width: 40px;*/
     margin: 0.8em 0;
     margin-right: 0.5em;
+}
 #graph_content  .tagcontainer {
     width: 80px;
@@ @@ -2693,22 +2634,12 @@ h3.files_location { @@
+}
 #graph_content .container .mid .message a:hover {
     text-decoration: none;
+}
 /*
  * Stuff we might want to remove from the changelog, or reposition in a tooltip
  */
 #graph_content .container .changeset_id,
 #graph_content .container .changes,
 #graph_content .container .changed_total,
 #graph_content .container .parent {
     display: none;
+}
 .revision-link {
     color:#3F6F9F;
     font-weight: bold !important;
+}
 .issue-tracker-link {
@@ @@ -2807,13 +2738,12 @@ h3.files_location { @@
 .right .parent {
     color: #666666;
     clear:both;
+}
 .right .logtags {
     /*padding: 2px 2px 2px 2px;*/
     line-height: 2.2em;
+}
 .branchtag, .logtags .tagtag, .logtags .booktag {
     margin: 0px 2px;
+}
@@ @@ -2845,15 +2775,13 @@ h3.files_location { @@
+}
 .right .logtags .branchtag,
 .logtags .tagtag,
 .right .merge {
     float: right;
     /*height: 1em;*/
     line-height: 1em;
     /*padding: 0px 0px !important;*/
     margin: 1px 1px !important;
     display: block;
+}
 .bookbook {
     border-color: #46A546;
@@ @@ -3569,13 +3497,12 @@ div.gravatar img { @@
 #header, #content, #footer {
     min-width: 978px;
+}
 #content {
     clear: both;
     /*overflow: hidden;*/
     padding: 10px 10px 14px 10px;
+}
 #content.hover {
     padding: 55px 10px 14px 10px !important;
+}
@@ @@ -3717,13 +3644,12 @@ div.gravatar img { @@
 ins, div.options a:hover {
     text-decoration: none;
+}
 img,
 #header #header-inner #quick li a:hover span.normal,
 /*#header #header-inner #quick li ul li.last,*/
 #content div.box div.form div.fields div.field div.textarea table td table td a,
 #clone_url,
 #clone_url_id
+{
     border: none;
+}
@@ @@ -3854,13 +3780,12 @@ div#legend_data, div#legend_container, d @@
+}
 div.form div.fields div.field div.button input,
 #content div.box div.form div.fields div.buttons input
 div.form div.fields div.buttons input,
 #content div.box div.action div.button input {
     /*color: #000;*/
     font-size: 11px;
     font-weight: 700;
     margin: 0;
+}
 input.ui-button {
@@ @@ -4448,27 +4373,12 @@ form.comment-form { @@
+}
 div.comment-inline-form {
     padding:4px 0px 6px 0px;
+}
 tr.hl-comment {
 /*
     background-color: #FFFFCC !important;
 */
+}
 /*
 tr.hl-comment pre {
     border-top: 2px solid #FFEE33;
     border-left: 2px solid #FFEE33;
     border-right: 2px solid #FFEE33;
+}
 */
 .comment-inline-form strong {
     display: block;
     margin-bottom: 15px;
+}
 .comment-inline-form textarea {
@@ @@ -4568,23 +4478,17 @@ form.comment-inline-form { @@
 .notification-paginator {
     padding: 0px 0px 4px 16px;
     float: left;
+}
 .menu_link_user {
     /*padding: 10px 8px 8px 8px !important;*/
+}
 #context-pages .pull-request span,
 .menu_link_notifications {
     padding: 4px 4px !important;
     /*margin: 7px 4px 0px 0px !important;*/
     text-align: center;
     color:#888 !important;
     /*font-size: 10px;*/
     background-color: #DEDEDE !important;
     border-radius: 4px !important;
     -webkit-border-radius: 4px !important;
+}
 .notification-header {

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -61,13 +61,12 @@ ${self.context_bar('changelog')} @@
                         <td class="author">
                             <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),16)}"/>
                             <span title="${cs.author}" class="user">${h.shorter(h.person(cs.author),22)}</span>
                         </td>
                         <td class="hash">
                             <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}">
                                 <span class="changeset_id">${cs.revision} :</span>
                                 <span class="changeset_hash">${h.short_id(cs.raw_id)}</span>
                             </a>
                         </td>
                         <td class="date">
                             <div class="date">${h.age(cs.date,True)}</div>
                         </td>
@@ @@ -98,111 +97,15 @@ ${self.context_bar('changelog')} @@
                                     %endfor
                                     %if (not c.branch_name) and cs.branch:
                                         <div class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}">
                                             ${h.link_to(h.shorter(cs.branch),h.url('changelog_home',repo_name=c.repo_name,branch=cs.branch))}
                                         </div>
                                     %endif
                                     <%doc>
                                     %if (h.is_hg(c.rhodecode_repo) and cs.bookmarks) or cs.tags:
                                         <div class="tagcontainer">
                                             %if h.is_hg(c.rhodecode_repo):
                                                 <ul class="logtags">
                                                     ##%if len(cs.parents)>1:
                                                     ##    <span class="merge">${_('merge')}</span>
                                                     ##%endif
                                                     %for book in cs.bookmarks:
                                                         <li class="bookbook" title="${'%s %s' % (_('bookmark'),book)}">
                                                             ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
                                                         </li>
                                                     %endfor
                                                 </ul>
                                             %endif
                                             <ul class="logtags tags">
                                                 %for tag in cs.tags:
                                                     <li class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">
                                                         ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
                                                     </li>
                                                 %endfor
                                             </ul>
                                         </div>
                                     %endif
                                     </%doc>
                                 </div>
                             </div>
                         </td>
                        <%doc>
                         <td class="right">
                             <div class="changes">
                                 <div id="changed_total_${cs.raw_id}" style="float:right;" class="changed_total tooltip" title="${h.tooltip(_('Affected number of files, click to show more details'))}">
                                     ${len(cs.affected_files)}
                                 </div>
                                 <div class="changeset-status-container">
                                     %if c.statuses.get(cs.raw_id):
                                         <div title="${_('Changeset status')}" class="changeset-status-lbl">${c.statuses.get(cs.raw_id)[1]}</div>
                                         <div class="changeset-status-ico">
                                         %if c.statuses.get(cs.raw_id)[2]:
                                             <a class="tooltip" title="${_('Click to open associated pull request #%s' % c.statuses.get(cs.raw_id)[2])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" /></a>
                                         %else:
                                             <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" />
                                         %endif
                                       </div>
                                     %endif
                                 </div>
                             </div>
                             %if cs.parents:
                                 %for p_cs in reversed(cs.parents):
                                     <div class="parent">${_('Parent')}
                                         <span class="changeset_id">${p_cs.revision}:<span class="changeset_hash">${h.link_to(h.short_id(p_cs.raw_id),
                                     h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}</span></span>
                                     </div>
                                 %endfor
                             %else:
                                 <div class="parent">${_('No parents')}</div>
                             %endif
                             %if len(c.comments.get(cs.raw_id,[])) > 0:
                                 <div class="comments-container">
                                     <div class="comments-cnt" title="${('comments')}">
                                         <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">
                                             ${len(c.comments[cs.raw_id])}
                                         </a>
                                     </div>
                                 </div>
                             %endif
                             %if (h.is_hg(c.rhodecode_repo) and cs.bookmarks) or cs.tags:
                                 <div class="tagcontainer">
                                     %if h.is_hg(c.rhodecode_repo):
                                         <ul class="logtags">
                                             ##%if len(cs.parents)>1:
                                             ##    <span class="merge">${_('merge')}</span>
                                             ##%endif
                                             %for book in cs.bookmarks:
                                                 <li class="bookbook" title="${'%s %s' % (_('bookmark'),book)}">
                                                     ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
                                                 </li>
                                             %endfor
                                         </ul>
                                     %endif
                                     <ul class="logtags tags">
                                         %for tag in cs.tags:
                                             <li class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">
                                                 ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
                                             </li>
                                         %endfor
                                     </ul>
                                 </div>
                             %endif
                         </td>
                         </%doc>
                     </tr>
                 %endfor
                 </tbody>
                 </table>
@@ @@ -299,20 +202,12 @@ ${self.context_bar('changelog')} @@
                     var r = new BranchRenderer();
                     r.render(jsdata,100,line_count);
                 });
                 // Fetch changeset details
                 YUE.on(YUD.getElementsByClassName('changed_total'),'click',function(e){
                     var id = e.currentTarget.id;
                     var url = "${h.url('changelog_details',repo_name=c.repo_name,cs='__CS__')}";
                     var url = url.replace('__CS__',id.replace('changed_total_',''));
                     ypjax(url,id,function(){tooltip_activate()});
                 });
                 // change branch filter
                 YUE.on(YUD.get('branch_filter'),'change',function(e){
                     var selected_branch = e.currentTarget.options[e.currentTarget.selectedIndex].value;
                     var url_main = "${h.url('changelog_home',repo_name=c.repo_name)}";
                     var url = "${h.url('changelog_home',repo_name=c.repo_name,branch='__BRANCH__')}";
                     var url = url.replace('__BRANCH__',selected_branch);

0 comments (0 inline, 0 general)