geomerative 0.4.3-java → 2.1.0-java
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +5 -5
- data/.gitignore +2 -0
- data/.mvn/extensions.xml +1 -1
- data/.mvn/wrapper/maven-wrapper.properties +1 -1
- data/CHANGELOG.md +19 -1
- data/COPYING.md +1 -1
- data/README.md +2 -2
- data/Rakefile +2 -15
- data/docs/_config.yml +8 -0
- data/docs/_includes/head.html +7 -6
- data/docs/_includes/header.html +6 -6
- data/docs/_includes/icon-github.svg +3 -1
- data/docs/_includes/icon-twitter.svg +3 -1
- data/docs/_includes/navigation.html +24 -0
- data/docs/_sass/_base.scss +79 -79
- data/docs/_sass/_layout.scss +137 -137
- data/docs/_sass/_syntax-highlighting.scss +64 -64
- data/docs/index.html +18 -18
- data/examples/README.md +1 -1
- data/examples/data/bot1.svg +1 -1
- data/examples/data/lion.svg +156 -156
- data/examples/data/ruby.svg +1 -1
- data/examples/jruby_merge.rb +1 -1
- data/examples/{f_agent.rb → library/f_agent/f_agent.rb} +0 -0
- data/examples/{font_agent.rb → library/font_agent/font_agent.rb} +2 -1
- data/examples/text_on_geomerative_path.rb +3 -2
- data/examples/typo_deform.rb +2 -2
- data/examples/typo_extra_bright.rb +1 -1
- data/geomerative.gemspec +3 -6
- data/lib/geomerative/version.rb +1 -1
- data/lib/geomerative.jar +0 -0
- data/lib/geomerative.rb +10 -10
- data/mvnw +234 -0
- data/mvnw.cmd +145 -0
- data/pom.rb +14 -16
- data/pom.xml +13 -19
- data/src/geomerative/FastRClip.java +2050 -2334
- data/src/geomerative/RClip.java +2237 -2539
- data/src/geomerative/RClosest.java +33 -31
- data/src/geomerative/RCommand.java +1750 -1758
- data/src/geomerative/RContour.java +290 -292
- data/src/geomerative/RFont.java +277 -246
- data/src/geomerative/RG.java +722 -727
- data/src/geomerative/RGeomElem.java +967 -962
- data/src/geomerative/RGroup.java +508 -467
- data/src/geomerative/RMatrix.java +304 -289
- data/src/geomerative/RMesh.java +241 -229
- data/src/geomerative/RPath.java +924 -926
- data/src/geomerative/RPoint.java +391 -391
- data/src/geomerative/RPolygon.java +1017 -1013
- data/src/geomerative/RRectangle.java +43 -52
- data/src/geomerative/RSVG.java +480 -516
- data/src/geomerative/RShape.java +1767 -1777
- data/src/geomerative/RStrip.java +173 -176
- data/src/geomerative/RStyle.java +197 -194
- data/src/module-info.java +4 -0
- data/src/org/apache/batik/svggen/font/Font.java +141 -142
- data/src/org/apache/batik/svggen/font/Glyph.java +102 -71
- data/src/org/apache/batik/svggen/font/Point.java +12 -12
- data/src/org/apache/batik/svggen/font/RandomAccessFileEmulator.java +14 -12
- data/src/org/apache/batik/svggen/font/table/ClassDef.java +12 -12
- data/src/org/apache/batik/svggen/font/table/ClassDefFormat1.java +27 -24
- data/src/org/apache/batik/svggen/font/table/ClassDefFormat2.java +20 -17
- data/src/org/apache/batik/svggen/font/table/CmapFormat.java +43 -43
- data/src/org/apache/batik/svggen/font/table/CmapFormat0.java +33 -26
- data/src/org/apache/batik/svggen/font/table/CmapFormat2.java +25 -20
- data/src/org/apache/batik/svggen/font/table/CmapFormat4.java +106 -96
- data/src/org/apache/batik/svggen/font/table/CmapFormat6.java +36 -32
- data/src/org/apache/batik/svggen/font/table/CmapIndexEntry.java +69 -49
- data/src/org/apache/batik/svggen/font/table/CmapTable.java +50 -50
- data/src/org/apache/batik/svggen/font/table/Coverage.java +19 -19
- data/src/org/apache/batik/svggen/font/table/CoverageFormat1.java +30 -27
- data/src/org/apache/batik/svggen/font/table/CoverageFormat2.java +26 -24
- data/src/org/apache/batik/svggen/font/table/CvtTable.java +16 -16
- data/src/org/apache/batik/svggen/font/table/Device.java +32 -32
- data/src/org/apache/batik/svggen/font/table/DirectoryEntry.java +39 -39
- data/src/org/apache/batik/svggen/font/table/Feature.java +26 -23
- data/src/org/apache/batik/svggen/font/table/FeatureList.java +37 -35
- data/src/org/apache/batik/svggen/font/table/FeatureRecord.java +22 -22
- data/src/org/apache/batik/svggen/font/table/FeatureTags.java +4 -3
- data/src/org/apache/batik/svggen/font/table/FpgmTable.java +9 -9
- data/src/org/apache/batik/svggen/font/table/GlyfCompositeComp.java +134 -132
- data/src/org/apache/batik/svggen/font/table/GlyfCompositeDescript.java +123 -122
- data/src/org/apache/batik/svggen/font/table/GlyfDescript.java +44 -44
- data/src/org/apache/batik/svggen/font/table/GlyfSimpleDescript.java +110 -109
- data/src/org/apache/batik/svggen/font/table/GlyfTable.java +46 -46
- data/src/org/apache/batik/svggen/font/table/GlyphDescription.java +25 -13
- data/src/org/apache/batik/svggen/font/table/GposTable.java +26 -23
- data/src/org/apache/batik/svggen/font/table/GsubTable.java +85 -82
- data/src/org/apache/batik/svggen/font/table/HeadTable.java +131 -131
- data/src/org/apache/batik/svggen/font/table/HheaTable.java +80 -80
- data/src/org/apache/batik/svggen/font/table/HmtxTable.java +50 -49
- data/src/org/apache/batik/svggen/font/table/KernSubtable.java +29 -27
- data/src/org/apache/batik/svggen/font/table/KernSubtableFormat0.java +35 -32
- data/src/org/apache/batik/svggen/font/table/KernSubtableFormat2.java +28 -26
- data/src/org/apache/batik/svggen/font/table/KernTable.java +36 -31
- data/src/org/apache/batik/svggen/font/table/KerningPair.java +27 -23
- data/src/org/apache/batik/svggen/font/table/LangSys.java +28 -26
- data/src/org/apache/batik/svggen/font/table/LangSysRecord.java +22 -22
- data/src/org/apache/batik/svggen/font/table/Ligature.java +24 -24
- data/src/org/apache/batik/svggen/font/table/LigatureSet.java +24 -24
- data/src/org/apache/batik/svggen/font/table/LigatureSubst.java +9 -9
- data/src/org/apache/batik/svggen/font/table/LigatureSubstFormat1.java +30 -30
- data/src/org/apache/batik/svggen/font/table/LocaTable.java +37 -37
- data/src/org/apache/batik/svggen/font/table/Lookup.java +41 -40
- data/src/org/apache/batik/svggen/font/table/LookupList.java +34 -34
- data/src/org/apache/batik/svggen/font/table/LookupSubtableFactory.java +7 -5
- data/src/org/apache/batik/svggen/font/table/MaxpTable.java +96 -96
- data/src/org/apache/batik/svggen/font/table/NameRecord.java +64 -65
- data/src/org/apache/batik/svggen/font/table/NameTable.java +33 -33
- data/src/org/apache/batik/svggen/font/table/Os2Table.java +196 -196
- data/src/org/apache/batik/svggen/font/table/Panose.java +14 -12
- data/src/org/apache/batik/svggen/font/table/PostTable.java +338 -338
- data/src/org/apache/batik/svggen/font/table/PrepTable.java +9 -9
- data/src/org/apache/batik/svggen/font/table/Program.java +15 -15
- data/src/org/apache/batik/svggen/font/table/RangeRecord.java +26 -25
- data/src/org/apache/batik/svggen/font/table/Script.java +38 -38
- data/src/org/apache/batik/svggen/font/table/ScriptList.java +42 -42
- data/src/org/apache/batik/svggen/font/table/ScriptRecord.java +22 -22
- data/src/org/apache/batik/svggen/font/table/ScriptTags.java +2 -1
- data/src/org/apache/batik/svggen/font/table/SingleSubst.java +15 -16
- data/src/org/apache/batik/svggen/font/table/SingleSubstFormat1.java +33 -33
- data/src/org/apache/batik/svggen/font/table/SingleSubstFormat2.java +32 -32
- data/src/org/apache/batik/svggen/font/table/Table.java +171 -170
- data/src/org/apache/batik/svggen/font/table/TableDirectory.java +55 -55
- data/src/org/apache/batik/svggen/font/table/TableFactory.java +92 -93
- metadata +18 -19
- data/.travis.yml +0 -10
- data/calculate_torsional_angle.rb +0 -17
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
|
-
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
2
|
+
SHA256:
|
|
3
|
+
metadata.gz: '04786dbbf9b8106ef82ae2ad79f2c36fcee5d0ebf7241c933b4003fa91f9c3e7'
|
|
4
|
+
data.tar.gz: 5046c57710afc3ba7dc720b885af2aa54ca9a17d438184214821d80dcc4e7269
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 9c2149d15a7ab3c73bdc72cb8bd8bfc305fbaa4e37e6e25525a9a4df9d9a937a8a53eb2d2b9d252a5a4bd6c6420333ee2ae525e110377a6048033a095070ac86
|
|
7
|
+
data.tar.gz: 9d9ba11bd6aa4dd617c4c207326d5fbbe98f68de5f2dacbd5039e91db73c7bf262b100c5ecbe04e00a143c9dd49548a53bcdcb7b0f3196042a4349fc5de75eda
|
data/.gitignore
CHANGED
data/.mvn/extensions.xml
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.
|
|
1
|
+
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip
|
data/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,23 @@
|
|
|
1
|
+
### version-2.1.0
|
|
2
|
+
First crack at java module, and other changes that seem to be necessary for JRuby-3.0+
|
|
3
|
+
|
|
4
|
+
### version-2.0.0
|
|
5
|
+
For jdk11+, for JRubyArt-2.4+, propane-3.6+ and PiCrate-2.1+, remove dependency on PApplet instance method readBytes(String).
|
|
6
|
+
|
|
7
|
+
### version-1.1
|
|
8
|
+
Bump versions processing-3.4 (changes to smooth) , jruby-9.2.1.0. Fix `contains(RRoints[])` then rename to `containsPoints` and similarly `contains(RGeomElement shp)` to `containsShape(RShape shp)` in this respect we are deviating for original geomerative library that was flawed (and overloading `contains` method way too much).
|
|
9
|
+
|
|
10
|
+
### version-1.0.2
|
|
11
|
+
Bump versions processing-3.3.7 (changes to smooth) , jruby-9.1.17.0
|
|
12
|
+
|
|
13
|
+
### version-1.0.1
|
|
14
|
+
Bump versions processing-3.3.6, jruby-9.1.15.0
|
|
15
|
+
|
|
16
|
+
### version-1.0.0
|
|
17
|
+
Bump versions processing-3.3.4, jruby-9.1.12.0 about time we bumped to a full release version number
|
|
18
|
+
|
|
1
19
|
### version-0.4.3
|
|
2
|
-
Bump versions processing-3.3.2 removed JRubyArt
|
|
20
|
+
Bump versions processing-3.3.2 removed JRubyArt dependency since can be used with propane as well
|
|
3
21
|
|
|
4
22
|
### version-0.4.2
|
|
5
23
|
Bump versions processing-3.3, jruby-9.1.8.0
|
data/COPYING.md
CHANGED
|
@@ -10,7 +10,7 @@ This product includes software developed by the Solution Engineering, Inc. (http
|
|
|
10
10
|
This product includes software developed by the The Apache Software Foundation (http://www.apache.org/).
|
|
11
11
|
|
|
12
12
|
Modifications and variations thereof to be compatible with (take advantage of new syntax etc) jdk8, processing-3.0 and thence JRubyArt
|
|
13
|
-
Copyright (c) 2015-
|
|
13
|
+
Copyright (c) 2015-2020 Martin Prout
|
|
14
14
|
|
|
15
15
|
I have not further polluted the headers of the original code so it may not clear that such code has been modified, but if you care you should check the [original][]
|
|
16
16
|
|
data/README.md
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
# geomerative gem
|
|
2
2
|
|
|
3
3
|
[](https://badge.fury.io/rb/geomerative)
|
|
4
|
-

|
|
5
4
|
|
|
6
|
-
Gem wrapper for [Ricard Marxer Geomerative library][] for [JRubyArt][jruby_art]
|
|
5
|
+
Gem wrapper for [Ricard Marxer Geomerative library][] for [JRubyArt][jruby_art], [propane][propane] and [PiCrate][picrate]
|
|
7
6
|
Create amazing stuff with fonts svg etc.
|
|
8
7
|
|
|
9
8
|
Read more about using the gem on the linked [web pages].
|
|
@@ -13,3 +12,4 @@ Read more about using the gem on the linked [web pages].
|
|
|
13
12
|
[Ricard Marxer Geomerative library]:https://github.com/rikrd/geomerative
|
|
14
13
|
[jruby_art]:https://ruby-processing.github.io/JRubyArt/
|
|
15
14
|
[propane]:https://ruby-processing.github.io/propane/
|
|
15
|
+
[picrate]:https://ruby-processing.github.io/PiCrate/
|
data/Rakefile
CHANGED
|
@@ -1,24 +1,11 @@
|
|
|
1
1
|
require_relative 'lib/geomerative/version'
|
|
2
2
|
|
|
3
|
-
def create_manifest
|
|
4
|
-
title = 'Implementation-Title: geomerative (java extension for geomerative gem)'
|
|
5
|
-
version = format('Implementation-Version: %s', Geomerative::VERSION)
|
|
6
|
-
file = File.open('MANIFEST.MF', 'w') do |f|
|
|
7
|
-
f.puts(title)
|
|
8
|
-
f.puts(version)
|
|
9
|
-
end
|
|
10
|
-
end
|
|
11
3
|
|
|
12
|
-
task default: [:
|
|
13
|
-
|
|
14
|
-
desc 'Create Manifest'
|
|
15
|
-
task :init do
|
|
16
|
-
create_manifest
|
|
17
|
-
end
|
|
4
|
+
task default: [:compile, :gem]
|
|
18
5
|
|
|
19
6
|
desc 'Build gem'
|
|
20
7
|
task :gem do
|
|
21
|
-
sh "
|
|
8
|
+
sh "jgem build geomerative.gemspec"
|
|
22
9
|
end
|
|
23
10
|
|
|
24
11
|
desc 'Compile'
|
data/docs/_config.yml
CHANGED
data/docs/_includes/head.html
CHANGED
|
@@ -5,11 +5,12 @@
|
|
|
5
5
|
{% if page.keywords %}
|
|
6
6
|
<meta name="keywords" content="{{ page.keywords }}" />
|
|
7
7
|
{% else %}
|
|
8
|
-
<meta name="keywords" content="
|
|
9
|
-
{% endif %}
|
|
8
|
+
<meta name="keywords" content="propane, JRubyArt, processing, geomerative, gem" />
|
|
9
|
+
{% endif %}
|
|
10
|
+
<title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
|
|
10
11
|
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
|
|
11
12
|
|
|
12
|
-
<link rel="stylesheet" href="
|
|
13
|
-
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.
|
|
14
|
-
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.
|
|
15
|
-
</head>
|
|
13
|
+
<link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
|
|
14
|
+
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
|
|
15
|
+
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" />
|
|
16
|
+
</head>
|
data/docs/_includes/header.html
CHANGED
|
@@ -7,17 +7,17 @@
|
|
|
7
7
|
<nav class="site-nav">
|
|
8
8
|
<a href="#" class="menu-icon">
|
|
9
9
|
<svg viewBox="0 0 18 15">
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
10
|
+
<path fill="#424242" d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0 h15.031C17.335,0,18,0.665,18,1.484L18,1.484z"/>
|
|
11
|
+
<path fill="#424242" d="M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0c0-0.82,0.665-1.484,1.484-1.484 h15.031C17.335,6.031,18,6.696,18,7.516L18,7.516z"/>
|
|
12
|
+
<path fill="#424242" d="M18,13.516C18,14.335,17.335,15,16.516,15H1.484C0.665,15,0,14.335,0,13.516l0,0 c0-0.82,0.665-1.484,1.484-1.484h15.031C17.335,12.031,18,12.696,18,13.516L18,13.516z"/>
|
|
13
13
|
</svg>
|
|
14
14
|
</a>
|
|
15
15
|
|
|
16
16
|
<div class="trigger">
|
|
17
17
|
{% for my_page in site.pages %}
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
18
|
+
{% if my_page.title %}
|
|
19
|
+
<a class="page-link" href="{{ my_page.url | prepend: site.github.url }}">{{ my_page.title }}</a>
|
|
20
|
+
{% endif %}
|
|
21
21
|
{% endfor %}
|
|
22
22
|
</div>
|
|
23
23
|
</nav>
|
|
@@ -1 +1,3 @@
|
|
|
1
|
-
<svg viewBox="0 0 16 16"
|
|
1
|
+
<svg viewBox="0 0 16 16">
|
|
2
|
+
<path fill="#828282" d="M7.999,0.431c-4.285,0-7.76,3.474-7.76,7.761 c0,3.428,2.223,6.337,5.307,7.363c0.388,0.071,0.53-0.168,0.53-0.374c0-0.184-0.007-0.672-0.01-1.32 c-2.159,0.469-2.614-1.04-2.614-1.04c-0.353-0.896-0.862-1.135-0.862-1.135c-0.705-0.481,0.053-0.472,0.053-0.472 c0.779,0.055,1.189,0.8,1.189,0.8c0.692,1.186,1.816,0.843,2.258,0.645c0.071-0.502,0.271-0.843,0.493-1.037 C4.86,11.425,3.049,10.76,3.049,7.786c0-0.847,0.302-1.54,0.799-2.082C3.768,5.507,3.501,4.718,3.924,3.65 c0,0,0.652-0.209,2.134,0.796C6.677,4.273,7.34,4.187,8,4.184c0.659,0.003,1.323,0.089,1.943,0.261 c1.482-1.004,2.132-0.796,2.132-0.796c0.423,1.068,0.157,1.857,0.077,2.054c0.497,0.542,0.798,1.235,0.798,2.082 c0,2.981-1.814,3.637-3.543,3.829c0.279,0.24,0.527,0.713,0.527,1.437c0,1.037-0.01,1.874-0.01,2.129 c0,0.208,0.14,0.449,0.534,0.373c3.081-1.028,5.302-3.935,5.302-7.362C15.76,3.906,12.285,0.431,7.999,0.431z"/>
|
|
3
|
+
</svg>
|
|
@@ -1 +1,3 @@
|
|
|
1
|
-
<svg viewBox="0 0 16 16"
|
|
1
|
+
<svg viewBox="0 0 16 16">
|
|
2
|
+
<path fill="#828282" d="M15.969,3.058c-0.586,0.26-1.217,0.436-1.878,0.515c0.675-0.405,1.194-1.045,1.438-1.809c-0.632,0.375-1.332,0.647-2.076,0.793c-0.596-0.636-1.446-1.033-2.387-1.033c-1.806,0-3.27,1.464-3.27,3.27 c0,0.256,0.029,0.506,0.085,0.745C5.163,5.404,2.753,4.102,1.14,2.124C0.859,2.607,0.698,3.168,0.698,3.767 c0,1.134,0.577,2.135,1.455,2.722C1.616,6.472,1.112,6.325,0.671,6.08c0,0.014,0,0.027,0,0.041c0,1.584,1.127,2.906,2.623,3.206 C3.02,9.402,2.731,9.442,2.433,9.442c-0.211,0-0.416-0.021-0.615-0.059c0.416,1.299,1.624,2.245,3.055,2.271 c-1.119,0.877-2.529,1.4-4.061,1.4c-0.264,0-0.524-0.015-0.78-0.046c1.447,0.928,3.166,1.469,5.013,1.469 c6.015,0,9.304-4.983,9.304-9.304c0-0.142-0.003-0.283-0.009-0.423C14.976,4.29,15.531,3.714,15.969,3.058z"/>
|
|
3
|
+
</svg>
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
{% capture html %}
|
|
2
|
+
<ul>
|
|
3
|
+
{% if include.context == "/" %}
|
|
4
|
+
<li class="{% if page.url == "/" %}active{% endif %}">
|
|
5
|
+
<a href="{{ site.github.url }}/{{ site.title }}"</a>
|
|
6
|
+
</li>
|
|
7
|
+
{% endif %}
|
|
8
|
+
|
|
9
|
+
{% assign entries = site.pages | sort: "path" %}
|
|
10
|
+
{% for entry in entries %}
|
|
11
|
+
|
|
12
|
+
{% capture slug %}{{ entry.url | split: "/" | last }}{% endcapture %}
|
|
13
|
+
{% capture current %}{{ entry.url | remove: slug | remove: "//" | append: "/" }}{% endcapture %}
|
|
14
|
+
|
|
15
|
+
{% if current == include.context %}
|
|
16
|
+
<li class="{% if page.url contains entry.url %}active{% endif %}">
|
|
17
|
+
<a href="{{ site.github.url }}{{ entry.url }}">{{ entry.title }}</a>
|
|
18
|
+
{% include navigation.html context=entry.url %}
|
|
19
|
+
</li>
|
|
20
|
+
{% endif %}
|
|
21
|
+
|
|
22
|
+
{% endfor %}
|
|
23
|
+
</ul>
|
|
24
|
+
{% endcapture %}{{ html | strip_newlines | replace:' ','' | replace:' ','' | replace:' ',' ' }}
|
data/docs/_sass/_base.scss
CHANGED
|
@@ -4,8 +4,8 @@
|
|
|
4
4
|
body, h1, h2, h3, h4, h5, h6,
|
|
5
5
|
p, blockquote, pre, hr,
|
|
6
6
|
dl, dd, ol, ul, figure {
|
|
7
|
-
|
|
8
|
-
|
|
7
|
+
margin: 0;
|
|
8
|
+
padding: 0;
|
|
9
9
|
}
|
|
10
10
|
|
|
11
11
|
|
|
@@ -14,15 +14,15 @@ dl, dd, ol, ul, figure {
|
|
|
14
14
|
* Basic styling
|
|
15
15
|
*/
|
|
16
16
|
body {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
17
|
+
font: $base-font-weight #{$base-font-size}/#{$base-line-height} $base-font-family;
|
|
18
|
+
color: $text-color;
|
|
19
|
+
background-color: $background-color;
|
|
20
|
+
-webkit-text-size-adjust: 100%;
|
|
21
|
+
-webkit-font-feature-settings: "kern" 1;
|
|
22
|
+
-moz-font-feature-settings: "kern" 1;
|
|
23
|
+
-o-font-feature-settings: "kern" 1;
|
|
24
|
+
font-feature-settings: "kern" 1;
|
|
25
|
+
font-kerning: normal;
|
|
26
26
|
}
|
|
27
27
|
|
|
28
28
|
|
|
@@ -34,7 +34,7 @@ h1, h2, h3, h4, h5, h6,
|
|
|
34
34
|
p, blockquote, pre,
|
|
35
35
|
ul, ol, dl, figure,
|
|
36
36
|
%vertical-rhythm {
|
|
37
|
-
|
|
37
|
+
margin-bottom: $spacing-unit / 2;
|
|
38
38
|
}
|
|
39
39
|
|
|
40
40
|
|
|
@@ -43,8 +43,8 @@ ul, ol, dl, figure,
|
|
|
43
43
|
* Images
|
|
44
44
|
*/
|
|
45
45
|
img {
|
|
46
|
-
|
|
47
|
-
|
|
46
|
+
max-width: 100%;
|
|
47
|
+
vertical-align: middle;
|
|
48
48
|
}
|
|
49
49
|
|
|
50
50
|
|
|
@@ -53,11 +53,11 @@ img {
|
|
|
53
53
|
* Figures
|
|
54
54
|
*/
|
|
55
55
|
figure > img {
|
|
56
|
-
|
|
56
|
+
display: block;
|
|
57
57
|
}
|
|
58
58
|
|
|
59
59
|
figcaption {
|
|
60
|
-
|
|
60
|
+
font-size: $small-font-size;
|
|
61
61
|
}
|
|
62
62
|
|
|
63
63
|
|
|
@@ -66,14 +66,14 @@ figcaption {
|
|
|
66
66
|
* Lists
|
|
67
67
|
*/
|
|
68
68
|
ul, ol {
|
|
69
|
-
|
|
69
|
+
margin-left: $spacing-unit;
|
|
70
70
|
}
|
|
71
71
|
|
|
72
72
|
li {
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
73
|
+
> ul,
|
|
74
|
+
> ol {
|
|
75
|
+
margin-bottom: 0;
|
|
76
|
+
}
|
|
77
77
|
}
|
|
78
78
|
|
|
79
79
|
|
|
@@ -82,7 +82,7 @@ li {
|
|
|
82
82
|
* Headings
|
|
83
83
|
*/
|
|
84
84
|
h1, h2, h3, h4, h5, h6 {
|
|
85
|
-
|
|
85
|
+
font-weight: $base-font-weight;
|
|
86
86
|
}
|
|
87
87
|
|
|
88
88
|
|
|
@@ -91,17 +91,17 @@ h1, h2, h3, h4, h5, h6 {
|
|
|
91
91
|
* Links
|
|
92
92
|
*/
|
|
93
93
|
a {
|
|
94
|
-
|
|
95
|
-
|
|
94
|
+
color: $brand-color;
|
|
95
|
+
text-decoration: none;
|
|
96
96
|
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
97
|
+
&:visited {
|
|
98
|
+
color: darken($brand-color, 15%);
|
|
99
|
+
}
|
|
100
100
|
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
101
|
+
&:hover {
|
|
102
|
+
color: $text-color;
|
|
103
|
+
text-decoration: underline;
|
|
104
|
+
}
|
|
105
105
|
}
|
|
106
106
|
|
|
107
107
|
|
|
@@ -110,16 +110,16 @@ a {
|
|
|
110
110
|
* Blockquotes
|
|
111
111
|
*/
|
|
112
112
|
blockquote {
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
113
|
+
color: $grey-color;
|
|
114
|
+
border-left: 4px solid $grey-color-light;
|
|
115
|
+
padding-left: $spacing-unit / 2;
|
|
116
|
+
font-size: 18px;
|
|
117
|
+
letter-spacing: -1px;
|
|
118
|
+
font-style: italic;
|
|
119
119
|
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
120
|
+
> :last-child {
|
|
121
|
+
margin-bottom: 0;
|
|
122
|
+
}
|
|
123
123
|
}
|
|
124
124
|
|
|
125
125
|
|
|
@@ -129,25 +129,25 @@ blockquote {
|
|
|
129
129
|
*/
|
|
130
130
|
pre,
|
|
131
131
|
code {
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
132
|
+
font-size: 15px;
|
|
133
|
+
border: 1px solid $grey-color-light;
|
|
134
|
+
border-radius: 3px;
|
|
135
|
+
background-color: #eef;
|
|
136
136
|
}
|
|
137
137
|
|
|
138
138
|
code {
|
|
139
|
-
|
|
139
|
+
padding: 1px 5px;
|
|
140
140
|
}
|
|
141
141
|
|
|
142
142
|
pre {
|
|
143
|
-
|
|
144
|
-
|
|
143
|
+
padding: 8px 12px;
|
|
144
|
+
overflow-x: auto;
|
|
145
145
|
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
146
|
+
> code {
|
|
147
|
+
border: 0;
|
|
148
|
+
padding-right: 0;
|
|
149
|
+
padding-left: 0;
|
|
150
|
+
}
|
|
151
151
|
}
|
|
152
152
|
|
|
153
153
|
|
|
@@ -156,20 +156,20 @@ pre {
|
|
|
156
156
|
* Wrapper
|
|
157
157
|
*/
|
|
158
158
|
.wrapper {
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
159
|
+
max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit} * 2));
|
|
160
|
+
max-width: calc(#{$content-width} - (#{$spacing-unit} * 2));
|
|
161
|
+
margin-right: auto;
|
|
162
|
+
margin-left: auto;
|
|
163
|
+
padding-right: $spacing-unit;
|
|
164
|
+
padding-left: $spacing-unit;
|
|
165
|
+
@extend %clearfix;
|
|
166
|
+
|
|
167
|
+
@include media-query($on-laptop) {
|
|
168
|
+
max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit}));
|
|
169
|
+
max-width: calc(#{$content-width} - (#{$spacing-unit}));
|
|
170
|
+
padding-right: $spacing-unit / 2;
|
|
171
|
+
padding-left: $spacing-unit / 2;
|
|
172
|
+
}
|
|
173
173
|
}
|
|
174
174
|
|
|
175
175
|
|
|
@@ -179,11 +179,11 @@ pre {
|
|
|
179
179
|
*/
|
|
180
180
|
%clearfix {
|
|
181
181
|
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
182
|
+
&:after {
|
|
183
|
+
content: "";
|
|
184
|
+
display: table;
|
|
185
|
+
clear: both;
|
|
186
|
+
}
|
|
187
187
|
}
|
|
188
188
|
|
|
189
189
|
|
|
@@ -193,14 +193,14 @@ pre {
|
|
|
193
193
|
*/
|
|
194
194
|
.icon {
|
|
195
195
|
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
196
|
+
> svg {
|
|
197
|
+
display: inline-block;
|
|
198
|
+
width: 16px;
|
|
199
|
+
height: 16px;
|
|
200
|
+
vertical-align: middle;
|
|
201
201
|
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
}
|
|
202
|
+
path {
|
|
203
|
+
fill: $grey-color;
|
|
205
204
|
}
|
|
205
|
+
}
|
|
206
206
|
}
|