kallithea Changeset - 6f1439efaed6

Changeset - 6f1439efaed6

Parent rev.

Child rev.

[Not reviewed]

Merge beta

4 3 0

Marcin Kuzminski - 14 years ago 2011-09-14 21:40:01
marcin@python-works.com

Automated merge with https://bitbucket.org/marcinkuzminski/rhodecode

7 files changed with 6 insertions and 5 deletions:

rhodecode/public/css/pygments.css

rhodecode/public/css/style.css

rhodecode/public/images/quick_l.png

bin+del

rhodecode/public/images/quick_l_selected.png

bin+del

rhodecode/public/images/quick_r.png

bin+del

rhodecode/public/images/quick_r_selected.png

bin+del

rhodecode/templates/index_base.html

0 comments (0 inline, 0 general)

rhodecode/public/css/pygments.css

➞

Show inline comments

@@ @@ -4,48 +4,52 @@ div.codeblock { @@
     border: 1px solid #ccc;
     background: #f8f8f8;
     font-size: 100%;
     line-height: 100%;
     /* new */
     line-height: 125%;
+}
 div.codeblock .code-header{
 	border-bottom: 1px solid #CCCCCC;
 	background: #EEEEEE;
 	padding:10px 0 10px 0;
+}
 div.codeblock .code-header .revision{
 	margin-left:25px;
 	font-weight: bold;
+}
 div.codeblock .code-header .commit{
 	margin-left:25px;
 	font-weight: normal;
 	white-space:pre;
+}
 div.codeblock .code-body table{
     width: 0 !important;
     border: 0px !important;
+}
 div.codeblock .code-body table td {
 	border: 0px !important;
+}
 div.code-body {
 	background-color: #FFFFFF;
+}
 div.code-body pre .match{
 	background-color: #FAFFA6;
+}
 div.code-body pre .break{
 	background-color: #DDE7EF;
 	width: 100%;
 	color: #747474;
 	display: block;
+}
 div.annotatediv{
 	margin-left:2px;
 	margin-right:4px;
+}
 .code-highlight {
     padding: 0px;
     margin-top: 5px;
     margin-bottom: 5px;
     border-left: 2px solid #ccc;
+}

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -334,49 +334,48 @@ height:1%; @@
 display:block;
 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;
+}
 #header #header-inner #quick li span.icon {
 top:0;
 left:0;
 border-left:none;
 border-right:1px solid #2e5c89;
 padding:8px 8px 4px;
+}
 #header #header-inner #quick li span.icon_short {
 top:0;
 left:0;
 border-left:none;
 background:url("../images/quick_l.png") no-repeat top left;
 border-right:1px solid #2e5c89;
 padding:9px 4px 4px;
+}
 #header #header-inner #quick li a:hover {
 background:#4e4e4e  no-repeat top left;
+}
 #header #header-inner #quick li a:hover span {
 border-left:1px solid #545454;
+}
 #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 {
 top:29px;
 right:0;
 min-width:200px;
 display:none;
 position:absolute;
 background:#FFF;

rhodecode/public/images/quick_l.png

➞

Show inline comments

		deleted file
		binary diff not shown

Show images

rhodecode/public/images/quick_l_selected.png

➞

Show inline comments

		deleted file
		binary diff not shown

Show images

rhodecode/public/images/quick_r.png

➞

Show inline comments

		deleted file
		binary diff not shown

Show images

rhodecode/public/images/quick_r_selected.png

➞

Show inline comments

		deleted file
		binary diff not shown

Show images

rhodecode/templates/index_base.html

➞

Show inline comments

 <%page args="parent" />
     <%def name="get_sort(name)">
         <%name_slug = name.lower().replace(' ','_') %>
         %if name_slug == c.sort_slug:
           %if c.sort_by.startswith('-'):
             <a href="?sort=${name_slug}">${name}&uarr;</a>
           %else:
             <a href="?sort=-${name_slug}">${name}&darr;</a>
           %endif:
         %else:
             <a href="?sort=${name_slug}">${name}</a>
         %endif
     </%def>
     <div class="box">
         <!-- box / title -->
         <div class="title">
             <h5><input class="top-right-rounded-corner top-left-rounded-corner
                                bottom-left-rounded-corner bottom-right-rounded-corner"
                         id="q_filter" size="15" type="text" name="filter"
                         value="${_('quick filter...')}"/>
             <h5>
             <input class="top-right-rounded-corner top-left-rounded-corner bottom-left-rounded-corner bottom-right-rounded-corner" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}"/>
             ${parent.breadcrumbs()} <span id="repo_count"></span> ${_('repositories')}
             </h5>
             %if c.rhodecode_user.username != 'default':
                 %if h.HasPermissionAny('hg.admin','hg.create.repository')():
                 <ul class="links">
                   <li>
                     <span>${h.link_to(_('ADD NEW REPOSITORY'),h.url('admin_settings_create_repository'))}</span>
                   </li>
                 </ul>
                 %endif
             %endif
         </div>
         <!-- end box / title -->
         <div class="table">
            % if c.groups:
             <table>
                 <thead>
                     <tr>
                         <th class="left"><a href="#">${_('Group name')}</a></th>
                         <th class="left"><a href="#">${_('Description')}</a></th>
                         ##<th class="left"><a href="#">${_('Number of repositories')}</a></th>
                     </tr>
                 </thead>

0 comments (0 inline, 0 general)