kallithea Changeset - bee750d4ffff

Changeset - bee750d4ffff

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

domruf - 8 years ago 2017-10-25 21:32:39
dominikruf@gmail.com

less: unify .merge and .mergetag

3 files changed with 3 insertions and 5 deletions:

kallithea/public/css/style.css

kallithea/public/less/kallithea-tags.less

kallithea/templates/changeset/changeset_range.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

 /*!
  * Don't edit the css file directly.
+ *
  * Instead, edit the less file(s) and regenerate the css:
+ *
  * npm --prefix kallithea/public/less install
  * npm --prefix kallithea/public/less run less
+ *
  */
 body {
   background: url("../images/background.png") repeat scroll 0 0 #B0B0B0;
   font-family: Lucida Grande, Verdana, Lucida Sans Regular, Lucida Sans Unicode, Arial, sans-serif;
+}
 /* Undo unfortunate Bootstrap default styling */
 body pre {
   display: inherit;
   padding: inherit;
   margin: inherit;
   font-size: inherit;
   line-height: inherit;
   color: inherit;
   word-break: inherit;
   word-wrap: inherit;
   background-color: inherit;
   border: inherit;
   border-radius: inherit;
   overflow: inherit;
+}
 del {
   text-decoration: line-through;
+}
 a {
   color: #577632;
   text-decoration: none;
+}
 a:hover {
   color: #576622;
   text-decoration: underline;
+}
 code,
 .code pre,
 .linenos pre,
 div.readme pre,
 div.formatted-fixed,
 .CodeMirror .CodeMirror-code pre {
   font-size: 12px;
   font-family: Lucida Console, Consolas, Monaco, Inconsolata, Liberation Mono, monospace;
+}
 div.formatted-fixed {
   white-space: pre-wrap;
+}
 .changeset_hash {
   font-family: Lucida Console, Consolas, Monaco, Inconsolata, Liberation Mono, monospace;
+}
 .empty_data {
   color: #B9B9B9;
+}
 .inline-comments-general.show-general-status .hidden.general-only {
   display: block !important;
+}
 .truncate {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
   -o-text-overflow: ellipsis;
   -ms-text-overflow: ellipsis;
+}
 .truncate.autoexpand:hover {
   overflow: visible;
+}
 a.permalink {
   visibility: hidden;
   position: absolute;
   margin: 3px 4px;
+}
 a.permalink:hover {
   text-decoration: none;
+}
 h1:hover > a.permalink,
 h2:hover > a.permalink,
 h3:hover > a.permalink,
 h4:hover > a.permalink,
 h5:hover > a.permalink,
 h6:hover > a.permalink,
 div:hover > a.permalink,
 div:hover > span > a.permalink {
   visibility: visible;
+}
 .radio-inline,
 .checkbox-inline {
   vertical-align: inherit;
+}
 .navbar-inverse {
   border: none;
+}
 .navbar-inverse .navbar-nav > .active > a,
 .navbar-inverse .navbar-nav > .active > a:hover,
 .navbar-inverse .navbar-nav > .active > a:focus {
   background-color: inherit;
+}
 nav.navbar .navbar-brand:hover,
 nav.navbar .navbar-brand {
   font-size: 20px;
   padding-top: 12px;
   color: white !important;
   height: 44px;
+}
 nav.navbar {
   min-height: 44px;
   background-color: #577632;
   box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
+}
 .anchor {
   margin-top: -46px;
   padding-top: 46px;
+}
 nav.navbar #logo > .navbar-brand > img {
   margin-top: -9px;
   margin-right: 5px;
+}
 nav.navbar #quick li .icon {
   padding-left: 10px;
   display: inline;
+}
 .form-group > label {
   float: left;
+}
 label {
   font-weight: inherit;
+}
 label.control-label {
   font-weight: bold;
+}
 .groups_breadcrumbs a {
   color: #fff;
+}
 .groups_breadcrumbs a:hover {
   color: #bfe3ff;
   text-decoration: none;
+}
 .dt_repo {
   white-space: nowrap;
   color: #577632;
+}
 .dt_repo_pending {
   opacity: 0.5;
+}
 .dt_repo i.icon-keyhole-circled,
 .dt_repo i.icon-globe {
   font-size: 16px;
   vertical-align: -2px;
   margin: 0px 1px 0px 3px;
+}
 div.panel-primary {
   box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
   border: none;
+}
 div.panel div.panel-heading {
   background-color: #577632;
   background-repeat: repeat-x;
   background-image: linear-gradient(to bottom, #577632, #577632);
   border-radius: 4px 4px 0 0;
+}
 #content div.panel div.panel-heading ul.links li {
   list-style: none;
   float: left;
   margin: 0;
   padding: 0;
+}
 div.panel.panel-default {
   border: 1px solid #ccc;
   box-shadow: none;
   border-radius: 6px 6px 0px 0px;
   margin-bottom: 15px;
+}
 div.panel.panel-default:last-child {
   margin-bottom: 0;
+}
 div.panel.panel-default > div.panel-heading {
   background: #eee;
   border-bottom: 1px solid #ccc;
   font-size: 14px;
   font-weight: 700;
+}
 div.panel.panel-default div.panel-heading .diff-actions a,
 div.panel.panel-default div.panel-heading .diff-actions span.no-file,
 div.panel.panel-default div.panel-heading .diff-actions span.arrow {
   color: #577632 !important;
+}
 div.panel.panel-default div.panel-heading .diff-actions span.no-file,
 div.panel.panel-default div.panel-heading .diff-actions span.arrow {
   opacity: 0.5;
+}
 #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 div.form div.form-group > label {
   color: #393939;
   font-weight: 700;
+}
 .reviewer_ac {
   padding: 10px;
+}
 #content div.panel table.table {
   border: 1px solid transparent;
+}
 #content div.panel table {
   border-collapse: separate;
   margin: 0;
   padding: 0;
   border: 1px solid #eee;
   border-radius: 4px;
+}
 #content div.panel table#permissions_manage {
   width: auto;
+}
 #content div.panel table th {
   background: #eee;
   border-bottom: 1px solid #ddd;
   padding: 5px 0px 5px 5px;
   text-align: left;
+}
 #content div.panel table th.left {
   text-align: left;
+}
 #content div.panel table th.right {
   text-align: right;
+}
 #content div.panel table th.center {
   text-align: center;
+}
 #content div.panel table th.selected {
   vertical-align: middle;
   padding: 0;
+}
 #content div.panel table td.annotate {
   border-bottom: none;
+}
 #content div.panel table td.linenos pre,
 #content div.panel table td.annotate pre,
 #content div.panel table td.code pre {
   padding-top: inherit;
   margin: inherit;
+}
 #content div.panel table td.compact {
   padding-left: 0;
   padding-right: 0;
+}
 #content div.panel table tr.selected td {
   background: #FFC;
+}
 #content div.panel table td.selected {
   width: 3%;
   text-align: center;
   vertical-align: middle;
   padding: 0;
+}
 #content div.panel table td.action {
   width: 45%;
   text-align: left;
+}
 #content div.panel table td.date {
   width: 33%;
   text-align: center;
+}
 #content div.panel div.action {
   float: right;
   background: #FFF;
   text-align: right;
   margin: 10px 0 0;
   padding: 0;
+}
 #content div.panel div.action select {
   font-size: 11px;
   margin: 0;
+}
 #content div.panel div.action .ui-selectmenu {
   margin: 0;
   padding: 0;
+}
 #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.traffic div.legend {
   clear: both;
   overflow: hidden;
   border-bottom: 1px solid #ddd;
   margin: 0 0 10px;
   padding: 0 0 10px;
+}
 #content div.panel div.traffic div.legend h6 {
   float: left;
   border: none;
   margin: 0;
   padding: 0;
+}
 #content div.panel div.traffic div.legend li {
   list-style: none;
   float: left;
   font-size: 11px;
   margin: 0;
   padding: 0 8px 0 4px;
+}
 #content div.panel div.traffic div.legend li.visits {
   border-left: 12px solid #edc240;
+}
 #content div.panel div.traffic div.legend li.pageviews {
   border-left: 12px solid #afd8f8;
+}
 #content div.panel div.traffic table {
   width: auto;
+}
 #content div.panel div.traffic table td {
   background: transparent;
   border: none;
   padding: 2px 3px 3px;
+}
 #content div.panel div.traffic table td.legendLabel {
   padding: 0 3px 2px;
+}
 #content div.panel #summary-panel-body {
   position: relative;
+}
 #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;
+}
 ul#summary-menu-stats {
   width: 180px;
   position: absolute;
   top: 0;
   right: 0;
   border-radius: 4px;
   margin: 15px;
+}
 #content #summary-menu-stats li {
   padding: 0;
+}
 #content #summary-menu-stats li:hover {
   background: #f0f0f0;
+}
 #summary-menu-stats a {
   display: block;
   padding: 10px;
+}
 #repo_size_2 {
   display: none;
+}
 #repo_size_2.loaded {
   display: block;
   padding-right: 10px;
   padding-bottom: 7px;
+}
 #summary-menu-stats a:hover {
   text-decoration: none;
+}
 #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;
+}
 #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;
+}
 .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;
+}
 #perms .perm_tag {
   position: relative;
   top: -2px;
   margin-left: 3px;
   padding: 3px 3px 1px 3px;
   font-size: 10px;
   font-weight: bold;
   text-transform: uppercase;
   white-space: nowrap;
   border-radius: 3px;
+}
 #perms .perm_tag.admin {
   background-color: #B94A48;
   color: #ffffff;
+}
 #perms .perm_tag.write {
   background-color: #DB7525;
   color: #ffffff;
+}
 #perms .perm_tag.read {
   background-color: #468847;
   color: #ffffff;
+}
 #perms .perm_tag.none {
   background-color: #bfbfbf;
   color: #ffffff;
+}
 .right .mergetag,
 .right .merge {
 .right .mergetag {
   padding: 1px 3px 1px 3px;
   background-color: #fca062;
   font-size: 10px;
   color: #ffffff;
   text-transform: uppercase;
   white-space: nowrap;
   border-radius: 3px;
   margin-right: 2px;
+}
 .right .parent {
   color: #666666;
   clear: both;
+}
 .right .logtags {
   line-height: 2.2em;
+}
 .phasetag,
 .bumpedtag,
 .divergenttag,
 .extincttag,
 .unstabletag,
 .repotag,
 .branchtag,
 .logtags .tagtag,
 .logtags .booktag {
   margin: 0px 2px;
+}
 .phasetag,
 .bumpedtag,
 .divergenttag,
 .extincttag,
 .unstabletag,
 .repotag,
 .branchtag,
 .tagtag,
 .booktag,
 .spantag {
   padding: 1px 3px 1px 3px;
   font-size: 10px;
   color: #577632;
   white-space: nowrap;
   border-radius: 4px;
   border: 1px solid #d9e8f8;
   line-height: 1.5em;
+}
 table#changesets .phasetag,
 table#changesets .bumpedtag,
 table#changesets .divergenttag,
 table#changesets .extincttag,
 table#changesets .unstabletag,
 table#changesets .branchtag,
 table#changesets .tagtag,
 table#changesets .booktag {
   margin: 1.1em 0;
   margin-right: 0.5em;
+}
 .phasetag,
 .bumpedtag,
 .divergenttag,
 .extincttag,
 .unstabletag,
 .repotag,
 .branchtag,
 .tagtag,
 .booktag {
   float: left;
   display: inline-block;
+}
 .right .logtags .phasetag,
 .right .logtags .bumpedtag,
 .right .logtags .divergenttag,
 .right .logtags .extincttag,
 .right .logtags .unstabletag,
 .right .logtags .branchtag,
 .right .logtags .tagtag,
 .right .logtags .booktag,
 .right .mergetag,
 .right .merge {
   float: right;
   line-height: 1em;
   margin: 1px 1px !important;
   display: block;
+}
 .repotag {
   border-color: #56A546;
   color: #46A546;
   font-size: 8px;
   text-transform: uppercase;
+}
 #context-bar .repotag,
 .repo-icons .repotag {
   border-color: white;
   color: white;
   margin-top: 3px;
+}
 .repo-icons .repotag {
   margin-top: 0px;
   padding-top: 0px;
   padding-bottom: 0px;
+}
 .booktag {
   border-color: #46A546;
   color: #46A546;
+}
 .tagtag {
   border-color: #62cffc;
   color: #62cffc;
+}
 .bumpedtag,
 .divergenttag,
 .extincttag,
 .unstabletag {
   background-color: #f00;
   border-color: #600;
   color: #fff;
+}
 .phasetag {
   border-color: #1F14CE;
   color: #1F14CE;
+}
 .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 {
   padding: 10px 15px;
   background-color: #577632;
   background-repeat: repeat-x;
   box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
+}
 #footer > span {
   color: #FFF;
   font-weight: 700;
+}
 #footer .navbar-link {
   color: #FFF;
+}
 #footer.navbar {
   min-height: inherit;
   padding-bottom: 8px;
+}
 #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;
+}
 #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 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_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 .date {
   clear: both;
   color: #777777;
   font-size: 11px;
   padding-left: 22px;
+}
 #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;
+}
 .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_compare_view_content .compare_view_commits {
   width: auto !important;
+}
 #changeset_compare_view_content .compare_view_commits td {
   padding: 0px 0px 0px 12px !important;
+}
 td.author {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
   max-width: 210px;
+}
 #graph_nodes {
   position: absolute;
   width: 100px;
+}
 #graph_content,
 #graph_content_pr,
 #graph .info_box,
 #graph .container_header {
   margin-left: 100px;
+}
 #graph_content {
   position: relative;
+}
 table#updaterevs-table tr.mergerow,
 table#updaterevs-table tr.out-of-range,
 table#changesets tr.mergerow,
 table#changesets tr.out-of-range {
   opacity: 0.6;
+}
 table#changesets tr > td {
   height: 31px;
   border-color: #cdcdcd;
   text-align: left;
+}
 table#changesets tr > td.checkbox-column {
   width: 14px;
   font-size: 0.85em;
+}
 table#changesets tr > td.status {
   width: 14px;
   font-size: 0.85em;
+}
 table#changesets tr > td.hash {
   width: 100px;
   font-size: 0.85em;
+}
 table#changesets tr > td.date {
   width: auto !important;
   color: #666;
   font-size: 10px;
   white-space: nowrap;
+}
 #graph_content_pr .compare_view_commits .expand_commit,
 table#changesets tr > td.expand_commit {
   width: 24px;
   cursor: pointer;
   color: #999;
+}
 table#changesets tr > td.mid {
   width: 100%;
   padding: 0;
+}
 table#changesets .log-container {
   position: relative;
   margin-top: 8px;
+}
 table#changesets tr #singlerange,
 table#changesets tr .changeset_range {
   float: left;
   margin: 2px 0;
+}
 table#changesets tr > td.author img {
   vertical-align: middle;
+}
 table#changesets tr > td.author .user {
   color: #444444;
+}
 table#changesets tr > td.mid .message,
 #graph_content_pr .compare_view_commits .message {
   white-space: nowrap;
   padding: 0;
   overflow: hidden;
+}
 #graph_content_pr .compare_view_commits .message {
   padding: 0 !important;
+}
 table#changesets tr > td.mid .message.expanded,
 #graph_content_pr .compare_view_commits .message.expanded {
   height: auto;
   overflow: initial;
+}
 table#changesets tr .extra-container {
   display: block;
   position: absolute;
   top: -15px;
   right: 0;
   padding-left: 5px;
   background: #FFFFFF;
   height: 41px;
+}
 #pull_request_overview .comments-container,
 #changeset_compare_view_content .comments-container,
 table#changesets .comments-container,
 #shortlog_data .comments-container,
 table#changesets .logtags {
   display: block;
   float: left;
   overflow: hidden;
   padding: 0;
   margin: 0;
   white-space: nowrap;
+}
 table#changesets .comments-container {
   margin: 0.8em 0;
   margin-right: 0.5em;
+}
 table#changesets .tagcontainer {
   width: 80px;
   position: relative;
   float: right;
   height: 100%;
   top: 7px;
   margin-left: 0.5em;
+}
 table#changesets .logtags {
   min-width: 80px;
   height: 1.1em;
   position: absolute;
   left: 0px;
   width: auto;
   top: 0px;
+}
 table#changesets .logtags.tags {
   top: 14px;
+}
 table#changesets .logtags:hover {
   overflow: visible;
   position: absolute;
   width: auto;
   right: 0;
   left: initial;
+}
 table#changesets .logtags .booktag,
 table#changesets .logtags .tagtag {
   float: left;
   line-height: 1em;
   margin-bottom: 1px;
   margin-right: 1px;
   padding: 1px 3px;
   font-size: 10px;
+}
 table#changesets tr > td.mid .message a:hover {
   text-decoration: none;
+}
 #updaterevs-graph {
   position: absolute;
   width: 40px;
+}
 #updaterevs-table {
   margin-left: 40px !important;
+}
 .issue-tracker-link {
   color: #3F6F9F;
   font-weight: bold !important;
+}
 /* changeset statuses (must be the same name as the status) */
 .changeset-status-not_reviewed {
   color: #bababa;
+}
 .changeset-status-approved {
   color: #81ba51;
+}
 .changeset-status-rejected {
   color: #d06060;
+}
 .changeset-status-under_review {
   color: #ffc71e;
+}
 .pull-right .changes {
   clear: both;
+}
 .pull-right .changes .changed_total {
   display: block;
   float: right;
   text-align: center;
   min-width: 45px;
   cursor: pointer;
   color: #444444;
   background: #FEA;
   border-radius: 0px 0px 0px 6px;
   padding: 1px;
+}
 .pull-right .changes .added,
 .pull-right .changes .changed,
 .pull-right .changes .deleted {
   color: #444444;
+}
 .pull-right .changes .added {
   background: #CFC;
+}
 .pull-right .changes .changed {
   background: #FEA;
+}
 .pull-right .changes .deleted {
   background: #FAA;
+}
 table.code-browser {
   border-collapse: collapse;
   width: 100%;
+}
 table.code-browser tr {
   margin: 3px;
+}
 table.code-browser thead th {
   background-color: #EEE;
   height: 20px;
   font-size: 1.1em;
   font-weight: 700;
   text-align: left;
   padding-left: 10px;
+}
 table.code-browser tbody td {
   padding-left: 10px;
   height: 20px;
+}
 table.code-browser .browser-file {
   height: 16px;
   padding-left: 5px;
   text-align: left;
+}
 table.code-browser .browser-dir {
   height: 16px;
   padding-left: 5px;
   text-align: left;
+}
 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 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;
+}
 .panel .search div.search_path div.link a {
   color: #577632;
   cursor: pointer;
   text-decoration: none;
+}
 .info_box input#at_rev,
 .info_box input#size {
   border-top: 1px solid #b3b3b3;
   border-left: 1px solid #b3b3b3;
   border-right: 1px solid #eaeaea;
   border-bottom: 1px solid #eaeaea;
+}
 .info_box_elem {
   display: inline-block;
+}
 .yui-overlay,
 .yui-panel-container {
   visibility: hidden;
   position: absolute;
   z-index: 2;
+}
 .ac {
   vertical-align: top;
+}
 .ac .yui-ac {
   position: inherit;
   font-size: 100%;
+}
 .ac .perm_ac {
   width: 20em;
+}
 .ac .yui-ac-input {
   width: 100%;
+}
 .ac .yui-ac-container {
   position: absolute;
   top: 1.6em;
   width: auto;
+}
 .ac .yui-ac-content {
   position: absolute;
   border: 1px solid gray;
   background: #fff;
   z-index: 9050;
+}
 .ac .yui-ac-shadow {
   position: absolute;
   width: 100%;
   background: #000;
   opacity: .10;
   z-index: 9049;
   margin: .3em;
+}
 .ac .yui-ac-content ul {
   width: 100%;
   margin: 0;
   padding: 0;
   z-index: 9050;
+}
 .ac .yui-ac-content li {
   cursor: default;
   white-space: nowrap;
   margin: 0;
   padding: 2px 5px;
   height: 18px;
   z-index: 9050;

kallithea/public/less/kallithea-tags.less

➞

Show inline comments

 .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;
+}
 #perms .perm_tag {
   position: relative;
   top: -2px;
   margin-left: 3px;
   padding: 3px 3px 1px 3px;
   font-size: 10px;
   font-weight: bold;
   text-transform: uppercase;
   white-space: nowrap;
   border-radius: 3px;
   &.admin {
     background-color: #B94A48;
     color: #ffffff;
+  }
   &.write {
       background-color: #DB7525;
       color: #ffffff;
+  }
   &.read {
       background-color: #468847;
       color: #ffffff;
+  }
   &.none {
       background-color: #bfbfbf;
       color: #ffffff;
+  }
+}
 .right .mergetag,
 .right .merge {
 .right .mergetag {
   padding: 1px 3px 1px 3px;
   background-color: #fca062;
   font-size: 10px;
   color: #ffffff;
   text-transform: uppercase;
   white-space: nowrap;
   border-radius: 3px;
   margin-right: 2px;
+}
 .right .parent {
   color: #666666;
   clear: both;
+}
 .right .logtags {
   line-height: 2.2em;
+}
 .phasetag,
 .bumpedtag,
 .divergenttag,
 .extincttag,
 .unstabletag,
 .repotag,
 .branchtag,
 .logtags .tagtag,
 .logtags .booktag {
   margin: 0px 2px;
+}
 .phasetag,
 .bumpedtag,
 .divergenttag,
 .extincttag,
 .unstabletag,
 .repotag,
 .branchtag,
 .tagtag,
 .booktag,
 .spantag {
   padding: 1px 3px 1px 3px;
   font-size: 10px;
   color: #577632;
   white-space: nowrap;
   border-radius: 4px;
   border: 1px solid #d9e8f8;
   line-height: 1.5em;
+}
 table#changesets .phasetag,
 table#changesets .bumpedtag,
 table#changesets .divergenttag,
 table#changesets .extincttag,
 table#changesets .unstabletag,
 table#changesets .branchtag,
 table#changesets .tagtag,
 table#changesets .booktag {
   margin: 1.1em 0;
   margin-right: 0.5em;
+}
 .phasetag,
 .bumpedtag,
 .divergenttag,
 .extincttag,
 .unstabletag,
 .repotag,
 .branchtag,
 .tagtag,
 .booktag {
   float: left;
   display: inline-block;
+}
 .right .logtags .phasetag,
 .right .logtags .bumpedtag,
 .right .logtags .divergenttag,
 .right .logtags .extincttag,
 .right .logtags .unstabletag,
 .right .logtags .branchtag,
 .right .logtags .tagtag,
 .right .logtags .booktag,
 .right .mergetag,
 .right .merge {
   float: right;
   line-height: 1em;
   margin: 1px 1px !important;
   display: block;
+}
 .repotag {
   border-color: #56A546;
   color: #46A546;
   font-size: 8px;
   text-transform: uppercase;
+}
 #context-bar .repotag,
 .repo-icons .repotag {
   border-color: white;
   color: white;
   margin-top: 3px;
+}
 .repo-icons .repotag {
   margin-top: 0px;
   padding-top: 0px;
   padding-bottom: 0px;
+}
 .booktag {
   border-color: #46A546;
   color: #46A546;
+}
 .tagtag {
   border-color: #62cffc;
   color: #62cffc;
+}
 .bumpedtag,
 .divergenttag,
 .extincttag,
 .unstabletag {
   background-color: #f00;
   border-color: #600;
   color: #fff;
+}
 .phasetag {
   border-color: #1F14CE;
   color: #1F14CE;
+}
 .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;
+}

kallithea/templates/changeset/changeset_range.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%block name="title">
     ${_('%s Changesets') % c.repo_name} - ${h.show_id(c.cs_ranges[0])} &gt; ${h.show_id(c.cs_ranges[-1])}
 </%block>
 <%def name="breadcrumbs_links()">
     ${_('Changesets')} -
     ${h.link_to(h.show_id(c.cs_ranges[0]),h.url('changeset_home',repo_name=c.repo_name,revision=c.cs_ranges[0].raw_id))}
     <i class="icon-right"></i>
     ${h.link_to(h.show_id(c.cs_ranges[-1]),h.url('changeset_home',repo_name=c.repo_name,revision=c.cs_ranges[-1].raw_id))}
 </%def>
 <%block name="header_menu">
     ${self.menu('repositories')}
 </%block>
 <%def name="main()">
 ${self.repo_context_bar('changelog')}
 <div class="panel panel-primary">
     <div class="panel-heading clearfix">
         <div class="pull-left">
             ${self.breadcrumbs()}
         </div>
         <div class="pull-right">
             <a href="${h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref_name=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref_name=c.cs_ranges[-1].raw_id)}" class="btn btn-default btn-sm"><i class="icon-git-compare"></i> Compare Revisions</a>
         </div>
     </div>
     <div class="panel-body">
         <div>
                 <table class="table compare_view_commits">
                 %for cnt,cs in enumerate(c.cs_ranges):
                   <tr>
                     %if c.visual.use_gravatar:
                     <td>${h.gravatar_div(h.email_or_none(cs.author), size=14)}</td>
                     %endif
                     <td>${h.link_to(h.short_id(cs.raw_id),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</td>
                     <td class="author">${h.person(cs.author)}</td>
                     <td><span data-toggle="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>
                     <td>
                       %if c.statuses:
                         <i class="icon-circle changeset-status-${c.statuses[cnt]}" title="${_('Changeset status: %s') % h.changeset_status_lbl(c.statuses[cnt])}"></i>
                       %endif
                     </td>
                     <td><div class="message">${h.urlify_text(h.wrap_paragraphs(cs.message),c.repo_name)}</div></td>
                   </tr>
                 %endfor
                 </table>
                 <h4>${_('Files affected')}</h4>
                 <div class="cs_files">
                     %for cs in c.cs_ranges:
                         <h6 class="cur_cs">${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</h6>
                         <% a_rev, cs_rev, file_diff_data = c.changes[cs.raw_id] %>
                         %for fid, url_fid, op, a_path, path, diff, stats in file_diff_data:
                             <div class="cs_${op} clearfix">
                                 <div class="node pull-left">
                                     <i class="icon-diff-${op}"></i>
                                     ${h.link_to(h.safe_unicode(path), '#%s' % fid)}
                                 </div>
                                 <div class="changes">${h.fancy_file_stats(stats)}</div>
                             </div>
                         %endfor
                     %endfor
                 </div>
         </div>
     </div>
     <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
     <%namespace name="diff_block" file="/changeset/diff_block.html"/>
     ${diff_block.diff_block_js()}
     %for cs in c.cs_ranges:
         <div class="panel-body">
           ## diff block
           <div class="h3">
           ${h.gravatar_div(h.email_or_none(cs.author), size=20)}
           <a data-toggle="tooltip" title="${cs.message}" href="${h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id)}">${h.show_id(cs)}</a>
             <div class="right">
               <span class="logtags">
                 %if len(cs.parents)>1:
-                <span class="merge">${_('Merge')}</span>
+                <span class="mergetag">${_('Merge')}</span>
                 %endif
                 %if h.is_hg(c.db_repo_scm_instance):
                   %for book in cs.bookmarks:
                   <span class="booktag" title="${_('Bookmark %s') % book}">
                      ${h.link_to(book,h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}
                   </span>
                   %endfor
                 %endif
                 %for tag in cs.tags:
                     <span class="tagtag" title="${_('Tag %s') % tag}">
                     ${h.link_to(tag,h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</span>
                 %endfor
                 %if cs.branch:
                 <span class="branchtag" title="${_('Branch %s') % cs.branch}">
                    ${h.link_to(cs.branch,h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}
                 </span>
                 %endif
               </span>
             </div>
           </div>
           <% a_rev, cs_rev, file_diff_data = c.changes[cs.raw_id] %>
           ${diff_block.diff_block(c.repo_name, 'rev', a_rev, a_rev,
                                   c.repo_name, 'rev', cs_rev, cs_rev, file_diff_data)}
         </div>
     %endfor
 </div>
 </%def>

0 comments (0 inline, 0 general)