kallithea Changeset - 065690dba16b

Changeset - 065690dba16b

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

domruf - 8 years ago 2017-10-29 11:07:49
dominikruf@gmail.com

less: drop special summary style

- remove special margin
- use the same style for all descriptions (same as .formatted-fixed)
- there is no #content div.panel #summary p

3 files changed with 2 insertions and 48 deletions:

kallithea/public/css/style.css

kallithea/public/less/style.less

kallithea/templates/summary/summary.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -133,115 +133,96 @@ table.changesets .comments { @@
+}
 div.panel-primary {
   border: none;
+}
 div.panel div.panel-heading {
   background-color: #577632;
   font-size: 14px;
   font-weight: 700;
+}
 div.panel.panel-default:last-child {
   margin-bottom: 0;
+}
 div.panel.panel-default > div.panel-heading {
   background: #eee;
+}
 #content div.panel div.panel-heading .pull-left {
   margin-right: 10px;
+}
 #content div.panel div.panel-heading .pull-right {
   margin-left: 10px;
+}
 #content div.panel div.form div.form-group {
   border-bottom: 1px solid #DDD;
   clear: both;
+}
 #content div.panel ul.pagination {
   margin: 10px 0 0 0;
+}
 #content div.panel ul.pagination > li > a,
 #content div.panel ul.pagination > li > span {
   background: #ebebeb url("../images/pager.png") repeat-x;
   color: #4A4A4A;
   font-weight: 700;
   border-top: 1px solid #dedede;
   border-left: 1px solid #cfcfcf;
   border-bottom: 1px solid #c4c4c4;
   border-right: 1px solid #cfcfcf;
+}
 #content div.panel ul.pagination > li.active > span,
 #content div.panel ul.pagination > li:hover > a,
 #content div.panel ul.pagination > li:active > a {
   background: #b4b4b4 url("../images/pager_selected.png") repeat-x;
   border-top: 1px solid #ccc;
   border-left: 1px solid #bebebe;
   border-bottom: 1px solid #afafaf;
   border-right: 1px solid #bebebe;
   color: #515151;
+}
 #content div.panel div#summary-panel-body.form div.form-group > div {
   margin: 0 0 10px 150px;
+}
 #content div.panel #summary {
   margin-right: 200px;
   min-height: 200px;
+}
 #summary .metatag {
   display: inline-block;
   padding: 3px 5px;
   margin-bottom: 3px;
   margin-right: 1px;
   border-radius: 5px;
+}
 #content div.panel #summary p {
   margin-bottom: -5px;
   width: 600px;
   white-space: pre-wrap;
+}
 #clone_by_name.input-group,
 #clone_by_id.input-group {
   width: 100%;
+}
 #clone_by_name.input-group > span,
 #clone_by_id.input-group > span {
   display: inline-block;
   float: left;
   height: 30px;
+}
 #clone_by_name.input-group > input,
 #clone_by_id.input-group > input {
   width: 50%;
+}
 #clone_by_name.input-group .form-control,
 #clone_by_id.input-group .form-control {
   height: 30px;
+}
 .metatag {
   display: inline-block;
   margin-right: 1px;
   border-radius: 4px 4px 4px 4px;
   border: solid 1px #9CF;
   padding: 2px 3px 2px 3px !important;
   background-color: #DEF;
+}
 .metatag[data-tag="dead"] {
   background-color: #E44;
+}
 .metatag[data-tag="stale"] {
   background-color: #EA4;
+}
 .metatag[data-tag="featured"] {
   background-color: #AEA;
+}
 .metatag[data-tag="requires"] {
   background-color: #9CF;
+}
 .metatag[data-tag="recommends"] {
   background-color: #BDF;
+}
 .metatag[data-tag="lang"] {
   background-color: #FAF474;
+}
 .metatag[data-tag="license"] {
   border: solid 1px #9CF;
   background-color: #DEF;
+}
@@ @@ -405,100 +386,96 @@ table#changesets .booktag { @@
 .logtags .branchtag a:hover,
 .logtags .branchtag a,
 .branchtag a,
 .branchtag a:hover {
   text-decoration: none;
   color: inherit;
+}
 .logtags .tagtag {
   padding: 1px 3px 1px 3px;
   background-color: #62cffc;
   font-size: 10px;
   color: #ffffff;
   white-space: nowrap;
   border-radius: 3px;
+}
 .tagtag a,
 .tagtag a:hover,
 .logtags .tagtag a,
 .logtags .tagtag a:hover {
   text-decoration: none;
   color: inherit;
+}
 .logbooks .booktag,
 .logbooks .booktag,
 .logtags .booktag,
 .logtags .booktag {
   padding: 1px 3px 1px 3px;
   background-color: #46A546;
   font-size: 10px;
   color: #ffffff;
   white-space: nowrap;
   border-radius: 3px;
+}
 .logbooks .booktag,
 .logbooks .booktag a,
 .right .logtags .booktag,
 .logtags .booktag a {
   color: #ffffff;
+}
 .logbooks .booktag,
 .logbooks .booktag a:hover,
 .logtags .booktag,
 .logtags .booktag a:hover,
 .booktag a,
 .booktag a:hover {
   text-decoration: none;
   color: inherit;
+}
 #summary .desc {
   white-space: pre;
   width: 100%;
+}
 #footer {
   background-color: #577632;
   margin-bottom: 0;
+}
 #footer > span {
   color: #FFF;
   font-weight: 700;
+}
 #footer .navbar-link {
   color: #FFF;
+}
 #login .panel-body .icon-lock {
   font-size: 100px;
   color: #DDD;
   margin-left: -15px;
   z-index: 1;
+}
 .user-menu {
   padding: 0 !important;
+}
 .user-menu .gravatar {
   margin: 0px 0px 0px 0px;
   cursor: pointer;
+}
 .user-menu .gravatar.enabled {
   background-color: #FDF784 !important;
+}
 .user-menu .gravatar:hover {
   background-color: #FDF784 !important;
+}
 #quick_login {
   width: 330px;
   min-height: 110px;
   padding: 0;
   position: absolute;
   right: 0;
   color: #fff;
   background-color: #577632;
   background-repeat: repeat-x;
   background-image: linear-gradient(to bottom, #577632, #577632);
   z-index: 999;
   border-radius: 0px 0px 4px 4px;
   box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
   overflow: hidden;
+}
 #quick_login .form {
   margin: 15px;
+}

kallithea/public/less/style.less

➞

Show inline comments

@@ @@ -152,141 +152,118 @@ div.panel-primary { @@
   border: none;
+}
 div.panel div.panel-heading {
   background-color: #577632;
   font-size: 14px;
   font-weight: 700;
+}
 div.panel.panel-default:last-child {
   margin-bottom: 0;
+}
 div.panel.panel-default > div.panel-heading {
   background: #eee;
+}
 #content div.panel div.panel-heading .pull-left {
   margin-right: 10px;
+}
 #content div.panel div.panel-heading .pull-right {
   margin-left: 10px;
+}
 #content div.panel div.form div.form-group {
   border-bottom: 1px solid #DDD;
   clear: both;
+}
 #content div.panel ul.pagination {
   margin: 10px 0 0 0;
+}
 #content div.panel ul.pagination > li > a,
 #content div.panel ul.pagination > li > span {
   background: #ebebeb url("../images/pager.png") repeat-x;
   color: #4A4A4A;
   font-weight: 700;
   border-top: 1px solid #dedede;
   border-left: 1px solid #cfcfcf;
   border-bottom: 1px solid #c4c4c4;
   border-right: 1px solid #cfcfcf;
+}
 #content div.panel ul.pagination > li.active > span,
 #content div.panel ul.pagination > li:hover > a,
 #content div.panel ul.pagination > li:active > a {
   background: #b4b4b4 url("../images/pager_selected.png") repeat-x;
   border-top: 1px solid #ccc;
   border-left: 1px solid #bebebe;
   border-bottom: 1px solid #afafaf;
   border-right: 1px solid #bebebe;
   color: #515151;
+}
 #content div.panel div#summary-panel-body.form div.form-group > div {
   margin: 0 0 10px 150px;
+}
 #content div.panel #summary {
   margin-right: 200px;
   min-height: 200px;
+}
 #summary .metatag {
   display: inline-block;
   padding: 3px 5px;
   margin-bottom: 3px;
   margin-right: 1px;
   border-radius: 5px;
+}
 #content div.panel #summary p {
   margin-bottom: -5px;
   width: 600px;
   white-space: pre-wrap;
+}
 #clone_by_name.input-group,
 #clone_by_id.input-group {
   width: 100%;
+}
 #clone_by_name.input-group > span,
 #clone_by_id.input-group > span {
   display: inline-block;
   float: left;
   height: 30px;
+}
 #clone_by_name.input-group > input,
 #clone_by_id.input-group > input {
   width: 50%;
+}
 #clone_by_name.input-group .form-control,
 #clone_by_id.input-group .form-control {
   height: 30px;
+}
 @import "kallithea-tags.less";
 #summary .desc {
   white-space: pre;
   width: 100%;
+}
 #footer {
   background-color: #577632;
   margin-bottom: 0;
+}
 #footer > span {
   color: #FFF;
   font-weight: 700;
+}
 #footer .navbar-link {
   color: #FFF;
+}
 #login .panel-body .icon-lock {
   font-size: 100px;
   color: #DDD;
   margin-left: -15px;
   z-index: 1;
+}
 .user-menu {
   padding: 0 !important;
+}
 .user-menu .gravatar {
   margin: 0px 0px 0px 0px;
   cursor: pointer;
+}
 .user-menu .gravatar.enabled {
   background-color: #FDF784 !important;
+}
 .user-menu .gravatar:hover {
   background-color: #FDF784 !important;
+}
 #quick_login {
   width: 330px;
   min-height: 110px;
   padding: 0;
   position: absolute;
   right: 0;
   color: #fff;
   background-color: #577632;
   background-repeat: repeat-x;
   background-image: linear-gradient(to bottom, #577632, #577632);
   z-index: 999;
   border-radius: 0px 0px 4px 4px;
   box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
   overflow: hidden;
+}
 #quick_login .form {
   margin: 15px;

kallithea/templates/summary/summary.html

➞

Show inline comments

@@ @@ -32,97 +32,97 @@ @@
     ${self.menu('repositories')}
 </%block>
 <%block name="head_extra">
   <link href="${h.url('atom_feed_home',repo_name=c.db_repo.repo_name,api_key=request.authuser.api_key)}" rel="alternate" title="${_('%s ATOM feed') % c.repo_name}" type="application/atom+xml" />
   <link href="${h.url('rss_feed_home',repo_name=c.db_repo.repo_name,api_key=request.authuser.api_key)}" rel="alternate" title="${_('%s RSS feed') % c.repo_name}" type="application/rss+xml" />
   <script>
   redirect_hash_branch = function(){
     var branch = window.location.hash.replace(/^#(.*)/, '$1');
     if (branch){
       window.location = ${h.js(h.url('changelog_home',repo_name=c.repo_name,branch='__BRANCH__'))}
         .replace('__BRANCH__',branch);
+    }
+  }
   redirect_hash_branch();
   window.onhashchange = function() {
     redirect_hash_branch();
   };
   </script>
 </%block>
 <%def name="main()">
 ${self.repo_context_bar('summary')}
 <div class="panel panel-primary">
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </div>
     <div id="summary-panel-body" class="form panel-body">
         <div id="summary" class="pull-left">
             <div class="form-group form-inline">
                 <label>${_('Clone URL')}:</label>
                 <div id="clone-url">
                   <div id="clone_by_name" class="input-group">
                     <span class="input-group-addon">${self.repotag(c.db_repo)}</span>
                     <input class="form-control" size="80" readonly="readonly" value="${c.clone_repo_url}"/>
                     <span class="input-group-addon btn">${_('Show by ID')}</span>
                   </div>
                   <div id="clone_by_id" class="input-group" style="display:none">
                     <span class="input-group-addon">${self.repotag(c.db_repo)}</span>
                     <input class="form-control" size="80" readonly="readonly" value="${c.clone_repo_url_id}"/>
                     <span class="input-group-addon btn">${_('Show by Name')}</span>
                   </div>
                 </div>
             </div>
             <div class="form-group">
               <label>${_('Description')}:</label>
-              <div class="desc">${h.urlify_text(c.db_repo.description, stylize=c.visual.stylify_metatags)}</div>
+              <div class="formatted-fixed">${h.urlify_text(c.db_repo.description, stylize=c.visual.stylify_metatags)}</div>
             </div>
             <div class="form-group">
               <label>${_('Trending files')}:</label>
               <div>
                 %if c.show_stats:
                 <div id="lang_stats"></div>
                 %else:
                    ${_('Statistics are disabled for this repository')}
                    %if h.HasPermissionAny('hg.admin')('enable stats on from summary'):
                         ${h.link_to(_('Enable'),h.url('edit_repo',repo_name=c.repo_name, anchor='repo_enable_statistics'),class_="btn btn-default btn-xs")}
                    %endif
                 %endif
               </div>
             </div>
             <div class="form-group">
               <label>${_('Download')}:</label>
               <div>
                 %if len(c.db_repo_scm_instance.revisions) == 0:
                   ${_('There are no downloads yet')}
                 %elif not c.enable_downloads:
                   ${_('Downloads are disabled for this repository')}
                     %if h.HasPermissionAny('hg.admin')('enable downloads on from summary'):
                         ${h.link_to(_('Enable'),h.url('edit_repo',repo_name=c.repo_name, anchor='repo_enable_downloads'),class_="btn btn-default btn-xs")}
                     %endif
                 %else:
                     <span id="${'zip_link'}">
                         <a class="btn btn-default btn-sm" href="${h.url('files_archive_home',repo_name=c.db_repo.repo_name,fname='tip.zip')}"><i class="icon-file-zip"></i> ${_('Download as zip')}</a>
                     </span>
                     ${h.hidden('download_options')}
                     <span>
                       <label data-toggle="tooltip" title="${_('Check this to download archive with subrepos')}">
                           <input id="archive_subrepos" type="checkbox" name="subrepos" />
                           ${_('With subrepos')}
                       </label>
                     </span>
                 %endif
               </div>
             </div>
         </div>
         <ul id="summary-menu-stats" class="list-group pull-right">
             <li class="list-group-item">
                <a title="${_('Owner')} ${c.db_repo.owner.email}">
                 <i class="icon-user"></i> ${c.db_repo.owner.username}
                 ${h.gravatar_div(c.db_repo.owner.email, size=18, div_class="pull-right")}
               </a>
             </li>

0 comments (0 inline, 0 general)