geomerative 1.1.0-java → 2.0.0-java

Sign up to get free protection for your applications and to get access to all the features.
Files changed (116) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +2 -1
  3. data/.mvn/extensions.xml +1 -1
  4. data/.mvn/wrapper/maven-wrapper.properties +1 -1
  5. data/CHANGELOG.md +3 -0
  6. data/COPYING.md +1 -1
  7. data/README.md +0 -1
  8. data/Rakefile +2 -15
  9. data/docs/_includes/header.html +6 -6
  10. data/docs/_includes/icon-github.svg +3 -1
  11. data/docs/_includes/icon-twitter.svg +3 -1
  12. data/docs/_includes/navigation.html +18 -18
  13. data/docs/_sass/_base.scss +79 -79
  14. data/docs/_sass/_layout.scss +137 -137
  15. data/docs/_sass/_syntax-highlighting.scss +64 -64
  16. data/docs/index.html +18 -18
  17. data/examples/data/bot1.svg +1 -1
  18. data/examples/data/lion.svg +156 -156
  19. data/examples/data/ruby.svg +1 -1
  20. data/geomerative.gemspec +1 -2
  21. data/lib/geomerative/version.rb +1 -1
  22. data/mvnw +234 -0
  23. data/mvnw.cmd +145 -0
  24. data/pom.rb +14 -13
  25. data/pom.xml +14 -13
  26. data/src/geomerative/FastRClip.java +2149 -2156
  27. data/src/geomerative/RClip.java +2237 -2539
  28. data/src/geomerative/RClosest.java +33 -31
  29. data/src/geomerative/RCommand.java +1750 -1758
  30. data/src/geomerative/RContour.java +290 -292
  31. data/src/geomerative/RFont.java +277 -246
  32. data/src/geomerative/RG.java +722 -727
  33. data/src/geomerative/RGeomElem.java +967 -960
  34. data/src/geomerative/RGroup.java +508 -467
  35. data/src/geomerative/RMatrix.java +304 -289
  36. data/src/geomerative/RMesh.java +241 -229
  37. data/src/geomerative/RPath.java +924 -925
  38. data/src/geomerative/RPoint.java +391 -391
  39. data/src/geomerative/RPolygon.java +998 -988
  40. data/src/geomerative/RRectangle.java +43 -52
  41. data/src/geomerative/RSVG.java +480 -516
  42. data/src/geomerative/RShape.java +1767 -1777
  43. data/src/geomerative/RStrip.java +173 -176
  44. data/src/geomerative/RStyle.java +197 -194
  45. data/src/org/apache/batik/svggen/font/Font.java +141 -142
  46. data/src/org/apache/batik/svggen/font/Glyph.java +102 -71
  47. data/src/org/apache/batik/svggen/font/Point.java +12 -12
  48. data/src/org/apache/batik/svggen/font/RandomAccessFileEmulator.java +14 -12
  49. data/src/org/apache/batik/svggen/font/table/ClassDef.java +12 -12
  50. data/src/org/apache/batik/svggen/font/table/ClassDefFormat1.java +27 -24
  51. data/src/org/apache/batik/svggen/font/table/ClassDefFormat2.java +20 -17
  52. data/src/org/apache/batik/svggen/font/table/CmapFormat.java +43 -43
  53. data/src/org/apache/batik/svggen/font/table/CmapFormat0.java +33 -26
  54. data/src/org/apache/batik/svggen/font/table/CmapFormat2.java +25 -20
  55. data/src/org/apache/batik/svggen/font/table/CmapFormat4.java +106 -96
  56. data/src/org/apache/batik/svggen/font/table/CmapFormat6.java +36 -32
  57. data/src/org/apache/batik/svggen/font/table/CmapIndexEntry.java +69 -49
  58. data/src/org/apache/batik/svggen/font/table/CmapTable.java +50 -50
  59. data/src/org/apache/batik/svggen/font/table/Coverage.java +19 -19
  60. data/src/org/apache/batik/svggen/font/table/CoverageFormat1.java +30 -27
  61. data/src/org/apache/batik/svggen/font/table/CoverageFormat2.java +26 -24
  62. data/src/org/apache/batik/svggen/font/table/CvtTable.java +16 -16
  63. data/src/org/apache/batik/svggen/font/table/Device.java +32 -32
  64. data/src/org/apache/batik/svggen/font/table/DirectoryEntry.java +39 -39
  65. data/src/org/apache/batik/svggen/font/table/Feature.java +26 -23
  66. data/src/org/apache/batik/svggen/font/table/FeatureList.java +37 -35
  67. data/src/org/apache/batik/svggen/font/table/FeatureRecord.java +22 -22
  68. data/src/org/apache/batik/svggen/font/table/FeatureTags.java +4 -3
  69. data/src/org/apache/batik/svggen/font/table/FpgmTable.java +9 -9
  70. data/src/org/apache/batik/svggen/font/table/GlyfCompositeComp.java +134 -132
  71. data/src/org/apache/batik/svggen/font/table/GlyfCompositeDescript.java +123 -122
  72. data/src/org/apache/batik/svggen/font/table/GlyfDescript.java +44 -44
  73. data/src/org/apache/batik/svggen/font/table/GlyfSimpleDescript.java +110 -109
  74. data/src/org/apache/batik/svggen/font/table/GlyfTable.java +46 -46
  75. data/src/org/apache/batik/svggen/font/table/GlyphDescription.java +25 -13
  76. data/src/org/apache/batik/svggen/font/table/GposTable.java +26 -23
  77. data/src/org/apache/batik/svggen/font/table/GsubTable.java +85 -82
  78. data/src/org/apache/batik/svggen/font/table/HeadTable.java +131 -131
  79. data/src/org/apache/batik/svggen/font/table/HheaTable.java +80 -80
  80. data/src/org/apache/batik/svggen/font/table/HmtxTable.java +50 -49
  81. data/src/org/apache/batik/svggen/font/table/KernSubtable.java +29 -27
  82. data/src/org/apache/batik/svggen/font/table/KernSubtableFormat0.java +35 -32
  83. data/src/org/apache/batik/svggen/font/table/KernSubtableFormat2.java +28 -26
  84. data/src/org/apache/batik/svggen/font/table/KernTable.java +36 -31
  85. data/src/org/apache/batik/svggen/font/table/KerningPair.java +27 -23
  86. data/src/org/apache/batik/svggen/font/table/LangSys.java +28 -26
  87. data/src/org/apache/batik/svggen/font/table/LangSysRecord.java +22 -22
  88. data/src/org/apache/batik/svggen/font/table/Ligature.java +24 -24
  89. data/src/org/apache/batik/svggen/font/table/LigatureSet.java +24 -24
  90. data/src/org/apache/batik/svggen/font/table/LigatureSubst.java +9 -9
  91. data/src/org/apache/batik/svggen/font/table/LigatureSubstFormat1.java +30 -30
  92. data/src/org/apache/batik/svggen/font/table/LocaTable.java +37 -37
  93. data/src/org/apache/batik/svggen/font/table/Lookup.java +41 -40
  94. data/src/org/apache/batik/svggen/font/table/LookupList.java +34 -34
  95. data/src/org/apache/batik/svggen/font/table/LookupSubtableFactory.java +7 -5
  96. data/src/org/apache/batik/svggen/font/table/MaxpTable.java +96 -96
  97. data/src/org/apache/batik/svggen/font/table/NameRecord.java +64 -65
  98. data/src/org/apache/batik/svggen/font/table/NameTable.java +33 -33
  99. data/src/org/apache/batik/svggen/font/table/Os2Table.java +196 -196
  100. data/src/org/apache/batik/svggen/font/table/Panose.java +14 -12
  101. data/src/org/apache/batik/svggen/font/table/PostTable.java +338 -338
  102. data/src/org/apache/batik/svggen/font/table/PrepTable.java +9 -9
  103. data/src/org/apache/batik/svggen/font/table/Program.java +15 -15
  104. data/src/org/apache/batik/svggen/font/table/RangeRecord.java +26 -25
  105. data/src/org/apache/batik/svggen/font/table/Script.java +38 -38
  106. data/src/org/apache/batik/svggen/font/table/ScriptList.java +42 -42
  107. data/src/org/apache/batik/svggen/font/table/ScriptRecord.java +22 -22
  108. data/src/org/apache/batik/svggen/font/table/ScriptTags.java +2 -1
  109. data/src/org/apache/batik/svggen/font/table/SingleSubst.java +15 -16
  110. data/src/org/apache/batik/svggen/font/table/SingleSubstFormat1.java +33 -33
  111. data/src/org/apache/batik/svggen/font/table/SingleSubstFormat2.java +32 -32
  112. data/src/org/apache/batik/svggen/font/table/Table.java +171 -170
  113. data/src/org/apache/batik/svggen/font/table/TableDirectory.java +55 -55
  114. data/src/org/apache/batik/svggen/font/table/TableFactory.java +92 -93
  115. metadata +10 -11
  116. data/.travis.yml +0 -9
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7049f939d3a7ad53e78332318b256d825ae16aa1a035d11314dcf225249ae3ef
4
- data.tar.gz: 04ff4522150b547ef03fdb17b1d6842aa793c20d525b9b289a4b76e261f56701
3
+ metadata.gz: 824ce3125f29427f12f918db67abaf3dfb5a5fa74655a68f6578433008a0d920
4
+ data.tar.gz: abe6dd8f491f622abb0f28cca3cdbf64376d1d004d32ba78e038fd230a1daa21
5
5
  SHA512:
6
- metadata.gz: e1421d87cfa98aa140aaf95a2094239b7f77a040c040c6f47f14c5c488a6be990f19f74288840165ec67b54cf0b9f2b8306db32e9524ab32b55cc3644a24fc82
7
- data.tar.gz: 3073fc69e6df96d01c8fb46347e0524e11eab3509dde45b70a070a49d556ee4412029ab330f8c917ed6448d49f6fa6b202baaef6564fdb9508fbdc567f5650a8
6
+ metadata.gz: 4e795f9ab417fcc3c8411d7a4c73ad685c090894ed78c3fe7641cb0c99ff39232bb51b7b3f39e2341852cffd1f2ca3a06717ef5451dfef8cace2d3d45d598db3
7
+ data.tar.gz: db4b1c642d340e5776d40f2cb85d1d11593eb713a3021be8fa47bb7c5d1f416fa491533f1cc35b149ec6fb10cff34184e24cd84246c168c59ef0c36b32669adb
data/.gitignore CHANGED
@@ -13,4 +13,5 @@ MANIFEST.MF
13
13
  hs_err_pid*
14
14
  target
15
15
  *~
16
- /nbproject/
16
+ /nbproject/
17
+ nb-configuration.xml
@@ -3,6 +3,6 @@
3
3
  <extension>
4
4
  <groupId>io.takari.polyglot</groupId>
5
5
  <artifactId>polyglot-ruby</artifactId>
6
- <version>0.2.1</version>
6
+ <version>0.4.4</version>
7
7
  </extension>
8
8
  </extensions>
@@ -1 +1 @@
1
- distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.3/apache-maven-3.3.3-bin.zip
1
+ distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip
@@ -1,3 +1,6 @@
1
+ ### version-2.0.0
2
+ For jdk11+, for JRubyArt-2.4+, propane-3.6+ and PiCrate-2.1+, remove dependency on PApplet instance method readBytes(String).
3
+
1
4
  ### version-1.1
2
5
  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).
3
6
 
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-2017 Martin Prout
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,7 +1,6 @@
1
1
  # geomerative gem
2
2
 
3
3
  [![Gem Version](https://badge.fury.io/rb/geomerative.svg)](https://badge.fury.io/rb/geomerative)
4
- ![travis status](https://travis-ci.org/ruby-processing/geomerativegem.svg)
5
4
 
6
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.
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: [:init, :compile, :gem]
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 "gem build geomerative.gemspec"
8
+ sh "jgem build geomerative.gemspec"
22
9
  end
23
10
 
24
11
  desc 'Compile'
@@ -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
- <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"/>
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
- {% if my_page.title %}
19
- <a class="page-link" href="{{ my_page.url | prepend: site.github.url }}">{{ my_page.title }}</a>
20
- {% endif %}
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"><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"/></svg>
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"><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"/></svg>
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>
@@ -1,24 +1,24 @@
1
1
  {% capture html %}
2
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 %}
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
8
 
9
- {% assign entries = site.pages | sort: "path" %}
10
- {% for entry in entries %}
9
+ {% assign entries = site.pages | sort: "path" %}
10
+ {% for entry in entries %}
11
11
 
12
- {% capture slug %}{{ entry.url | split: "/" | last }}{% endcapture %}
13
- {% capture current %}{{ entry.url | remove: slug | remove: "//" | append: "/" }}{% endcapture %}
12
+ {% capture slug %}{{ entry.url | split: "/" | last }}{% endcapture %}
13
+ {% capture current %}{{ entry.url | remove: slug | remove: "//" | append: "/" }}{% endcapture %}
14
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 %}
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
21
 
22
- {% endfor %}
23
- </ul>
24
- {% endcapture %}{{ html | strip_newlines | replace:' ','' | replace:' ','' | replace:' ',' ' }}
22
+ {% endfor %}
23
+ </ul>
24
+ {% endcapture %}{{ html | strip_newlines | replace:' ','' | replace:' ','' | replace:' ',' ' }}
@@ -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
- margin: 0;
8
- padding: 0;
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
- 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;
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
- margin-bottom: $spacing-unit / 2;
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
- max-width: 100%;
47
- vertical-align: middle;
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
- display: block;
56
+ display: block;
57
57
  }
58
58
 
59
59
  figcaption {
60
- font-size: $small-font-size;
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
- margin-left: $spacing-unit;
69
+ margin-left: $spacing-unit;
70
70
  }
71
71
 
72
72
  li {
73
- > ul,
74
- > ol {
75
- margin-bottom: 0;
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
- font-weight: $base-font-weight;
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
- color: $brand-color;
95
- text-decoration: none;
94
+ color: $brand-color;
95
+ text-decoration: none;
96
96
 
97
- &:visited {
98
- color: darken($brand-color, 15%);
99
- }
97
+ &:visited {
98
+ color: darken($brand-color, 15%);
99
+ }
100
100
 
101
- &:hover {
102
- color: $text-color;
103
- text-decoration: underline;
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
- 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;
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
- > :last-child {
121
- margin-bottom: 0;
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
- font-size: 15px;
133
- border: 1px solid $grey-color-light;
134
- border-radius: 3px;
135
- background-color: #eef;
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
- padding: 1px 5px;
139
+ padding: 1px 5px;
140
140
  }
141
141
 
142
142
  pre {
143
- padding: 8px 12px;
144
- overflow-x: auto;
143
+ padding: 8px 12px;
144
+ overflow-x: auto;
145
145
 
146
- > code {
147
- border: 0;
148
- padding-right: 0;
149
- padding-left: 0;
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
- 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
- }
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
- &:after {
183
- content: "";
184
- display: table;
185
- clear: both;
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
- > svg {
197
- display: inline-block;
198
- width: 16px;
199
- height: 16px;
200
- vertical-align: middle;
196
+ > svg {
197
+ display: inline-block;
198
+ width: 16px;
199
+ height: 16px;
200
+ vertical-align: middle;
201
201
 
202
- path {
203
- fill: $grey-color;
204
- }
202
+ path {
203
+ fill: $grey-color;
205
204
  }
205
+ }
206
206
  }
@@ -2,94 +2,94 @@
2
2
  * Site header
3
3
  */
4
4
  .site-header {
5
- border-top: 5px solid $grey-color-dark;
6
- border-bottom: 1px solid $grey-color-light;
7
- min-height: 56px;
5
+ border-top: 5px solid $grey-color-dark;
6
+ border-bottom: 1px solid $grey-color-light;
7
+ min-height: 56px;
8
8
 
9
- // Positioning context for the mobile navigation icon
10
- position: relative;
9
+ // Positioning context for the mobile navigation icon
10
+ position: relative;
11
11
  }
12
12
 
13
13
  .site-title {
14
- font-size: 26px;
15
- font-weight: 300;
16
- line-height: 56px;
17
- letter-spacing: -1px;
18
- margin-bottom: 0;
19
- float: left;
20
-
21
- &,
22
- &:visited {
23
- color: $grey-color-dark;
24
- }
14
+ font-size: 26px;
15
+ font-weight: 300;
16
+ line-height: 56px;
17
+ letter-spacing: -1px;
18
+ margin-bottom: 0;
19
+ float: left;
20
+
21
+ &,
22
+ &:visited {
23
+ color: $grey-color-dark;
24
+ }
25
25
  }
26
26
 
27
27
  .site-nav {
28
- float: right;
29
- line-height: 56px;
28
+ float: right;
29
+ line-height: 56px;
30
30
 
31
- .menu-icon {
32
- display: none;
33
- }
31
+ .menu-icon {
32
+ display: none;
33
+ }
34
34
 
35
- .page-link {
36
- color: $text-color;
37
- line-height: $base-line-height;
35
+ .page-link {
36
+ color: $text-color;
37
+ line-height: $base-line-height;
38
38
 
39
- // Gaps between nav items, but not on the last one
40
- &:not(:last-child) {
41
- margin-right: 20px;
42
- }
39
+ // Gaps between nav items, but not on the last one
40
+ &:not(:last-child) {
41
+ margin-right: 20px;
43
42
  }
43
+ }
44
44
 
45
- @include media-query($on-palm) {
46
- position: absolute;
47
- top: 9px;
48
- right: $spacing-unit / 2;
49
- background-color: $background-color;
50
- border: 1px solid $grey-color-light;
51
- border-radius: 5px;
52
- text-align: right;
53
-
54
- .menu-icon {
55
- display: block;
56
- float: right;
57
- width: 36px;
58
- height: 26px;
59
- line-height: 0;
60
- padding-top: 10px;
61
- text-align: center;
62
-
63
- > svg {
64
- width: 18px;
65
- height: 15px;
66
-
67
- path {
68
- fill: $grey-color-dark;
69
- }
70
- }
71
- }
45
+ @include media-query($on-palm) {
46
+ position: absolute;
47
+ top: 9px;
48
+ right: $spacing-unit / 2;
49
+ background-color: $background-color;
50
+ border: 1px solid $grey-color-light;
51
+ border-radius: 5px;
52
+ text-align: right;
72
53
 
73
- .trigger {
74
- clear: both;
75
- display: none;
54
+ .menu-icon {
55
+ display: block;
56
+ float: right;
57
+ width: 36px;
58
+ height: 26px;
59
+ line-height: 0;
60
+ padding-top: 10px;
61
+ text-align: center;
62
+
63
+ > svg {
64
+ width: 18px;
65
+ height: 15px;
66
+
67
+ path {
68
+ fill: $grey-color-dark;
76
69
  }
70
+ }
71
+ }
77
72
 
78
- &:hover .trigger {
79
- display: block;
80
- padding-bottom: 5px;
81
- }
73
+ .trigger {
74
+ clear: both;
75
+ display: none;
76
+ }
77
+
78
+ &:hover .trigger {
79
+ display: block;
80
+ padding-bottom: 5px;
81
+ }
82
82
 
83
- .page-link {
84
- display: block;
85
- padding: 5px 10px;
83
+ .page-link {
84
+ display: block;
85
+ padding: 5px 10px;
86
86
 
87
- &:not(:last-child) {
88
- margin-right: 0;
89
- }
90
- margin-left: 20px;
91
- }
87
+ &:not(:last-child) {
88
+ margin-right: 0;
89
+ }
90
+ margin-left: 20px;
92
91
  }
92
+ }
93
93
  }
94
94
 
95
95
 
@@ -98,68 +98,68 @@
98
98
  * Site footer
99
99
  */
100
100
  .site-footer {
101
- border-top: 1px solid $grey-color-light;
102
- padding: $spacing-unit 0;
101
+ border-top: 1px solid $grey-color-light;
102
+ padding: $spacing-unit 0;
103
103
  }
104
104
 
105
105
  .footer-heading {
106
- font-size: 18px;
107
- margin-bottom: $spacing-unit / 2;
106
+ font-size: 18px;
107
+ margin-bottom: $spacing-unit / 2;
108
108
  }
109
109
 
110
110
  .contact-list,
111
111
  .social-media-list {
112
- list-style: none;
113
- margin-left: 0;
112
+ list-style: none;
113
+ margin-left: 0;
114
114
  }
115
115
 
116
116
  .footer-col-wrapper {
117
- font-size: 15px;
118
- color: $grey-color;
119
- margin-left: -$spacing-unit / 2;
120
- @extend %clearfix;
117
+ font-size: 15px;
118
+ color: $grey-color;
119
+ margin-left: -$spacing-unit / 2;
120
+ @extend %clearfix;
121
121
  }
122
122
 
123
123
  .footer-col {
124
- float: left;
125
- margin-bottom: $spacing-unit / 2;
126
- padding-left: $spacing-unit / 2;
124
+ float: left;
125
+ margin-bottom: $spacing-unit / 2;
126
+ padding-left: $spacing-unit / 2;
127
127
  }
128
128
 
129
129
  .footer-col-1 {
130
- width: -webkit-calc(35% - (#{$spacing-unit} / 2));
131
- width: calc(35% - (#{$spacing-unit} / 2));
130
+ width: -webkit-calc(35% - (#{$spacing-unit} / 2));
131
+ width: calc(35% - (#{$spacing-unit} / 2));
132
132
  }
133
133
 
134
134
  .footer-col-2 {
135
- width: -webkit-calc(20% - (#{$spacing-unit} / 2));
136
- width: calc(20% - (#{$spacing-unit} / 2));
135
+ width: -webkit-calc(20% - (#{$spacing-unit} / 2));
136
+ width: calc(20% - (#{$spacing-unit} / 2));
137
137
  }
138
138
 
139
139
  .footer-col-3 {
140
- width: -webkit-calc(45% - (#{$spacing-unit} / 2));
141
- width: calc(45% - (#{$spacing-unit} / 2));
140
+ width: -webkit-calc(45% - (#{$spacing-unit} / 2));
141
+ width: calc(45% - (#{$spacing-unit} / 2));
142
142
  }
143
143
 
144
144
  @include media-query($on-laptop) {
145
- .footer-col-1,
146
- .footer-col-2 {
147
- width: -webkit-calc(50% - (#{$spacing-unit} / 2));
148
- width: calc(50% - (#{$spacing-unit} / 2));
149
- }
145
+ .footer-col-1,
146
+ .footer-col-2 {
147
+ width: -webkit-calc(50% - (#{$spacing-unit} / 2));
148
+ width: calc(50% - (#{$spacing-unit} / 2));
149
+ }
150
150
 
151
- .footer-col-3 {
152
- width: -webkit-calc(100% - (#{$spacing-unit} / 2));
153
- width: calc(100% - (#{$spacing-unit} / 2));
154
- }
151
+ .footer-col-3 {
152
+ width: -webkit-calc(100% - (#{$spacing-unit} / 2));
153
+ width: calc(100% - (#{$spacing-unit} / 2));
154
+ }
155
155
  }
156
156
 
157
157
  @include media-query($on-palm) {
158
- .footer-col {
159
- float: none;
160
- width: -webkit-calc(100% - (#{$spacing-unit} / 2));
161
- width: calc(100% - (#{$spacing-unit} / 2));
162
- }
158
+ .footer-col {
159
+ float: none;
160
+ width: -webkit-calc(100% - (#{$spacing-unit} / 2));
161
+ width: calc(100% - (#{$spacing-unit} / 2));
162
+ }
163
163
  }
164
164
 
165
165
 
@@ -168,30 +168,30 @@
168
168
  * Page content
169
169
  */
170
170
  .page-content {
171
- padding: $spacing-unit 0;
171
+ padding: $spacing-unit 0;
172
172
  }
173
173
 
174
174
  .page-heading {
175
- font-size: 20px;
175
+ font-size: 20px;
176
176
  }
177
177
 
178
178
  .post-list {
179
- margin-left: 0;
180
- list-style: none;
179
+ margin-left: 0;
180
+ list-style: none;
181
181
 
182
- > li {
183
- margin-bottom: $spacing-unit;
184
- }
182
+ > li {
183
+ margin-bottom: $spacing-unit;
184
+ }
185
185
  }
186
186
 
187
187
  .post-meta {
188
- font-size: $small-font-size;
189
- color: $grey-color;
188
+ font-size: $small-font-size;
189
+ color: $grey-color;
190
190
  }
191
191
 
192
192
  .post-link {
193
- display: block;
194
- font-size: 24px;
193
+ display: block;
194
+ font-size: 24px;
195
195
  }
196
196
 
197
197
 
@@ -200,43 +200,43 @@
200
200
  * Posts
201
201
  */
202
202
  .post-header {
203
- margin-bottom: $spacing-unit;
203
+ margin-bottom: $spacing-unit;
204
204
  }
205
205
 
206
206
  .post-title {
207
- font-size: 42px;
208
- letter-spacing: -1px;
209
- line-height: 1;
207
+ font-size: 42px;
208
+ letter-spacing: -1px;
209
+ line-height: 1;
210
210
 
211
- @include media-query($on-laptop) {
212
- font-size: 36px;
213
- }
211
+ @include media-query($on-laptop) {
212
+ font-size: 36px;
213
+ }
214
214
  }
215
215
 
216
216
  .post-content {
217
- margin-bottom: $spacing-unit;
217
+ margin-bottom: $spacing-unit;
218
218
 
219
- h2 {
220
- font-size: 32px;
219
+ h2 {
220
+ font-size: 32px;
221
221
 
222
- @include media-query($on-laptop) {
223
- font-size: 28px;
224
- }
222
+ @include media-query($on-laptop) {
223
+ font-size: 28px;
225
224
  }
225
+ }
226
226
 
227
- h3 {
228
- font-size: 26px;
227
+ h3 {
228
+ font-size: 26px;
229
229
 
230
- @include media-query($on-laptop) {
231
- font-size: 22px;
232
- }
230
+ @include media-query($on-laptop) {
231
+ font-size: 22px;
233
232
  }
233
+ }
234
234
 
235
- h4 {
236
- font-size: 20px;
235
+ h4 {
236
+ font-size: 20px;
237
237
 
238
- @include media-query($on-laptop) {
239
- font-size: 18px;
240
- }
238
+ @include media-query($on-laptop) {
239
+ font-size: 18px;
241
240
  }
241
+ }
242
242
  }