kallithea Changeset - 13b202c88e41

Changeset - 13b202c88e41

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

domruf - 8 years ago 2017-10-26 23:03:07
dominikruf@gmail.com

less: only override Bootstrap default styling of pre where it really is needed

Bootstrap changes the styling of pre, even without special classes.

Thus, override the bootstrap default styling in a less broad manner.

The only thing that really needs to be changed is the border, margin, padding
and the background for the code diffs.

3 files changed with 21 insertions and 30 deletions:

kallithea/public/css/style.css

kallithea/public/less/kallithea-diff.less

kallithea/public/less/style.less

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;
+}
 /* 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;
+}
 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;
+}
 /* class for texts where newlines should be preserved, for very light-weight ascii art markup (like pull request descriptions) */
 .formatted-fixed {
   white-space: pre-wrap;
+}
 .changeset_hash {
   font-family: Lucida Console, Consolas, Monaco, Inconsolata, Liberation Mono, monospace;
+}
 /* Note: class 'icon-empty' or 'icon-gravatar' can be used to get icon-ish styling without an actual glyph */
 i[class^='icon-empty'],
 i[class^='icon-gravatar'] {
   background-repeat: no-repeat;
   background-position: center;
   display: inline-block;
   min-width: 16px;
   min-height: 16px;
   margin: -2px 0 -4px 0;
+}
 .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;
+}
 /* show comment anchors when hovering over panel-heading */
 a.permalink {
   visibility: hidden;
+}
 .panel-heading:hover .permalink {
   visibility: visible;
+}
 .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;
+}
 /* logo */
 .navbar-brand .branding:before {
   content: "";
   display: inline-block;
   margin-right: .2em;
   background-image: url("../images/kallithea-logo.svg");
   width: 140px;
   height: 30px;
   margin-bottom: -4px;
   margin-top: -12px;
+}
 /* code highlighting */
 /* don't use bootstrap style for code blocks */
 .code-highlighttable pre {
   background: inherit;
   border: 0;
+}
 /* every direct child of a panel, that is not .panel-heading, should auto
  * overflow to prevent overflowing of elements like text boxes and tables */
 .panel > :not(.panel-heading) {
   overflow-x: auto;
   min-height: 0.01%;
+}
 /* language bars (summary page) */
 #lang_stats .progress-bar {
   min-width: 15px;
   border-top-right-radius: 8px;
   border-bottom-right-radius: 8px;
+}
 #lang_stats td {
   padding: 1px 0 !important;
+}
 /* every direct child of a main panel, that is not .panel-heading, should auto
  * overflow to prevent overflowing of elements like text boxes and tables */
 #main > .panel > :not(.panel-heading) {
   overflow-x: auto;
   min-height: 0.01%;
+}
 /* use pointer cursor for expand_commit */
 .expand_commit .icon-align-left {
   cursor: pointer;
   color: #999;
+}
 /* don't break author, date and comment cells into multiple lines in changeset table */
 table.changesets .author,
 table.changesets .date,
 table.changesets .comments {
   white-space: nowrap;
+}
 /* textareas should be at least 100px high and 400px wide */
 textarea.form-control {
   min-height: 100px;
   min-width: 400px;
+}
 /* add some space between the code-browser icons and the file names */
 .browser-dir > i[class^='icon-'],
 .submodule-dir > i[class^='icon-'],
 .browser-file > i[class^='icon-'] {
   padding-right: 0.3em;
+}
 .form-group > label {
   float: left;
+}
 .dt_repo_pending {
   opacity: 0.5;
+}
 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.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;
+}
 .metatag {
   display: inline-block;
   margin-right: 1px;
   border-radius: 4px 4px 4px 4px;
   border: solid 1px #9CF;
   padding: 2px 3px 2px 3px !important;
@@ @@ -1546,192 +1537,196 @@ BIN_FILENODE = 6 @@
 /* center collapse button */
 .diff-collapse {
   text-align: center;
   margin-bottom: 15px;
+}
 .code-difftable {
   /* the whole line should be colored */
   border-collapse: collapse;
   border-radius: 0px !important;
   width: 100%;
   /* line coloring */
   /* tabs */
   /* CR */
   /* whitespace characters */
   /* trailing spaces */
   /** LINE NUMBERS **/
   /** CODE **/
   /* leading +/- on changed lines */
+}
 .code-difftable .context {
   background: none repeat scroll 0 0 #DDE7EF;
   color: #999;
+}
 .code-difftable .add {
   background: none repeat scroll 0 0 #DDFFDD;
+}
 .code-difftable .add ins {
   background: none repeat scroll 0 0 #AAFFAA;
   text-decoration: none;
+}
 .code-difftable .del {
   background: none repeat scroll 0 0 #FFDDDD;
+}
 .code-difftable .del del {
   background: none repeat scroll 0 0 #FFAAAA;
   text-decoration: none;
+}
 .code-difftable td.code pre u:before {
   content: "\21a6";
   display: inline-block;
   width: 0;
+}
 .code-difftable td.code pre u.cr:before {
   content: "\21a4";
   display: inline-block;
+}
 .code-difftable td.code pre u {
   color: rgba(0, 0, 0, 0.3);
+}
 .code-difftable td.code pre i {
   border-style: solid;
   border-width: 0 0 0 1px;
   border-color: rgba(0, 0, 0, 0.3);
+}
 .code-difftable .lineno {
   padding-left: 2px;
   padding-right: 2px !important;
   width: 30px;
   -moz-user-select: none;
   -webkit-user-select: none;
   border-right: 1px solid #CCC !important;
   border-left: 0px solid #CCC !important;
   border-top: 0px solid #CCC !important;
   border-bottom: none !important;
   vertical-align: middle !important;
   text-align: center;
+}
 .code-difftable .lineno.new {
   text-align: right;
+}
 .code-difftable .lineno.old {
   text-align: right;
+}
 .code-difftable .lineno a {
   color: #aaa !important;
   font: 11px Lucida Console, Consolas, Monaco, Inconsolata, Liberation Mono, monospace !important;
   padding-left: 6px;
   padding-right: 6px;
   display: block;
+}
 .code-difftable .line:hover .lineno a {
   color: #333 !important;
+}
 .code-difftable .lineno-inline {
   background: none repeat scroll 0 0 #FFF !important;
   padding-left: 2px;
   padding-right: 2px;
   text-align: right;
   width: 30px;
   -moz-user-select: none;
   -webkit-user-select: none;
+}
 .code-difftable .code {
   display: block;
+}
 .code-difftable .code pre {
   border: 0;
   padding: 0;
   margin: 0;
   background: none;
   min-height: 17px;
   line-height: 17px;
   white-space: pre-wrap;
   word-break: break-all;
+}
 .code-difftable .del .code pre:before {
   content: "-";
   color: #800;
+}
 .code-difftable .add .code pre:before {
   content: "+";
   color: #080;
+}
 .code-difftable .code pre:before {
   content: " ";
   margin: 0 2px;
+}
 /* comment bubble */
 .add-bubble {
   position: relative;
   display: none;
   float: left;
   width: 0px;
   height: 0px;
   left: -8px;
   box-sizing: border-box;
+}
 /* comment bubble, only visible when in a commentable diff */
 .commentable-diff tr.line.add:hover td .add-bubble,
 .commentable-diff tr.line.del:hover td .add-bubble,
 .commentable-diff tr.line.unmod:hover td .add-bubble {
   display: block;
   z-index: 1;
+}
 .add-bubble div {
   background: #577632;
   width: 16px;
   height: 16px;
   cursor: pointer;
   padding: 0 2px 2px 0.5px;
   border: 1px solid #577632;
   border-radius: 3px;
   box-sizing: border-box;
+}
 .add-bubble div:before {
   font-size: 14px;
   color: #ffffff;
   font-family: "kallithea";
   content: '\1f5ea';
+}
 .add-bubble div:hover {
   transform: scale(1.2, 1.2);
+}
 /* file diff icons */
 .icon-diff-modified:before {
   color: #d0b44c;
+}
 .icon-diff-removed:before {
   color: #bd2c00;
+}
 .icon-diff-added:before {
   color: #6cc644;
+}
 .icon-diff-renamed:before {
   color: #677a85;
+}
 /* show some context of link targets - but only works when the link target
    can be extended with any visual difference */
 div.comment:target:before {
   display: block;
   height: 100px;
   margin: -100px 0 0;
   content: "";
+}
 div.comment:target > .panel {
   border: solid 2px #ee0 !important;
+}
 .lineno:target a {
   border: solid 2px #ee0 !important;
   margin: -2px;
+}
 .btn-image-diff-show,
 .btn-image-diff-swap {
   margin: 5px;
+}
 .img-diff {
   max-width: 45%;
   height: auto;
   margin: 5px;
   /* http://lea.verou.me/demos/css3-patterns.html */
   background-image: linear-gradient(45deg, #888 25%, transparent 25%, transparent), linear-gradient(-45deg, #888 25%, transparent 25%, transparent), linear-gradient(45deg, transparent 75%, #888 75%), linear-gradient(-45deg, transparent 75%, #888 75%);
   background-size: 10px 10px;
   background-color: #999;
+}
 .img-preview {
   max-width: 100%;

kallithea/public/less/kallithea-diff.less

➞

Show inline comments

@@ @@ -65,167 +65,171 @@ BIN_FILENODE = 6 @@
   text-align: center;
   margin-bottom: 15px;
+}
 .code-difftable {
   /* the whole line should be colored */
   border-collapse: collapse;
   border-radius: 0px !important;
   width: 100%;
   /* line coloring */
   .context {
     background: none repeat scroll 0 0 #DDE7EF;
     color: #999;
+  }
   .add {
     background: none repeat scroll 0 0 #DDFFDD;
+  }
   .add ins {
     background: none repeat scroll 0 0 #AAFFAA;
     text-decoration: none;
+  }
   .del {
     background: none repeat scroll 0 0 #FFDDDD;
+  }
   .del del {
     background: none repeat scroll 0 0 #FFAAAA;
     text-decoration: none;
+  }
   /* tabs */
   td.code pre u:before {
     content: "\21a6";
     display: inline-block;
     width: 0;
+  }
   /* CR */
   td.code pre u.cr:before {
     content: "\21a4";
     display: inline-block;
+  }
   /* whitespace characters */
   td.code pre u {
     color: rgba(0, 0, 0, 0.3);
+  }
   /* trailing spaces */
   td.code pre i {
     border-style: solid;
     border-width: 0 0 0 1px;
     border-color: rgba(0, 0, 0, 0.3);
+  }
   /** LINE NUMBERS **/
   .lineno {
     padding-left: 2px;
     padding-right: 2px !important;
     width: 30px;
     -moz-user-select: none;
     -webkit-user-select: none;
     border-right: 1px solid #CCC !important;
     border-left: 0px solid #CCC !important;
     border-top: 0px solid #CCC !important;
     border-bottom: none !important;
     vertical-align: middle !important;
     text-align: center;
+  }
   .lineno.new {
     text-align: right;
+  }
   .lineno.old {
     text-align: right;
+  }
   .lineno a {
     color: #aaa !important;
     font: 11px Lucida Console, Consolas, Monaco, Inconsolata, Liberation Mono, monospace !important;
     padding-left: 6px;
     padding-right: 6px;
     display: block;
+  }
   .line:hover .lineno a {
     color: #333 !important;
+  }
   .lineno-inline {
     background: none repeat scroll 0 0 #FFF !important;
     padding-left: 2px;
     padding-right: 2px;
     text-align: right;
     width: 30px;
     -moz-user-select: none;
     -webkit-user-select: none;
+  }
   /** CODE **/
   .code {
     display: block;
+  }
   .code pre {
     border: 0;
     padding: 0;
     margin: 0;
     background: none;
     min-height: 17px;
     line-height: 17px;
     white-space: pre-wrap;
     word-break: break-all;
+  }
   /* leading +/- on changed lines */
   .del .code pre:before {
     content: "-";
     color: #800;
+  }
   .add .code pre:before {
     content: "+";
     color: #080;
+  }
   .code pre:before {
     content: " ";
     margin: 0 2px;
+  }
+}
 /* comment bubble */
 .add-bubble {
   position: relative;
   display: none;
   float: left;
   width: 0px;
   height: 0px;
   left: -8px;
   box-sizing: border-box;
+}
 /* comment bubble, only visible when in a commentable diff */
 .commentable-diff tr.line.add:hover td .add-bubble,
 .commentable-diff tr.line.del:hover td .add-bubble,
 .commentable-diff tr.line.unmod:hover td .add-bubble {
   display: block;
   z-index: 1;
+}
 .add-bubble div {
   background: #577632;
   width: 16px;
   height: 16px;
   cursor: pointer;
   padding: 0 2px 2px 0.5px;
   border: 1px solid #577632;
   border-radius: 3px;
   box-sizing: border-box;
+}
 .add-bubble div:before {
   font-size: 14px;
   color: #ffffff;
   font-family: "kallithea";
   content: '\1f5ea';
+}
 .add-bubble div:hover {
   transform: scale(1.2, 1.2);
+}
 /* file diff icons */
 .icon-diff-modified:before {
   color: #d0b44c;
+}
 .icon-diff-removed:before {
   color: #bd2c00;
+}
 .icon-diff-added:before {
   color: #6cc644;
+}
 .icon-diff-renamed:before {
   color: #677a85;
+}

kallithea/public/less/style.less

➞

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
+ *
  */
 @import "kallithea-variables.less";
 body {
   background: url("../images/background.png") repeat scroll 0 0 #B0B0B0;
+}
 /* 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;
+}
 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;
+}
 /* class for texts where newlines should be preserved, for very light-weight ascii art markup (like pull request descriptions) */
 .formatted-fixed {
   white-space: pre-wrap;
+}
 .changeset_hash {
   font-family: Lucida Console, Consolas, Monaco, Inconsolata, Liberation Mono, monospace;
+}
 /* Note: class 'icon-empty' or 'icon-gravatar' can be used to get icon-ish styling without an actual glyph */
 i[class^='icon-empty'],
 i[class^='icon-gravatar'] {
   background-repeat: no-repeat;
   background-position: center;
   display: inline-block;
   min-width: 16px;
   min-height: 16px;
   margin: -2px 0 -4px 0;
+}
 .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;
+}
 /* show comment anchors when hovering over panel-heading */
 a.permalink {
   visibility: hidden;
+}
 .panel-heading:hover .permalink {
   visibility: visible;
+}
 .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;
+}
 /* logo */
 .navbar-brand .branding {
   &:before {
     content: "";
     display: inline-block;
     margin-right: .2em;
     background-image: url(@kallithea-logo-url);
     width: @kallithea-logo-width;
     height: @kallithea-logo-height;
     margin-bottom: -@kallithea-logo-bottom;
     margin-top: -12px;
+  }
+}
 /* code highlighting */
 /* don't use bootstrap style for code blocks */
 .code-highlighttable pre {
   background: inherit;
   border: 0;
+}
 /* every direct child of a panel, that is not .panel-heading, should auto
  * overflow to prevent overflowing of elements like text boxes and tables */
 .panel > :not(.panel-heading){
   overflow-x: auto;
   min-height: 0.01%;
+}
 /* language bars (summary page) */
 #lang_stats {
   .progress-bar {
     min-width: 15px;
     border-top-right-radius: 8px;
     border-bottom-right-radius: 8px;
+  }
   td {
     padding: 1px 0 !important;
+  }
+}
 /* every direct child of a main panel, that is not .panel-heading, should auto
  * overflow to prevent overflowing of elements like text boxes and tables */
 #main > .panel > :not(.panel-heading) {
   overflow-x: auto;
   min-height: 0.01%;
+}
 /* use pointer cursor for expand_commit */
 .expand_commit .icon-align-left {
   cursor: pointer;
   color: #999;
+}
 /* don't break author, date and comment cells into multiple lines in changeset table */
 table.changesets {
   .author,
   .date,
   .comments {
     white-space: nowrap;
+  }
+}
 /* textareas should be at least 100px high and 400px wide */
 textarea.form-control {
   min-height: 100px;
   min-width: 400px;
+}
 /* add some space between the code-browser icons and the file names */
 .browser-dir > i[class^='icon-'],
 .submodule-dir > i[class^='icon-'],
 .browser-file > i[class^='icon-'] {
   padding-right: 0.3em;
+}
 .form-group > label {
   float: left;
+}
 .dt_repo_pending {
   opacity: 0.5;
+}
 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.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,

0 comments (0 inline, 0 general)