Skip to content

Commit

Permalink
Merge remote-tracking branch 'atelierbram/Atelierestuary-light'
Browse files Browse the repository at this point in the history
# Conflicts:
#	demo/index.html
  • Loading branch information
Sannis committed Apr 8, 2015
2 parents c6f4c41 + 2a2a0f1 commit 2ba35bd
Show file tree
Hide file tree
Showing 3 changed files with 113 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

New Styles:

- *Atelier Plateau*, *Atelier Cave*, *Atelier Savanna* and *Atelier Estuary* by [Bram de Haan][]
- *Atelier Cave*, *Atelier Estuary*, *Atelier Plateau* and *Atelier Savanna* and by [Bram de Haan][]

[Bram de Haan]: https://github.com/atelierbram

Expand Down
3 changes: 2 additions & 1 deletion demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
<link rel="alternate stylesheet" title="Atelier Dune - Dark" href="styles/atelier-dune.dark.css">
<link rel="alternate stylesheet" title="Atelier Dune - Light" href="styles/atelier-dune.light.css">
<link rel="alternate stylesheet" title="Atelier Estuary - Dark" href="styles/atelier-estuary.dark.css">
<link rel="alternate stylesheet" title="Atelier Estuary - Light" href="styles/atelier-estuary.light.css">
<link rel="alternate stylesheet" title="Atelier Forest - Dark" href="styles/atelier-forest.dark.css">
<link rel="alternate stylesheet" title="Atelier Forest - Light" href="styles/atelier-forest.light.css">
<link rel="alternate stylesheet" title="Atelier Heath - Dark" href="styles/atelier-heath.dark.css">
Expand All @@ -56,8 +57,8 @@
<link rel="alternate stylesheet" title="Atelier Savanna - Light" href="styles/atelier-savanna.light.css">
<link rel="alternate stylesheet" title="Atelier Seaside - Dark" href="styles/atelier-seaside.dark.css">
<link rel="alternate stylesheet" title="Atelier Seaside - Light" href="styles/atelier-seaside.light.css">
<link rel="alternate stylesheet" title="Atelier Sulphurpool - Light" href="styles/atelier-sulphurpool.light.css">
<link rel="alternate stylesheet" title="Atelier Sulphurpool - Dark" href="styles/atelier-sulphurpool.dark.css">
<link rel="alternate stylesheet" title="Atelier Sulphurpool - Light" href="styles/atelier-sulphurpool.light.css">
<link rel="alternate stylesheet" title="Paraíso - Dark" href="styles/paraiso.dark.css">
<link rel="alternate stylesheet" title="Paraíso - Light" href="styles/paraiso.light.css">
<link rel="alternate stylesheet" title="Colorbrewer" href="styles/color-brewer.css">
Expand Down
110 changes: 110 additions & 0 deletions src/styles/atelier-estuary.light.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
/* Base16 Atelier Estuary Light - Theme */
/* by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/estuary) */
/* Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16) */

/* Atelier-Estuary Comment */
.hljs-comment {
color: #6c6b5a;
}

/* Atelier-Estuary Red */
.hljs-variable,
.hljs-attribute,
.hljs-tag,
.hljs-regexp,
.hljs-name,
.ruby .hljs-constant,
.xml .hljs-tag .hljs-title,
.xml .hljs-pi,
.xml .hljs-doctype,
.html .hljs-doctype,
.css .hljs-id,
.css .hljs-class,
.css .hljs-pseudo {
color: #ba6236;
}

/* Atelier-Estuary Orange */
.hljs-number,
.hljs-preprocessor,
.hljs-built_in,
.hljs-literal,
.hljs-params,
.hljs-constant {
color: #ae7313;
}

/* Atelier-Estuary Yellow */
.ruby .hljs-class .hljs-title,
.css .hljs-rule .hljs-attribute {
color: #a5980d;
}

/* Atelier-Estuary Green */
.hljs-string,
.hljs-value,
.hljs-inheritance,
.hljs-header,
.ruby .hljs-symbol,
.xml .hljs-cdata {
color: #7d9726;
}

/* Atelier-Estuary Aqua */
.hljs-title,
.css .hljs-hexcolor {
color: #5b9d48;
}

/* Atelier-Estuary Blue */
.hljs-function,
.python .hljs-decorator,
.python .hljs-title,
.ruby .hljs-function .hljs-title,
.ruby .hljs-title .hljs-keyword,
.perl .hljs-sub,
.javascript .hljs-title,
.coffeescript .hljs-title {
color: #36a166;
}

/* Atelier-Estuary Purple */
.hljs-keyword,
.javascript .hljs-function {
color: #5f9182;
}

.diff .hljs-deletion,
.diff .hljs-addition {
color: #22221b;
display: inline-block;
width: 100%;
}
.diff .hljs-deletion {
background-color: #ba6236;
}
.diff .hljs-addition {
background-color: #7d9726;
}
.diff .hljs-change {
color: #36a166;
}

.hljs {
display: block;
overflow-x: auto;
background: #f4f3ec;
color: #5f5e4e;
padding: 0.5em;
-webkit-text-size-adjust: none;
}

.coffeescript .javascript,
.javascript .xml,
.tex .hljs-formula,
.xml .javascript,
.xml .vbscript,
.xml .css,
.xml .hljs-cdata {
opacity: 0.5;
}

0 comments on commit 2ba35bd

Please sign in to comment.