kallithea Changeset - b89511f1aa24

Changeset - b89511f1aa24

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

domruf - 8 years ago 2017-06-27 22:16:27
dominikruf@gmail.com

template: simplify journal styling

This requires less css code.

2 files changed with 3 insertions and 9 deletions:

kallithea/public/css/style.css

kallithea/templates/journal/journal_data.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -969,398 +969,392 @@ a.metatag[data-tag="license"]:hover { @@
+}
 #quick_login .form {
     margin: 15px;
+}
 #quick_login h4 {
     color: #fff;
     margin-bottom: 10px;
+}
 #quick_login input#username,
 #quick_login input#password {
     display: block;
     margin: 5px 0 10px;
+}
 #quick_login .password_forgotten a,
 #quick_login .register a {
     padding: 0 !important;
     line-height: 25px !important;
     float: left;
     clear: both;
+}
 #quick_login .submit {
     float: right;
+}
 #quick_login .submit input#sign_in {
     margin-top: 5px;
+}
 #quick_login > .pull-left {
     width: 170px;
+}
 #quick_login > .pull-right {
     width: 140px;
+}
 #quick_login .full_name {
     color: #FFFFFF;
     font-weight: bold;
     padding: 3px 3px 3px 15px;
+}
 #quick_login .big_gravatar {
     padding: 15px 0px 0px 15px;
+}
 #quick_login .notifications {
     padding: 2px 0px 0px 15px;
     color: #FFFFFF;
     font-weight: bold;
     line-height: 10px !important;
+}
 #quick_login .notifications a,
 #quick_login .unread a {
     color: #FFFFFF;
     display: block;
     padding: 0px !important;
+}
 #quick_login .notifications a:hover,
 #quick_login .unread a:hover {
     background-color: inherit !important;
+}
 #quick_login .email,
 #quick_login .unread {
     color: #FFFFFF;
     padding: 3px 3px 3px 15px;
+}
 #quick_login .links .logout {
+}
 #quick_login div.form div.form-group {
     padding: 5px;
+}
 #quick_login div.form div.form-group > label {
     color: #fff;
     padding-bottom: 3px;
+}
 #quick_login div.form div.form-group > div input {
     width: 236px;
     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: 5px 7px 4px;
+}
 #quick_login div.form div.buttons {
     clear: both;
     overflow: hidden;
     text-align: right;
     margin: 0;
     padding: 5px 14px 0px 5px;
+}
 #quick_login div.form div.links {
     clear: both;
     overflow: hidden;
     margin: 10px 0 0;
     padding: 0 0 2px;
+}
 #quick_login ol.links {
     display: block;
     font-weight: bold;
     list-style: none outside none;
     text-align: right;
+}
 #quick_login ol.links li {
     line-height: 27px;
     margin: 0;
     padding: 0;
     color: #fff;
     display: block;
     float: none !important;
+}
 #quick_login ol.links li a {
     color: #fff;
     display: block;
     padding: 2px;
+}
 #quick_login ol.links li a:HOVER {
     background-color: inherit !important;
+}
 #register div.form div.form-group > label {
     width: 135px;
     float: left;
     text-align: right;
     margin: 2px 10px 0 0;
     padding: 5px 0 0 5px;
+}
 #register div.form div.form-group > div input {
     width: 300px;
+}
 #register div.form div.buttons {
     border-top: 1px solid #DDD;
     margin: 0;
     padding: 10px 0 0 145px;
+}
 #journal .journal_day {
     font-size: 15px;
     padding: 10px 0px;
     border-bottom: 2px solid #DDD;
     margin-left: 10px;
     margin-right: 10px;
+}
 #journal .journal_user {
     color: #747474;
     font-size: 14px;
     font-weight: bold;
     height: 30px;
+}
 #journal .journal_user.deleted {
     color: #747474;
     font-size: 14px;
     font-weight: normal;
     height: 30px;
     font-style: italic;
+}
 #journal .journal_icon {
     clear: both;
     float: left;
     padding-right: 4px;
     padding-top: 3px;
+}
 #journal .journal_action {
     padding-top: 4px;
     min-height: 2px;
     float: left
+}
 #journal .journal_action_params {
     clear: left;
     padding-left: 22px;
+}
 #journal .journal_repo {
     float: left;
     margin-left: 6px;
     padding-top: 3px;
+}
 #journal .date {
     clear: both;
     color: #777777;
     font-size: 11px;
     padding-left: 22px;
+}
-#journal .journal_repo .journal_repo_name {
 #journal .journal_repo_name {
     font-weight: bold;
     font-size: 1.1em;
+}
 #journal .compare_view {
     padding: 5px 0px 5px 0px;
     width: 95px;
+}
 .trending_language_tbl, .trending_language_tbl td {
     border: 0 !important;
     margin: 0 !important;
     padding: 0 !important;
+}
 .trending_language_tbl, .trending_language_tbl tr {
     border-spacing: 1px;
+}
 #lang_stats .progress-bar {
     background-color: #577632;
     min-width: 15px;
     text-decoration: none;
     border-top-right-radius: 8px;
     border-bottom-right-radius: 8px;
+}
 #lang_stats table td {
     border-bottom: none !important;
     padding: 1px 0 !important;
+}
 h3.files_location {
     font-size: 1.8em;
     font-weight: 700;
     border-bottom: none !important;
     margin: 10px 0 !important;
+}
 #files_data dl dt {
     float: left;
     width: 60px;
     margin: 0 !important;
     padding: 5px;
+}
 #files_data dl dd {
     margin: 0 !important;
     padding: 5px !important;
+}
 #files_data .codeblock #editor_container .error-message {
     color: red;
     padding: 10px 10px 10px 26px
+}
 .file_history {
     padding-top: 10px;
     font-size: 16px;
+}
 .file_author {
     float: left;
+}
 .file_author .item {
     float: left;
     padding: 5px;
     color: #888;
+}
 .changeset_id {
     color: #666666;
     margin-right: -3px;
+}
 .changeset-logical-index {
     color: #666666;
     font-style: italic;
     font-size: 85%;
     padding-right: 0.5em;
     text-align: right;
+}
 #changeset_content {
     border-left: 1px solid #CCC;
     border-right: 1px solid #CCC;
     border-bottom: 1px solid #CCC;
     padding: 5px;
+}
 #changeset_content .changeset_content_header {
     font-size: 1.2em;
     overflow: hidden;
+}
 #changeset_compare_view_content .compare_view_commits {
     width: auto !important;
+}
 #changeset_compare_view_content .compare_view_commits td {
     padding: 0px 0px 0px 12px !important;
+}
 #changeset_content .changeset_content_header .right {
     float: right;
     width: 20%;
     text-align: right;
+}
 #changeset_content .changeset_content_header .message {
     white-space: pre-wrap;
+}
 #changeset_content .changeset_content_header .message a:hover {
     text-decoration: none;
+}
 .cs_files .progress {
     margin-bottom: 0;
+}
 .cs_files .cur_cs {
     margin: 10px 2px;
     font-weight: bold;
+}
 .cs_files .node {
     float: left;
+}
 .cs_files .changes {
     float: right;
     color: #577632;
+}
 .cs_files .changes .added {
     color: inherit;
     background-color: #BBFFBB;
     float: left;
     text-align: center;
     font-size: 9px;
     padding: 2px 0px 2px 0px;
+}
 .cs_files .changes .deleted {
     background-color: #FF8888;
     float: left;
     text-align: center;
     font-size: 9px;
     padding: 2px 0px 2px 0px;
+}
 /*new binary
 NEW_FILENODE = 1
 DEL_FILENODE = 2
 MOD_FILENODE = 3
 RENAMED_FILENODE = 4
 CHMOD_FILENODE = 5
 BIN_FILENODE = 6
 */
 .cs_files .changes .bin {
     background-color: #BBFFBB;
     float: left;
     text-align: center;
     font-size: 9px;
     padding: 2px 0px 2px 0px;
+}
 .cs_files .changes .bin.bin1 {
     background-color: #BBFFBB;
+}
 /*deleted binary*/
 .cs_files .changes .bin.bin2 {
     background-color: #FF8888;
+}
 /*mod binary*/
 .cs_files .changes .bin.bin3 {
     background-color: #DDDDDD;
+}
 /*rename file*/
 .cs_files .changes .bin.bin4 {
     background-color: #6D99FF;
+}
 /*rename file*/
 .cs_files .changes .bin.bin4 {
     background-color: #6D99FF;
+}
 /*chmod file*/
 .cs_files .changes .bin.bin5 {
     background-color: #6D99FF;

kallithea/templates/journal/journal_data.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 %if c.journal_day_aggregate:
     %for day,items in c.journal_day_aggregate:
         <h4>${day}</h4>
         % for user,entries in items:
             <div class="container-fluid">
                 ${h.gravatar_div(user.email if user else 'anonymous@kallithea-scm.org', size=24)}
                 %if user:
                     <span class="journal_user">${user.name} ${user.lastname}</span>
                 %else:
                     <span class="journal_user deleted">${entries[0].username}</span>
                 %endif
                 % for entry in entries:
                   <div class="clearfix">
                     <div class="pull-left">
                       <div class="journal_icon"> ${h.action_parser(entry)[2]()}</div>
                     </div>
                     <div class="pull-left">
                       <div class="journal_action">${h.action_parser(entry)[0]()}</div>
                       <div class="journal_repo">
                       <div class="journal_action">
                           ${h.action_parser(entry)[0]()}
                           <span class="journal_repo_name">
                           %if entry.repository is not None:
                             ${h.link_to(entry.repository.repo_name,
                                         h.url('summary_home',repo_name=entry.repository.repo_name))}
                           %else:
                             ${entry.repository_name}
                           %endif
                           </span>
                       </div>
                       <div class="journal_action_params">${h.literal(h.action_parser(entry)[1]())}</div>
                       <div class="date"><span data-toggle="tooltip" title="${h.fmt_date(entry.action_date)}">${h.age(entry.action_date)}</span></div>
                     </div>
                   </div>
                 %endfor
             </div>
         %endfor
     %endfor
     ${c.journal_pager.pager()}
 %else:
   <div>
       ${_('No entries yet')}
   </div>
 %endif

0 comments (0 inline, 0 general)