kallithea Changeset - 81d20cfa2607

Changeset - 81d20cfa2607

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 9 years ago 2017-01-09 00:41:30
mads@kiilerich.com

style: Boostrap-ish markup of footers

Based on work by Dominik Ruf.

2 files changed with 11 insertions and 24 deletions:

kallithea/public/css/style.css

kallithea/templates/base/base.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -1231,215 +1231,206 @@ div.form div.form-horizontal div.form-gr @@
 #summary-menu-stats .badge {
     padding: 2px 4px !important;
     font-size: 10px;
+}
 #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;
+}
 #content div.panel #summary p:last-child {
     margin-bottom: 9px;
+}
 #content div.panel #summary p:first-of-type {
     margin-top: 9px;
+}
 .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;
+}
 .metatag[data-tag="see"] {
     border: solid 1px #CBD;
     background-color: #EDF;
+}
 a.metatag[data-tag="license"]:hover {
     background-color: #577632;
     color: #FFF;
     text-decoration: none;
+}
 #summary .desc {
     white-space: pre;
     width: 100%;
+}
 #summary .repo_name {
     font-size: 1.6em;
     font-weight: bold;
     vertical-align: baseline;
     clear: right
+}
 #footer {
     clear: both;
     overflow: hidden;
     text-align: right;
     margin: 0;
     padding: 0 10px 4px;
     margin: -10px 0 0;
+}
 #footer div#footer-inner {
     background-color: #577632;
     background-repeat: repeat-x;
     background-image: linear-gradient(to bottom, #577632, #577632);
     box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
     border-radius: 4px 4px 4px 4px;
+}
-#footer div#footer-inner p {
+#footer > span {
     padding: 15px 25px 15px 0;
     color: #FFF;
     font-weight: 700;
+}
 #footer div#footer-inner .footer-link {
     float: left;
     padding-left: 10px;
+}
 #footer div#footer-inner .footer-link a,
 #footer div#footer-inner .footer-link-right a {
 #footer .navbar-link {
     color: #FFF;
+}
 #login div.panel-heading {
     clear: both;
     overflow: hidden;
     position: relative;
     background-color: #577632;
     background-repeat: repeat-x;
     background-image: linear-gradient(to bottom, #577632, #577632);
     margin: 0 auto;
     padding: 0;
+}
 #login div.inner .icon-lock {
     font-size: 80pt;
     color: #DDD;
+}
 #login div.inner {
     background: #FFF;
     border-top: none;
     border-bottom: none;
     margin: 0 auto;
     padding: 20px;
+}
 #login div.form div.form-horizontal div.form-group > label {
     width: 173px;
     float: left;
     text-align: right;
     margin: 2px 10px 0 0;
     padding: 5px 0 0 5px;
+}
 #login div.form div.form-horizontal div.form-group div input {
     background: #FFF;
     border-top: 1px solid #b3b3b3;
     border-left: 1px solid #b3b3b3;
     border-right: 1px solid #eaeaea;
     border-bottom: 1px solid #eaeaea;
     color: #000;
     font-size: 11px;
     margin: 0;
     padding: 7px 7px 6px;
+}
 #login div.form .buttons {
     float: right;
+}
 #login div.form div.links {
     clear: both;
     overflow: hidden;
     margin: 10px 0 0;
     border-top: 1px solid #DDD;
     padding: 10px 0 0;
+}
 .user-menu {
     margin: 0px !important;
     float: left;
+}
 .user-menu .container {
     padding: 0px 4px 0px 4px;
     margin: 0px 0px 0px 0px;
+}
 .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 {
     min-height: 110px;
     padding: 4px;
     position: absolute;
     right: 0;
     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 h4 {
     color: #fff;

kallithea/templates/base/base.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="root.html"/>
 <!-- CONTENT -->
 <div id="content">
     ${self.flash_msg()}
     <div id="main">
         ${next.main()}
     </div>
 </div>
 <!-- END CONTENT -->
 <!-- FOOTER -->
 <div id="footer">
    <div id="footer-inner" class="title">
        <div>
            <p class="footer-link pull-left">
 <div id="footer" class="footer navbar navbar-inverse">
     <span class="navbar-text pull-left">
                ${_('Server instance: %s') % c.instance_id if c.instance_id else ''}
            </p>
            <p class="footer-link pull-right">
     </span>
     <span class="navbar-text pull-right">
                This site is powered by
                %if c.visual.show_version:
-                   <a href="${h.url('kallithea_project_url')}" target="_blank">Kallithea</a> ${c.kallithea_version},
+            <a class="navbar-link" href="${h.url('kallithea_project_url')}" target="_blank">Kallithea</a> ${c.kallithea_version},
                %else:
-                   <a href="${h.url('kallithea_project_url')}" target="_blank">Kallithea</a>,
+            <a class="navbar-link" href="${h.url('kallithea_project_url')}" target="_blank">Kallithea</a>,
                %endif
                which is
-               <a href="${h.canonical_url('about')}#copyright">&copy; 2010&ndash;2017 by various authors &amp; licensed under GPLv3</a>.
+        <a class="navbar-link" href="${h.canonical_url('about')}#copyright">&copy; 2010&ndash;2017 by various authors &amp; licensed under GPLv3</a>.
                %if c.issues_url:
-                   &ndash; <a href="${c.issues_url}" target="_blank">${_('Support')}</a>
+            &ndash; <a class="navbar-link" href="${c.issues_url}" target="_blank">${_('Support')}</a>
                %endif
            </p>
        </div>
    </div>
     </span>
 </div>
 <!-- END FOOTER -->
 ### MAKO DEFS ###
 <%block name="branding_title">
     %if c.site_name:
     &middot; ${c.site_name}
     %endif
 </%block>
 <%def name="flash_msg()">
     <%include file="/base/flash_msg.html"/>
 </%def>
 <%def name="breadcrumbs()">
     <div class="breadcrumbs">
     ${self.breadcrumbs_links()}
     </div>
 </%def>
 <%def name="admin_menu()">
   <ul class="dropdown-menu" role="menu">
       <li><a href="${h.url('admin_home')}"><i class="icon-book"></i> ${_('Admin Journal')}</a></li>
       <li><a href="${h.url('repos')}"><i class="icon-database"></i> ${_('Repositories')}</a></li>
       <li><a href="${h.url('repos_groups')}"><i class="icon-folder"></i> ${_('Repository Groups')}</a></li>
       <li><a href="${h.url('users')}"><i class="icon-user"></i> ${_('Users')}</a></li>
       <li><a href="${h.url('users_groups')}"><i class="icon-users"></i> ${_('User Groups')}</a></li>
       <li><a href="${h.url('admin_permissions')}"><i class="icon-block"></i> ${_('Default Permissions')}</a></li>
       <li><a href="${h.url('auth_home')}"><i class="icon-key"></i> ${_('Authentication')}</a></li>
       <li><a href="${h.url('defaults')}"><i class="icon-wrench"></i> ${_('Repository Defaults')}</a></li>
       <li class="last"><a href="${h.url('admin_settings')}"><i class="icon-gear"></i> ${_('Settings')}</a></li>
   </ul>
 </%def>
 ## admin menu used for people that have some admin resources
 <%def name="admin_menu_simple(repositories=None, repository_groups=None, user_groups=None)">
   <ul class="dropdown-menu" role="menu">
    %if repositories:
       <li><a href="${h.url('repos')}"><i class="icon-database"></i> ${_('Repositories')}</a></li>
    %endif
    %if repository_groups:
       <li><a href="${h.url('repos_groups')}"><i class="icon-folder"></i> ${_('Repository Groups')}</a></li>
    %endif
    %if user_groups:
       <li><a href="${h.url('users_groups')}"><i class="icon-users"></i> ${_('User Groups')}</a></li>
    %endif
   </ul>
 </%def>
 <%def name="repotag(repo)">
   %if h.is_hg(repo):
     <span class="repotag" title="${_('Mercurial repository')}">hg</span>
   %endif
   %if h.is_git(repo):
     <span class="repotag" title="${_('Git repository')}">git</span>
   %endif
 </%def>
 <%def name="repo_context_bar(current=None, rev=None)">
   <% rev = None if rev == 'tip' else rev %>
   <!--- CONTEXT BAR -->
   <div id="context-bar" class="panel panel-primary">
       <h2>
         ${repotag(c.db_repo)}
         ## public/private
         %if c.db_repo.private:
           <i class="icon-keyhole-circled"></i>
         %else:
           <i class="icon-globe"></i>
         %endif
         %for group in c.db_repo.groups_with_parents:
           ${h.link_to(group.name, url('repos_group_home', group_name=group.group_name))}
           &raquo;
         %endfor
         ${h.link_to(c.db_repo.just_name, url('summary_home', repo_name=c.db_repo.repo_name))}
         %if current == 'createfork':
          - ${_('Create Fork')}
         %endif
       </h2>
       <ul id="context-pages" class="horizontal-list">
         <li class="${'current' if current == 'summary' else ''}" data-context="summary"><a href="${h.url('summary_home', repo_name=c.repo_name)}"><i class="icon-doc-text"></i> ${_('Summary')}</a></li>
         %if rev:
         <li class="${'current' if current == 'changelog' else ''}" data-context="changelog"><a href="${h.url('changelog_file_home', repo_name=c.repo_name, revision=rev, f_path='')}"><i class="icon-clock"></i> ${_('Changelog')}</a></li>
         %else:
         <li class="${'current' if current == 'changelog' else ''}" data-context="changelog"><a href="${h.url('changelog_home', repo_name=c.repo_name)}"><i class="icon-clock"></i> ${_('Changelog')}</a></li>
         %endif
         <li class="${'current' if current == 'files' else ''}" data-context="files"><a href="${h.url('files_home', repo_name=c.repo_name, revision=rev or 'tip')}"><i class="icon-doc-inv"></i> ${_('Files')}</a></li>
         <li class="${'current' if current == 'switch-to' else ''}" data-context="switch-to">
           <input id="branch_switcher" name="branch_switcher" type="hidden">
         </li>

0 comments (0 inline, 0 general)