kallithea Changeset - 482c531e62ef

Changeset - 482c531e62ef

Parent rev.

Child rev.

[Not reviewed]

default

0 6 0

Mads Kiilerich (mads) - 9 years ago 2017-03-06 02:23:26
mads@kiilerich.com

style: refactor panel margin css - make it more like real Bootstrap by putting padding on .panel-body

6 files changed with 69 insertions and 80 deletions:

kallithea/public/css/contextbar.css

kallithea/public/css/style.css

kallithea/templates/about.html

kallithea/templates/changelog/changelog.html

kallithea/templates/search/search.html

kallithea/templates/summary/summary.html

0 comments (0 inline, 0 general)

kallithea/public/css/contextbar.css

➞

Show inline comments

@@ @@ -284,25 +284,25 @@ nav.navbar #quick a { @@
 #revision-changer:before {
     position: absolute;
     top: 0px;
     right: 0px;
     border-right: 1px solid rgba(0,0,0,0.1);
     height: 25px;
     padding-top: 10px;
     padding-right: 10px;
 }
 #context-pages li:last-child a {
-    padding-right: 10px;
+    padding-right: 20px;
 }
 #context-bar #revision-changer {
     position: relative;
     cursor: pointer;
     border: none;
     padding: 0;
     margin: 0;
     color: #FFFFFF;
     font-size: 0.85em;
     padding: 2px 15px;
     padding-bottom: 3px;

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -149,25 +149,25 @@ div.options { @@
+}
 div.options a {
     height: 1%;
     display: block;
     text-decoration: none;
     margin: 0;
     padding: 3px 8px;
+}
 code,
 .code pre,
-div.readme .readme_box pre,
 div.readme pre,
 div.rst-block pre,
 div.formatted-fixed,
 #changeset_content div.message,
 .CodeMirror .CodeMirror-code pre {
     font-size: 12px;
     font-family: Lucida Console, Consolas, Monaco, Inconsolata, Liberation Mono, monospace;
+}
 div.formatted-fixed {
     white-space: pre-wrap;
+}
@@ @@ -502,40 +502,39 @@ nav.navbar #quick .repo_switcher_type { @@
     position: absolute;
+}
 #content #right {
     margin: 0 60px 10px 290px;
+}
 #content nav.navbar,
 div.panel-primary {
     clear: both;
     background: #fff;
     margin: 0 0 10px;
     padding: 0 0 10px;
     border-radius: 4px 4px 4px 4px;
     box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
+}
 div.panel div.panel-heading {
     clear: both;
     overflow: hidden;
     background-color: #577632;
     background-repeat: repeat-x;
     background-image: linear-gradient(to bottom, #577632, #577632);
     margin: 0 0 20px;
     padding: 10px 20px;
     border-radius: 4px 4px 0 0;
+}
 #content div.panel div.panel-heading .panel-title,
 #content div.panel div.panel-heading a {
     color: #FFFFFF;
+}
 #content div.panel div.panel-heading ul.links li {
     list-style: none;
     float: left;
     margin: 0;
     padding: 0;
+}
 #content div.panel div.panel-heading ul.links li a {
@@ @@ -594,26 +593,29 @@ div.panel div.panel-heading { @@
 #content div.panel div.h5,
 #content div.panel div.h6 {
     clear: both;
     overflow: hidden;
     margin: 8px 0 3px;
     padding-bottom: 2px;
+}
 #content div.panel p {
     color: #5f5f5f;
     font-size: 12px;
     line-height: 150%;
     margin: 0 24px 10px;
     padding: 0;
     margin: 0 0 10px;
+}
 #content div.panel .panel-body.panel-about > ul {
     margin: 0 0 10px 20px;
+}
 #content div.panel blockquote {
     border-left: 4px solid #DDD;
     color: #5f5f5f;
     font-size: 11px;
     line-height: 150%;
     margin: 0 34px;
     padding: 0 0 0 14px;
+}
 #content div.panel blockquote p {
@@ @@ -1152,25 +1154,25 @@ div.form div.form-horizontal div.form-gr @@
+}
 ul#summary-menu-stats {
     float: left;
     width: 180px;
     position: absolute;
     top: 0;
     right: 0;
     display: block;
     background-color: #f9f9f9;
     border: 1px solid #d1d1d1;
     border-radius: 4px;
-    margin: 10px 20px;
     margin: 20px;
+}
 #content #summary-menu-stats li {
     border-top: 1px solid #d1d1d1;
     padding: 0;
+}
 #content #summary-menu-stats li:hover {
     background: #f0f0f0;
+}
 #content #summary-menu-stats li:first-child {
@@ @@ -1584,28 +1586,24 @@ a.metatag[data-tag="license"]:hover { @@
     overflow: hidden;
     border-top: 1px solid #DDD;
     text-align: left;
     margin: 0;
     padding: 10px 0 0 150px;
+}
 #register div.form div.activation_msg {
     padding-top: 4px;
     padding-bottom: 4px;
+}
 #journal {
     margin-left: 20px;
+}
 #journal .journal_day {
     font-size: 20px;
     padding: 10px 0px;
     border-bottom: 2px solid #DDD;
     margin-left: 10px;
     margin-right: 10px;
+}
 #journal .journal_container {
     clear: both;
+}
@@ @@ -2539,31 +2537,24 @@ table.code-browser .browser-dir { @@
 table.code-browser .submodule-dir {
     height: 16px;
     padding-left: 5px;
     text-align: left;
+}
 /* add some padding to the right of the file, folder, or submodule icon and
 before the text */
 table.code-browser i[class^='icon-'] {
     padding-right: .3em;
+}
 .panel .search {
     clear: both;
     overflow: hidden;
     margin: 0;
     padding: 0 20px 10px;
+}
 .panel .search div.search_path {
     background: none repeat scroll 0 0 #EEE;
     border: 1px solid #CCC;
     color: blue;
     margin-bottom: 10px;
     padding: 10px 0;
+}
 .panel .search div.search_path div.link {
     font-weight: 700;
     margin-left: 25px;
+}
@@ @@ -2895,25 +2886,25 @@ nav.navbar, #content, #footer { @@
     white-space: nowrap;
+}
 .btn {
     cursor: pointer !important;
+}
 .label {
     cursor: default !important;
+}
 .panel-body.settings > ul.nav-stacked {
     float: left;
     width: 150px;
     margin: 20px;
+    margin: 0 20px 0 0;
     color: #393939;
     font-weight: 700;
+}
 .panel-body.settings .nav-pills > li {
     padding: 0 !important;
+}
 .panel-body.settings .nav-pills > li > a {
     border-radius: 4px;
     padding: 10px;
     display: block;
@@ @@ -2927,31 +2918,37 @@ nav.navbar, #content, #footer { @@
     background-color: #577632;
+}
 .panel-body.settings > ul.nav-stacked li:hover > a {
     text-decoration: none;
     background-color: #eee;
+}
 .panel-body.settings > div,
 .panel-body.settings > form {
     float: left;
     width: 750px;
     margin: 10px 0 0 0;
     border-left: 1px solid #DDDDDD;
+}
 .panel-body > div,
 .panel-body > form {
     padding: 0 20px 10px;
     margin: 0;
+}
 .panel-body {
     padding: 20px;
+}
 .panel-body ~ .panel-body {
     padding-top: 0;
+}
 .panel-body.settings .text-muted {
     margin: 5px 0;
+}
 /* make .btn inputs and buttons and divs look the same */
 button.btn,
 input.btn {
     font-family: inherit;
     font-size: inherit;
     line-height: inherit;
+}
 .btn::-moz-focus-inner {
     border: 0;
@@ @@ -3407,114 +3404,100 @@ div#legend_choices table td { @@
     padding: 0px 0px 0px 10px;
+}
 .ips_wrap .ip_entry .ip {
     float: left
+}
 .ips_wrap .ip_entry .ip_action {
     float: left
+}
 /*README STYLE*/
 div.readme {
     padding: 0px;
+}
 div.readme h2 {
     font-weight: normal;
+}
 div.readme .readme_box {
     background-color: #fafafa;
+}
 div.readme .readme_box {
 div.readme {
     clear: both;
     overflow: hidden;
     margin: 0;
     padding: 0 20px 10px;
+}
 div.readme .readme_box h1,
 div.readme .readme_box h2,
 div.readme .readme_box h3,
 div.readme .readme_box h4,
 div.readme .readme_box h5,
 div.readme .readme_box h6 {
+}
 div.readme h1,
 div.readme h2,
 div.readme h3,
 div.readme h4,
 div.readme h5,
 div.readme h6 {
     border-bottom: 0 !important;
     margin: 0 !important;
     padding: 0 !important;
     line-height: 1.5em !important;
+}
 div.readme .readme_box h1:first-child {
     padding-top: .25em !important;
+}
 div.readme .readme_box h2,
 div.readme .readme_box h3 {
 div.readme h2,
 div.readme h3 {
     margin: 1em 0 !important;
+}
-div.readme .readme_box h2 {
 div.readme h2 {
     margin-top: 1.5em !important;
     border-top: 4px solid #e0e0e0 !important;
     padding-top: .5em !important;
+}
-div.readme .readme_box p {
 div.readme p {
     color: black !important;
     margin: 1em 0 !important;
     line-height: 1.5em !important;
+}
-div.readme .readme_box ul {
 div.readme ul {
     list-style: disc !important;
     margin: 1em 0 1em 2em !important;
+}
-div.readme .readme_box ol {
 div.readme ol {
     list-style: decimal;
     margin: 1em 0 1em 2em !important;
+}
-div.readme .readme_box code {
 div.readme code {
     font-size: 12px !important;
     background-color: ghostWhite !important;
     color: #444 !important;
     padding: 0 .2em !important;
     border: 1px solid #dedede !important;
+}
-div.readme .readme_box pre code {
 div.readme pre code {
     padding: 0 !important;
     font-size: 12px !important;
     background-color: #eee !important;
     border: none !important;
+}
-div.readme .readme_box pre {
 div.readme pre {
     margin: 1em 0;
     font-size: 12px;
     background-color: #eee;
     border: 1px solid #ddd;
     padding: 5px;
     color: #444;
     overflow: auto;
     border-radius: 3px;
+}
-div.readme .readme_box table {
 div.readme table {
     display: table;
     border-collapse: separate;
     border-spacing: 2px;
     border-color: gray;
     width: auto !important;
+}
 /** RST STYLE **/
 div.rst-block {
@@ @@ -3600,25 +3583,24 @@ div.rst-block pre { @@
     font-size: 12px;
     background-color: #eee;
     border: 1px solid #ddd;
     padding: 5px;
     color: #444;
     overflow: auto;
     border-radius: 3px;
+}
 /** comment main **/
 .comments {
     padding: 10px 20px;
     max-width: 978px;
+}
 .comments .comment .comment-wrapp {
     border: 1px solid #ddd;
     margin-top: 10px;
     border-radius: 4px;
+}
 .comments .comment .meta {
     background: #f8f8f8;
     padding: 4px;
@@ @@ -3639,28 +3621,26 @@ div.rst-block pre { @@
 .comments .comment .meta .date {
     float: left;
     padding: 4px 4px 0px 4px;
+}
 .comments .comment .text {
     background-color: #FAFAFA;
     margin: 6px;
+}
 .comments-number {
     padding: 0px 20px 10px;
     font-weight: bold;
     padding: 10px 0;
     color: #666;
     font-size: 16px;
+}
 .automatic-comment {
     font-style: italic;
+}
 /** comment form **/
 .status-block {
     margin: 5px;
     clear: both
+}
@@ @@ -3717,24 +3697,29 @@ form.comment-form { @@
+}
 .show-inline-comments {
     position: relative;
     top: 1px
+}
 /** comment inline form **/
 .comment-inline-form {
     margin: 4px;
     max-width: 978px;
+}
 #comments-general-comments .comment-inline-form {
     margin: 0;
+}
 .comment-inline-form .submitting-overlay {
     display: none;
     height: 0;
     text-align: center;
     font-size: 16px;
     opacity: 0.5;
+}
 .comment-inline-form .clearfix,
 .comment-form .clearfix {
     background: #EEE;
     border-radius: 4px;
@@ @@ -3771,33 +3756,36 @@ form.comment-inline-form { @@
+}
 .comment-inline-form .comment-help {
     padding: 5px 5px 5px 5px;
     color: #666;
+}
 .comment-inline-form .comment-button {
     padding-top: 5px;
+}
 /** comment inline **/
 .inline-comments {
     padding: 0 20px;
 .inline-comments .comment {
     margin: 3px 3px 5px 5px;
+}
 .inline-comments #comments-general-comments .comment {
     margin-left: 0;
+}
 .inline-comments .comment .comment-wrapp {
     max-width: 978px;
     border: 1px solid #ddd;
     border-radius: 4px;
     margin: 3px 3px 5px 5px;
     background-color: #FAFAFA;
+}
 .inline-comments .add-button-row {
     padding: 2px 4px 8px 5px;
+}
 .inline-comments .comment .meta {
     background: #f8f8f8;
     padding: 4px;
     border-bottom: 1px solid #ddd;
     min-height: 20px;
@@ @@ -3817,27 +3805,25 @@ form.comment-inline-form { @@
 .inline-comments .comment .meta .date {
     float: left;
     padding: 3px;
+}
 .inline-comments .comment .text {
     background-color: #FAFAFA;
     margin: 6px;
+}
 .inline-comments .comments-number {
     padding: 0px 0px 10px 0px;
     font-weight: bold;
     color: #666;
     font-size: 16px;
+}
 input.status_change_radio {
     margin: 2px 0 5px 15px;
     vertical-align: middle;
+}
 .badge {
     padding: 4px 4px !important;
     text-align: center;
     color: #888 !important;
     background-color: #DEDEDE !important;
@@ @@ -3999,25 +3985,25 @@ input.perm_filter { @@
 .perm-gravatar-ac {
     vertical-align: middle;
     padding: 2px;
     width: 14px;
     height: 14px;
+}
 /*****************************************************************************
                                   DIFFS CSS
 ******************************************************************************/
 .diff-collapse {
     text-align: center;
-    margin-bottom: -15px;
+    margin: 0 0 -10px;
+}
 .diff-collapse-button {
     cursor: pointer;
     color: #666;
     font-size: 16px;
+}
 .diff-container {
+}
 .compare-revision-selector {
     font-weight: bold;
@@ @@ -4335,24 +4321,29 @@ div.comment:target>.comment-wrapp { @@
     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;
+}

kallithea/templates/about.html

➞

Show inline comments

@@ @@ -7,34 +7,34 @@ @@
     ${c.site_name}
 </%def>
 <%block name="header_menu">
     ${self.menu('about')}
 </%block>
 <%def name="main()">
 <div class="panel panel-primary">
   <div class="panel-heading">
     <h5 class="panel-title">${_('About')} Kallithea</h5>
   </div>
   <div class="panel-body">
+  <div class="panel-body panel-about">
   <p><a href="https://kallithea-scm.org/">Kallithea</a> is a project of the
   <a href="http://sfconservancy.org/">Software Freedom Conservancy, Inc.</a>
   and is released under the terms of the
   <a href="http://www.gnu.org/copyleft/gpl.html">GNU General Public License,
   v 3.0 (GPLv3)</a>.</p>
   <p>Kallithea is copyrighted by various authors, including but not
   necessarily limited to the following:</p>
-  <ul style="margin: 0 0 0 50px;">
   <ul>
   <li>Copyright &copy; 2012&ndash;2016, Mads Kiilerich</li>
   <li>Copyright &copy; 2012&ndash;2016, Takumi IINO</li>
   <li>Copyright &copy; 2012&ndash;2016, Unity Technologies</li>
   <li>Copyright &copy; 2012, 2014&ndash;2016, Andrew Shadura</li>
   <li>Copyright &copy; 2012, 2014&ndash;2016, Dominik Ruf</li>
   <li>Copyright &copy; 2014&ndash;2016, Thomas De Schampheleire</li>
   <li>Copyright &copy; 2015&ndash;2016, Étienne Gilli</li>
   <li>Copyright &copy; 2015&ndash;2016, Jan Heylen</li>
   <li>Copyright &copy; 2015&ndash;2016, Robert Martinez</li>
   <li>Copyright &copy; 2015&ndash;2016, Robert Rauch</li>
   <li>Copyright &copy; 2015&ndash;2016, Søren Løvborg</li>

kallithea/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -24,26 +24,26 @@ @@
 <%block name="header_menu">
     ${self.menu('repositories')}
 </%block>
 <%def name="main()">
 ${self.repo_context_bar('changelog', c.first_revision.raw_id if c.first_revision else None)}
 <div class="panel panel-primary">
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </div>
     <div class="panel-body">
         %if c.pagination:
             <div class="panel">
                 <div class="panel-heading clearfix" style="${'display:none' if c.changelog_for_path else ''}">
             <div class="panel panel-primary">
               <div class="panel-heading clearfix" style="${'display:none' if c.changelog_for_path else ''}">
                     <div class="pull-left">
                         ${h.form(h.url.current(),method='get',class_="form-inline")}
                             ${h.submit('set',_('Show'),class_="btn btn-default btn-sm")}
                             ${h.text('size',size=3,value=c.size,class_='form-control')}
                             ${_('revisions')}
                             %if c.branch_name:
                                 ${h.hidden('branch', c.branch_name)}
                             %endif
                             <a href="#" class="btn btn-default btn-sm" id="rev_range_clear" style="display:none">${_('Clear selection')}</a>
                         ${h.end_form()}
                     </div>
                     <div class="pull-right">
@@ @@ -54,25 +54,25 @@ ${self.repo_context_bar('changelog', c.f @@
                             </a>
                         %endif
                         %if c.db_repo.fork:
                             <a id="compare_fork"
                                title="${_('Compare fork with %s' % c.db_repo.fork.repo_name)}"
                                href="${h.url('compare_url',repo_name=c.db_repo.fork.repo_name,org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1],other_repo=c.repo_name,other_ref_type='branch' if request.GET.get('branch') else c.db_repo.landing_rev[0],other_ref_name=request.GET.get('branch') or c.db_repo.landing_rev[1], merge=1)}"
                                class="btn btn-default btn-sm"><i class="icon-git-compare"></i> ${_('Compare fork with parent repository (%s)' % c.db_repo.fork.repo_name)}</a>
                         %endif
                         ## text and href of open_new_pr is controlled from javascript
                         <a id="open_new_pr" class="btn btn-default btn-sm"></a>
                         ${_("Branch filter:")} ${h.select('branch_filter',c.branch_name,c.branch_filters)}
                     </div>
-                </div>
               </div>
               <div class="panel-body">
                 <div id="graph_nodes">
                     <canvas id="graph_canvas" style="width:0"></canvas>
                 </div>
                 <div id="graph_content" style="${'margin: 0px' if c.changelog_for_path else ''}">
                 <table class="table" id="changesets">
                 <tbody>
                 %for cnt,cs in enumerate(c.pagination):
                     <tr id="chg_${cnt+1}" class="container ${'mergerow' if len(cs.parents) > 1 else ''}">
                         <td class="checkbox">

kallithea/templates/search/search.html

➞

Show inline comments

@@ @@ -27,31 +27,31 @@ @@
     %else:
     ${self.menu('search')}
     %endif
 </%block>
 <%def name="main()">
 %if c.repo_name:
 ${self.repo_context_bar('options')}
 %endif
 <div class="panel panel-primary">
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </div>
     <div class="panel-body settings form">
     %if c.repo_name:
         ${h.form(h.url('search_repo',repo_name=c.repo_name),method='get')}
     %else:
         ${h.form(h.url('search'),method='get')}
     %endif
     <div class="panel-body settings form">
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="q">${_('Search term')}:</label>
                 <div>
                     ${h.text('q',c.cur_query,class_='form-control')}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="type">${_('Search in')}:</label>
                 <div>
                     ${h.select('type',c.cur_type,[('content',_('File contents')),
@@ @@ -65,27 +65,27 @@ ${self.repo_context_bar('options')} @@
             <div class="form-group">
                 <div class="buttons">
                     <input type="submit" value="${_('Search')}" class="btn btn-default"/>
                 </div>
             </div>
             <div class="form-group">
                 ## <label>${_('Status')}:</label>
                 <div style="font-weight: bold;clear:both">${c.runtime}</div>
             </div>
         </div>
         ${h.end_form()}
     </div>
     ${h.end_form()}
     <div class="search">
     <div class="panel-body">
     %if c.cur_type == 'content':
         <%include file='search_content.html'/>
     %elif c.cur_type == 'path':
         <%include file='search_path.html'/>
     %elif c.cur_type == 'commit':
         <%include file='search_commit.html'/>
     %elif c.cur_type == 'repository':
         <%include file='search_repository.html'/>
     %endif
     </div>
 </div>

kallithea/templates/summary/summary.html

➞

Show inline comments

@@ @@ -184,37 +184,35 @@ summary = lambda n:{False:'summary-short @@
          %endif
         </div>
     </div>
     <div class="panel-body">
         <div id="shortlog_data">
             <%include file='../changelog/changelog_summary_data.html'/>
         </div>
     </div>
 </div>
 %if c.readme_data:
 <div id="readme" class="anchor">
 </div>
 <div class="panel panel-primary">
     <div class="panel-heading" title="${_('Readme file from revision %s:%s') % (c.db_repo.landing_rev[0], c.db_repo.landing_rev[1])}">
         <div class="breadcrumbs panel-title">
             <a href="${h.url('files_home',repo_name=c.repo_name,revision='tip',f_path=c.readme_file)}">${c.readme_file}</a>
         </div>
     </div>
     <div class="readme panel-body">
       <div class="readme_box">
         ${c.readme_data|n}
       </div>
     </div>
 </div>
 </div>
 %endif
 <script type="text/javascript">
 $(document).ready(function(){
     $('#clone-url input').click(function(e){
         if($(this).hasClass('selected')){
             $(this).removeClass('selected');
             return ;
         }else{
             $(this).addClass('selected');
             $(this).select();
+        }

0 comments (0 inline, 0 general)