You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2017/06/20 13:57:54 UTC
sling-site git commit: Tweak CSS and remove unused codehilite
css
Repository: sling-site
Updated Branches:
refs/heads/master 5f34e1b4f -> 177ce4ebf
Tweak <pre> CSS and remove unused codehilite css
Project: http://git-wip-us.apache.org/repos/asf/sling-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/sling-site/commit/177ce4eb
Tree: http://git-wip-us.apache.org/repos/asf/sling-site/tree/177ce4eb
Diff: http://git-wip-us.apache.org/repos/asf/sling-site/diff/177ce4eb
Branch: refs/heads/master
Commit: 177ce4ebf7c3a1bfceb744aa081cc5d764a444d7
Parents: 5f34e1b
Author: Bertrand Delacretaz <bd...@apache.org>
Authored: Tue Jun 20 15:57:25 2017 +0200
Committer: Bertrand Delacretaz <bd...@apache.org>
Committed: Tue Jun 20 15:57:25 2017 +0200
----------------------------------------------------------------------
assets/res/css/codehilite.css | 429 -------------------------------------
assets/res/css/site.css | 12 +-
templates/header.tpl | 1 -
3 files changed, 11 insertions(+), 431 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sling-site/blob/177ce4eb/assets/res/css/codehilite.css
----------------------------------------------------------------------
diff --git a/assets/res/css/codehilite.css b/assets/res/css/codehilite.css
deleted file mode 100644
index 93ce023..0000000
--- a/assets/res/css/codehilite.css
+++ /dev/null
@@ -1,429 +0,0 @@
-/*************************************************************************
-
- For reference: classes defined by the Confluence batch.css
-
-.code {
- border-width: 1px;
- border-style: dashed;
- overflow: auto;
-}
-
-.code,.preformatted {
- background-color: #fff;
-}
-
-.code pre,.preformatted pre {
- font-family: "Courier New", Courier, monospace;
- line-height: 1.3;
-}
-
-.code-keyword {
- color: #000091;
- background-color: inherit;
-}
-
-.code-object {
- color: #910091;
- background-color: inherit;
-}
-
-.code-quote {
- color: #009100;
- background-color: inherit;
-}
-
-.code-comment {
- color: #808080;
- background-color: inherit;
-}
-
-.code-xml .code-keyword {
- color: inherit;
- font-weight: bold;
-}
-
-.code-tag {
- color: #000091;
- background-color: inherit;
-}
-
-*/
-
-/*************************************************************************
-
- For reference: classes defined by the old Sling Site CSS
-
-.codehilite {
- color: black;
- background-color: #f0f0f0;
- border: solid 1px black;
- margin-top: 0.5em;
- margin-bottom: 0.5em;
- padding: 0.5em
-}
-
-.codeHeader {
- text-align: center;
- font-family: monospace;
- border-bottom: 1px solid black;
- padding-top: 0.5em;
- padding-bottom: 0.5em;
- margin-bottom: 0.5em;
-}
-
-
-.codehilite pre {
- margin: 0em
-}
-
-.code-keyword {
- color: #880000
-}
-
-.code-quote {
- color: #008800
-}
-
-.code-object {
- color: #0000dd
-}
-
-.code-java {
- margin: 0em
-}
-
-*/
-
-/**
- Apache CMS Code High Lighting
-
- HTML structure for default (:::, un-numbered code)
-
- <div class="codehilite">
- <pre>
- ... span-tagged code ...
- </pre>
- </div>
-
-
- HTML structure for #! (line numbered code)
-
- <table class="codehilitetable">
- <tr>
- <td class="linenos">
- <div class="linenodiv">
- <pre>
- ... line numbers ...
- </pre>
- </div>
- </td>
- <td class="code">
- <div class="codehilite">
- <pre>
- ... span-tagged code ...
- </pre>
- </div>
- </td>
- </tr>
- </table>
-*/
-
-.codehilitetable, .codehilite {
- color: black;
- background-color: #f4f4f4;
- border: solid 1px #DDD;
- margin-top: 0.5em;
- margin-bottom: 0.5em;
- padding: 0.5em;
-}
-
-.codehilitetable .linenos {
- border: none;
-}
-
-.codehilitetable .linenos .linenodiv {
-}
-
-.codehilitetable .linenos .linenodiv pre {
- margin: 0px;
- padding: 0px;
-}
-
-.codehilitetable .code {
- border: none;
-}
-
-.codehilitetable .code .codehilite {
- /** overwrite from .codehilite class above */
- border: none;
- margin: 0px;
- padding: 0px;
-}
-
-.codehilite pre {
- /* Applies to both .codehilite divs, top level and in table */
- margin: 0px;
- padding: 0px;
- overflow: auto;
-}
-
-
-/**
- * Pygments Code Formatter Styles
- */
-
-/** Whitespace */
-.codehilite .w {
-}
-/** Error */
-.codehilite .err {
-}
-/** Other */
-.codehilite .x {
-}
-
-/** Keyword */
-.codehilite .k {
- color: #880000
-}
-/** Keyword.Constant */
-.codehilite .kc {
- color: #880000
-}
-/** Keyword.Declaration */
-.codehilite .kd {
- color: #880000
-}
-/** Keyword.Namespace */
-.codehilite .kn {
- color: #880000
-}
-/** Keyword.Pseudo */
-.codehilite .kp {
- color: #880000
-}
-/** Keyword.Reserved */
-.codehilite .kr {
- color: #880000
-}
-/** Keyword.Type */
-.codehilite .kt {
- color: #880000
-}
-
-/** Name */
-.codehilite .n {
- color: #0000dd
-}
-/** Name.Attribute */
-.codehilite .na {
- color: #0000dd
-}
-/** Name.Builtin */
-.codehilite .nb {
- color: #0000dd
-}
-/** Name.Builtin.Pseudo */
-.codehilite .bp {
- color: #0000dd
-}
-/** Name.Class */
-.codehilite .nc {
- color: #0000dd
-}
-/** Name.Constant */
-.codehilite .no {
- color: #0000dd
-}
-/** Name.Decorator */
-.codehilite .nd {
- color: #0000dd
-}
-/** Name.Entity */
-.codehilite .ni {
- color: #0000dd
-}
-/** Name.Exception */
-.codehilite .ne {
- color: #0000dd
-}
-/** Name.Function */
-.codehilite .nf {
- color: #0000dd
-}
-/** Name.Property */
-.codehilite .py {
- color: #0000dd
-}
-/** Name.Label */
-.codehilite .nl {
- color: #0000dd
-}
-/** Name.Namespace */
-.codehilite .nn {
- color: #0000dd
-}
-/** Name.Other */
-.codehilite .nx {
- color: #0000dd
-}
-/** Name.Tag */
-.codehilite .nt {
- color: #0000dd
-}
-/** Name.Variable */
-.codehilite .nv {
- color: #0000dd
-}
-/** Name.Variable.Class */
-.codehilite .vc {
- color: #0000dd
-}
-/** Name.Variable.Global */
-.codehilite .vg {
- color: #0000dd
-}
-/** Name.Variable.Instance */
-.codehilite .vi {
- color: #0000dd
-}
-
-/** Literal */
-.codehilite .l {
-}
-/** Literal.Date */
-.codehilite .ld {
-}
-
-/** String */
-.codehilite .s {
- color: #008800
-}
-/** String.Backtick */
-.codehilite .sb {
- color: #008800
-}
-/** String.Char */
-.codehilite .sc {
- color: #008800
-}
-/** String.Doc */
-.codehilite .sd {
- color: #008800
-}
-/** String.Double */
-.codehilite .s2 {
- color: #008800
-}
-/** String.Escape */
-.codehilite .se {
- color: #008800
-}
-/** String.Heredoc */
-.codehilite .sh {
- color: #008800
-}
-/** String.Interpol */
-.codehilite .si {
- color: #008800
-}
-/** String.Other */
-.codehilite .sx {
- color: #008800
-}
-/** String.Regex */
-.codehilite .sr {
- color: #008800
-}
-/** String.Single */
-.codehilite .s1 {
- color: #008800
-}
-/** String.Symbol */
-.codehilite .ss {
- color: #008800
-}
-
-/** Number */
-.codehilite .m {
-}
-/** Number.Float */
-.codehilite .mf {
-}
-/** Number.Hex */
-.codehilite .mh {
-}
-/** Number.Integer */
-.codehilite .mi {
-}
-/** Number.Integer.Long */
-.codehilite .il {
-}
-/** Number.Oct */
-.codehilite .mo {
-}
-/** Operator */
-.codehilite .o {
-}
-/** Operator.Word */
-.codehilite .ow {
-}
-/** Punctuation */
-.codehilite .p {
-}
-
-/** Comment */
-.codehilite .c {
- color: #808080;
-}
-/** Comment.Multiline */
-.codehilite .cm {
- color: #808080;
-}
-/** Comment.Preproc */
-.codehilite .cp {
- color: #808080;
-}
-/** Comment.Single */
-.codehilite .c1 {
- color: #808080;
-}
-/** Comment.Special */
-.codehilite .cs {
- color: #808080;
-}
-
-/** Generic */
-.codehilite .g {
-}
-/** Generic.Deleted */
-.codehilite .gd {
-}
-/** Generic.Emph */
-.codehilite .ge {
-}
-/** Generic.Error */
-.codehilite .gr {
-}
-/** Generic.Heading */
-.codehilite .gh {
-}
-/** Generic.Inserted */
-.codehilite .gi {
-}
-/** Generic.Output */
-.codehilite .go {
-}
-/** Generic.Prompt */
-.codehilite .gp {
-}
-/** Generic.Strong */
-.codehilite .gs {
-}
-/** Generic.Subheading */
-.codehilite .gu {
-}
-/** Generic.Traceback */
-.codehilite .gt {
-}
-
http://git-wip-us.apache.org/repos/asf/sling-site/blob/177ce4eb/assets/res/css/site.css
----------------------------------------------------------------------
diff --git a/assets/res/css/site.css b/assets/res/css/site.css
index a626a5a..28c8908 100644
--- a/assets/res/css/site.css
+++ b/assets/res/css/site.css
@@ -25,7 +25,7 @@ h2 {
font-size: 200%;
margin-top: 1em;
font-weight: normal;
- border-top: solid rgb(155, 155, 155) 2px;
+ border-top: solid #e0e0e0 1px;
padding-top: 0.45em;
}
@@ -261,3 +261,13 @@ blockquote {
padding-left: 1em;
border-left: 1px solid black;
}
+
+pre {
+ color: black;
+ background-color: #f0f0f0;
+ border: solid 1px #f5f5f5;
+ margin-top: 0.5em;
+ margin-bottom: 0.5em;
+ padding: 0.5em
+ width: 100%;
+}
http://git-wip-us.apache.org/repos/asf/sling-site/blob/177ce4eb/templates/header.tpl
----------------------------------------------------------------------
diff --git a/templates/header.tpl b/templates/header.tpl
index dbd75e9..9d413b4 100644
--- a/templates/header.tpl
+++ b/templates/header.tpl
@@ -5,7 +5,6 @@ title("${config.blog_title}") newLine()
// For now, try to reproduce the layout of the current website, to be able to compare pages
link(rel:"stylesheet", href:"${config.site_contextPath}res/css/site.css") newLine()
-link(rel:"stylesheet", href:"${config.site_contextPath}res/css/codehilite.css") newLine()
div(class:"title") {
div(class:"logo") {