octopress-solarized 1.0.0.alpha1 → 1.0.0.alpha.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6d6d04337c52944e305c457b9030db56b7250e48
4
- data.tar.gz: 78ea37ccb07f10da241a5954810809814e84ffd0
3
+ metadata.gz: 9d634697a8700edc9c28f362eb54e54bb5b20b67
4
+ data.tar.gz: c31e8f3f2d03cf651a1fed46c7afa92d27ebae1f
5
5
  SHA512:
6
- metadata.gz: 1004590dec3a1a558e7b9a81a2baff9fbdf9ab6c9a78d51c684b0cc9db13d250b267ecb39e6455cc4920035a3b2d318a19a484fb26ba971d41698afd6c10b3b9
7
- data.tar.gz: 70786188456f191ee69436fd6be3f3a47e226011cbdea5a5a127ea9aff1b37446177be1efca7078b756f05c2d63d6e231a1437e3fe1f2409a57eb625f1443be0
6
+ metadata.gz: ba8820ce8e1481d93417e76cf47f018e4c0fc342d6444689cbe3a429f2c19bad405d66e8f5da45bb60c1c46f533860f1c4ccaa51b4907102a31e059794ad6f07
7
+ data.tar.gz: b5a42faf2d50ebf110338a56da600796b8b5739cffb9658b49f9115e10781efaee0346017cd22ff6bd0d4ba9a50e85f77e0d0619a596d2c7f5f3b6c0e6b58066
data/.gitignore CHANGED
@@ -18,3 +18,4 @@ tmp
18
18
  .sass-cache
19
19
  .code-highlighter-cache
20
20
  _site
21
+ .DS_Store
@@ -0,0 +1,143 @@
1
+ .code-highlight {
2
+ @include octopress-highlight-style;
3
+ @include octopress-solarized-code;
4
+ }
5
+
6
+ .code-highlight-figure {
7
+ font-size: 13px;
8
+ * { box-sizing: border-box; }
9
+ }
10
+
11
+ .code-highlight-pre {
12
+ background: darken($base03, 1);
13
+ width: 100%;
14
+ margin-bottom: 0;
15
+ display: table;
16
+ }
17
+
18
+ .code-highlight-row {
19
+ display: table-row;
20
+ width: 100%;
21
+ }
22
+
23
+ .code-highlight-row {
24
+ &:before, .code-highlight-line {
25
+ padding: {left: $pre-line-padding + .8; right: $pre-line-padding + .8 }
26
+ }
27
+ &:first-child {
28
+ &:before, .code-highlight-line { padding-top: $pre-line-padding; }
29
+ }
30
+ &:last-child {
31
+ &:before, .code-highlight-line { padding-bottom: $pre-line-padding; }
32
+ }
33
+ &.numbered {
34
+ &:before, .code-highlight-line {
35
+ padding: {left: $pre-line-padding; right: $pre-line-padding }
36
+ }
37
+ &:before {
38
+ display: table-cell;
39
+ content: attr(data-line);
40
+ min-width: 1.2em;
41
+ color: $base01;
42
+ text-align: right;
43
+ line-height: 1.45em;
44
+ @if $solarized == light {
45
+ background: lighten($base03, 1);
46
+ border-right: 1px solid darken($base02, 2);
47
+ text-shadow: lighten($base02, 2) 0 -1px;
48
+ } @else {
49
+ background: $base02;
50
+ border-right: 1px solid darken($base03, 2);
51
+ box-shadow: lighten($base02, 2) -1px 0 inset;
52
+ text-shadow: darken($base02, 10) 0 -1px;
53
+ }
54
+ }
55
+ }
56
+ }
57
+
58
+ .code-highlight-line {
59
+ display: table-cell;
60
+ width: 100%;
61
+ position: relative;
62
+ z-index: 1;
63
+ }
64
+
65
+ .marked-line {
66
+ position: relative;
67
+ &.unnumbered {
68
+ }
69
+ .code-highlight-line {
70
+ &:before {
71
+ content: "";
72
+ position: absolute;
73
+ background: $marker-bg;
74
+ left: 0; top: 0; bottom: 0; right: 0;
75
+ border-right: 1px solid $marker-border;
76
+ }
77
+ }
78
+ &.unnumbered .code-highlight-line:before {
79
+ border-left: 3px solid $marker-border-left;
80
+ }
81
+ &.numbered:before {
82
+ background: $marker-bg;
83
+ border-left: 3px solid $marker-border-left;
84
+ border-right-color: darken($marker-bg, 20);
85
+ }
86
+ }
87
+
88
+ .start-marked-line {
89
+ &:before, .code-highlight-line:before {
90
+ border-top: 1px solid $marker-border;
91
+ }
92
+ }
93
+ .end-marked-line {
94
+ &:before, .code-highlight-line:before {
95
+ border-bottom: 1px solid $marker-border;
96
+ }
97
+ }
98
+
99
+ .code-highlight-table {
100
+ margin-bottom: 0;
101
+ background: $base03;
102
+ pre {
103
+ padding: .8em;
104
+ background: none;
105
+ border-radius: 0;
106
+ border: none;
107
+ margin-bottom: 0;
108
+ }
109
+ }
110
+
111
+ .code-highlight-figure {
112
+ margin: {left: 0; right: 0;}
113
+ background: none;
114
+ padding: 0;
115
+ border: 0;
116
+ pre { margin: { top: 0; bottom: 0; } }
117
+ }
118
+
119
+ .code-highlight-caption {
120
+ position: relative;
121
+ text-align: center;
122
+ line-height: 2em;
123
+ text-shadow: #fff 0 1px 0;
124
+ color: #474747;
125
+ font-weight: normal;
126
+ margin-bottom: 0;
127
+ background-color: #ccc;
128
+ background-image: linear-gradient(#ffffff, #f0f0f0 6%, #e5e5e5 90%, #e5e5e5);
129
+ border-top-left-radius: 5px;
130
+ border-top-right-radius: 5px;
131
+ font-family: "Helvetica Neue", Arial, "Lucida Grande", "Lucida Sans Unicode", Lucida, sans-serif;
132
+ border: 1px solid #cbcbcb;
133
+ + .code-highlight { border-top: 0; }
134
+ }
135
+
136
+ .code-highlight-caption-link {
137
+ position: absolute; right: .8em;
138
+ color: #666;
139
+ z-index: 1;
140
+ text-shadow: #cbcccc 0 1px 0;
141
+ padding-left: 3em;
142
+ }
143
+
@@ -1,3 +1,5 @@
1
+ $pre-line-padding: .8em;
2
+
1
3
  %octopress-diff-bg {
2
4
  content: "";
3
5
  position: absolute;
@@ -12,13 +14,20 @@
12
14
  }
13
15
  }
14
16
 
15
- .code-highlight {
17
+ @mixin octopress-highlight-style {
16
18
  border: 1px solid $code-highlight-border;
17
19
  background: $pre-bg;
18
20
  color: $base1;
19
21
  span { color: $base1; }
20
22
  span { font-style: normal; font-weight: normal; }
21
23
 
24
+ overflow: scroll;
25
+ overflow-y: hidden;
26
+ overflow-x: auto;
27
+ line-height: 1.45em;
28
+ }
29
+
30
+ @mixin octopress-solarized-code {
22
31
  .c { color: $base01; font-style: italic; } /* Comment */
23
32
  .cm { color: $base01; font-style: italic; } /* Comment.Multiline */
24
33
  .cp { color: $base01; font-style: italic; } /* Comment.Preproc */
@@ -20,7 +20,7 @@ $marker-bg: rgba($marker, .13) !default;
20
20
  $marker-border: rgba($marker, .13) !default;
21
21
  $marker-border-left: $marker !default;
22
22
 
23
- $solarized: light;// !default;
23
+ $solarized: light !default;
24
24
 
25
25
  $solar-scroll-bg: rgba(#fff, .15);
26
26
  $solar-scroll-thumb: rgba(#fff, .2);
@@ -0,0 +1,15 @@
1
+ .highlight {
2
+ font-size: 13px;
3
+ * { box-sizing: border-box; }
4
+ pre {
5
+ @include octopress-highlight-style;
6
+ padding: .8em;
7
+ }
8
+ @include octopress-solarized-code;
9
+ }
10
+
11
+ pre {
12
+ font-size: 13px;
13
+ font-family: Inconsolata, Menlo, Monaco, 'Andale Mono', 'lucida console', 'Courier New', monospace;
14
+ }
15
+
@@ -0,0 +1,2 @@
1
+ $pre-line-padding: .8em;
2
+
@@ -1,156 +1,6 @@
1
+ @import 'vars';
1
2
  @import 'solarized';
2
3
  @import 'code-style';
3
-
4
- .code-highlight-figure {
5
- font-size: 13px;
6
- * { box-sizing: border-box; }
7
- }
8
-
9
- .code-highlight-pre {
10
- background: darken($base03, 1);
11
- width: 100%;
12
- margin-bottom: 0;
13
- display: table;
14
- }
15
-
16
- $pre-line-padding: .8em;
17
-
18
- .code-highlight-row {
19
- display: table-row;
20
- width: 100%;
21
- }
22
-
23
- .code-highlight-row {
24
- &:before, .code-highlight-line {
25
- padding: {left: $pre-line-padding + .8; right: $pre-line-padding + .8 }
26
- }
27
- &:first-child {
28
- &:before, .code-highlight-line { padding-top: $pre-line-padding; }
29
- }
30
- &:last-child {
31
- &:before, .code-highlight-line { padding-bottom: $pre-line-padding; }
32
- }
33
- &.numbered {
34
- &:before, .code-highlight-line {
35
- padding: {left: $pre-line-padding; right: $pre-line-padding }
36
- }
37
- &:before {
38
- display: table-cell;
39
- content: attr(data-line);
40
- min-width: 1.2em;
41
- color: $base01;
42
- text-align: right;
43
- line-height: 1.45em;
44
- @if $solarized == light {
45
- background: lighten($base03, 1);
46
- border-right: 1px solid darken($base02, 2);
47
- text-shadow: lighten($base02, 2) 0 -1px;
48
- } @else {
49
- background: $base02;
50
- border-right: 1px solid darken($base03, 2);
51
- box-shadow: lighten($base02, 2) -1px 0 inset;
52
- text-shadow: darken($base02, 10) 0 -1px;
53
- }
54
- }
55
- }
56
- }
57
-
58
- .code-highlight-line {
59
- display: table-cell;
60
- width: 100%;
61
- position: relative;
62
- z-index: 1;
63
- }
64
-
65
- .marked-line {
66
- position: relative;
67
- &.unnumbered {
68
- }
69
- .code-highlight-line {
70
- &:before {
71
- content: "";
72
- position: absolute;
73
- background: $marker-bg;
74
- left: 0; top: 0; bottom: 0; right: 0;
75
- border-right: 1px solid $marker-border;
76
- }
77
- }
78
- &.unnumbered .code-highlight-line:before {
79
- border-left: 3px solid $marker-border-left;
80
- }
81
- &.numbered:before {
82
- background: $marker-bg;
83
- border-left: 3px solid $marker-border-left;
84
- border-right-color: darken($marker-bg, 20);
85
- }
86
- }
87
-
88
- .start-marked-line {
89
- &:before, .code-highlight-line:before {
90
- border-top: 1px solid $marker-border;
91
- }
92
- }
93
- .end-marked-line {
94
- &:before, .code-highlight-line:before {
95
- border-bottom: 1px solid $marker-border;
96
- }
97
- }
98
-
99
- .code-highlight {
100
- overflow: scroll;
101
- overflow-y: hidden;
102
- overflow-x: auto;
103
- line-height: 1.45em;
104
- }
105
-
106
- .code-highlight-table {
107
- margin-bottom: 0;
108
- background: $base03;
109
- pre {
110
- padding: .8em;
111
- background: none;
112
- border-radius: 0;
113
- border: none;
114
- margin-bottom: 0;
115
- }
116
- }
117
-
118
- .code-highlight-figure {
119
- margin: {left: 0; right: 0;}
120
- background: none;
121
- padding: 0;
122
- border: 0;
123
- pre { margin-bottom: 0; }
124
- }
125
-
126
- .code-highlight-caption {
127
- position: relative;
128
- text-align: center;
129
- line-height: 2em;
130
- text-shadow: #fff 0 1px 0;
131
- color: #474747;
132
- font-weight: normal;
133
- margin-bottom: 0;
134
- background-color: #ccc;
135
- background-image: linear-gradient(#ffffff, #f0f0f0 6%, #e5e5e5 90%, #e5e5e5);
136
- border-top-left-radius: 5px;
137
- border-top-right-radius: 5px;
138
- font-family: "Helvetica Neue", Arial, "Lucida Grande", "Lucida Sans Unicode", Lucida, sans-serif;
139
- border: 1px solid #cbcbcb;
140
- + .code-highlight { border-top: 0; }
141
- }
142
-
143
- .code-highlight-caption-link {
144
- position: absolute; right: .8em;
145
- color: #666;
146
- z-index: 1;
147
- text-shadow: #cbcccc 0 1px 0;
148
- padding-left: 3em;
149
- }
150
-
151
- pre {
152
- margin-top: 0;
153
- font-size: 13px;
154
- font-family: Menlo, Monaco, 'Andale Mono', 'lucida console', 'Courier New', monospace;
155
- }
4
+ @import 'code-highlight';
5
+ @import 'standard-highlight';
156
6
 
@@ -1,5 +1,5 @@
1
1
  module Octopress
2
2
  module Solarized
3
- VERSION = "1.0.0.alpha1"
3
+ VERSION = "1.0.0.alpha.2"
4
4
  end
5
5
  end
@@ -12,11 +12,6 @@ module Octopress
12
12
  assets_path: File.expand_path(File.join(File.dirname(__FILE__), '../assets'))
13
13
  }
14
14
  end
15
-
16
- def add_assets
17
- add_sass 'code.scss'
18
- end
19
-
20
15
  end
21
16
  end
22
17
  end
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
18
18
  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
19
19
  spec.require_paths = ["lib"]
20
20
 
21
- spec.add_runtime_dependency "octopress-ink", "~> 1.0.0.alpha.37"
21
+ spec.add_runtime_dependency "octopress-ink", "~> 1.0", ">= 1.0.0.alpha.41"
22
22
 
23
23
  spec.add_development_dependency "bundler", "~> 1.3"
24
24
  spec.add_development_dependency "rake"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: octopress-solarized
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0.alpha1
4
+ version: 1.0.0.alpha.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Brandon Mathis
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-03-13 00:00:00.000000000 Z
11
+ date: 2014-03-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: octopress-ink
@@ -16,14 +16,20 @@ dependencies:
16
16
  requirements:
17
17
  - - ~>
18
18
  - !ruby/object:Gem::Version
19
- version: 1.0.0.alpha.37
19
+ version: '1.0'
20
+ - - '>='
21
+ - !ruby/object:Gem::Version
22
+ version: 1.0.0.alpha.41
20
23
  type: :runtime
21
24
  prerelease: false
22
25
  version_requirements: !ruby/object:Gem::Requirement
23
26
  requirements:
24
27
  - - ~>
25
28
  - !ruby/object:Gem::Version
26
- version: 1.0.0.alpha.37
29
+ version: '1.0'
30
+ - - '>='
31
+ - !ruby/object:Gem::Version
32
+ version: 1.0.0.alpha.41
27
33
  - !ruby/object:Gem::Dependency
28
34
  name: bundler
29
35
  requirement: !ruby/object:Gem::Requirement
@@ -65,8 +71,11 @@ files:
65
71
  - LICENSE.txt
66
72
  - README.md
67
73
  - Rakefile
74
+ - assets/stylesheets/_code-highlight.scss
68
75
  - assets/stylesheets/_code-style.scss
69
76
  - assets/stylesheets/_solarized.scss
77
+ - assets/stylesheets/_standard-highlight.scss
78
+ - assets/stylesheets/_vars.scss
70
79
  - assets/stylesheets/code.scss
71
80
  - demo/.gitignore
72
81
  - demo/Gemfile