jazzy 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a743a1183b2ea0e4e08000c6bec4e7dc31550320
-  data.tar.gz: 963b1c2d42300f2e7014569e7e11eaf9b6211745
+  metadata.gz: 6e5a10f6a6e2ae160d56aacfb558c9494dbcb63c
+  data.tar.gz: b1476b977cc1e71e2b508263b5c750f368ed34fb
 SHA512:
-  metadata.gz: c0f647e4bb2bcee1ce46463f3d73a1df6b09f62ef752a9fa10ef36b665e2a53a68fee1e7b41acd5bc07bd147c0274882213b97d6bdff1ee9bbd1acc1e3ba105d
-  data.tar.gz: 8eacf77a65ffa52f47e40ca0a9e5970cfae1ff78431ceedf97393c70f643e4bdb2deb9a67dbc3a61e899902bbd0473983fde823c4a9b523cb88d6a91d363d367
+  metadata.gz: ae051cb030b903b460907f8cc5dd041f7c6bae179ff3cc8f7ec14271d0c44cfb80b7e99734c866f2d138d6cb0907fe59c8ee6e12251245b960ead1a5089b9f73
+  data.tar.gz: 370f5f57284c90032514209c47c2191b85ccd890d86ace267669bea4a559c23921985a6a20cd0b259dcc484e0d22d82075720037dd5c9b2e01bfac99d6bb7413

data/.rubocop.yml

@@ -1,6 +1,3 @@
-inherit_from:
- - .rubocop_todo.yml
-
 AllCops:
   Include:
     - ./Rakefile
@@ -14,6 +11,10 @@ Documentation:
 
 #- Jazzy -----------------------------------------------------------------#
 
+# 20 lines is more reasonable than rubocop's default of 10
+Metrics/MethodLength:
+  Max: 20
+
 # We adopted raise instead of fail.
 SignalException:
   EnforcedStyle: only_raise

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    jazzy (0.0.13)
+    jazzy (0.0.14)
       activesupport (~> 4.1)
       mustache (~> 0.99)
       nokogiri (~> 1.6)
       redcarpet (~> 3.2)
+      sass (~> 3.4)
 
 GEM
   remote: http://rubygems.org/
@@ -28,7 +29,7 @@ GEM
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     diffy (3.0.7)
-    i18n (0.6.9)
+    i18n (0.6.11)
     json (1.8.1)
     metaclass (0.0.4)
     mini_portile (0.6.1)
@@ -38,7 +39,7 @@ GEM
     mocha-on-bacon (0.2.2)
       mocha (>= 0.13.0)
     mustache (0.99.7)
-    nokogiri (1.6.4)
+    nokogiri (1.6.4.1)
       mini_portile (~> 0.6.0)
     parser (2.2.0.pre.5)
       ast (>= 1.1, < 3.0)
@@ -57,6 +58,7 @@ GEM
       ruby-progressbar (~> 1.4)
     ruby-progressbar (1.6.0)
     safe_yaml (1.0.4)
+    sass (3.4.7)
     slop (3.6.0)
     thread_safe (0.3.4)
     tzinfo (1.2.2)

data/Rakefile

@@ -48,8 +48,10 @@ begin
 
     # Remove files not used for the comparison
     # To keep the git diff clean
-    files_to_delete = FileList['spec/integration_specs/*/after/{*,.git,.gitignore}']
-      .exclude('spec/integration_specs/*/after/docs', 'spec/integration_specs/*/after/execution_output.txt')
+    files_glob = 'spec/integration_specs/*/after/{*,.git,.gitignore}'
+    files_to_delete = FileList[files_glob]
+      .exclude('spec/integration_specs/*/after/docs',
+               'spec/integration_specs/*/after/execution_output.txt')
     files_to_delete.each do |file_to_delete|
       sh "rm -rf '#{file_to_delete}'"
     end

data/jazzy.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'activesupport', '~> 4.1'
   spec.add_runtime_dependency 'redcarpet', '~> 3.2'
   spec.add_runtime_dependency 'nokogiri', '~> 1.6'
+  spec.add_runtime_dependency 'sass', '~> 3.4'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.3'

data/lib/jazzy/assets/css/{jazzy.css → jazzy.css.scss}

@@ -1,3 +1,5 @@
+$doc_coverage_color: #999;
+
 html, body, div, span, h1, h3, h4, p, a, code, em, img, ul, li, table, tbody, tr, td {
   background: transparent;
   border: 0;
@@ -8,48 +10,43 @@ html, body, div, span, h1, h3, h4, p, a, code, em, img, ul, li, table, tbody, tr
   vertical-align: baseline;
 }
 
-#reference .x-instance-method.Swift {
-  margin-left: 15px;
-}
-
-#reference .chapter {
-  overflow-x: hidden;
-  border-top: 0;
-  border-left: 1px solid rgba(233, 233, 233, 1);
-  border-right: 1px solid rgba(233, 233, 233, 1);
-  border-bottom: 1px solid rgba(233, 233, 233, 1);
-}
-
-#reference .nav-chapters {
-  height: 100%;
-}
-
-#reference .part-name {
-  color: #000;
-  cursor: default;
-  padding: 15px 15px 15px 20px;
-  min-height: 61px;
-}
-
-#reference .part-name.tasks {
-  background: #fff;
-  overflow: auto;
-}
-
-#reference .book-parts a {
-  display: initial;
-  margin-left: 0;
-}
-
-#reference .nav-chapters li {
-  color: rgba(128, 128, 128, 1);
-  margin-left: 12px;
-  padding-left: 10px;
-  text-indent: -10px;
-}
-
-#reference .chapter-name {
-  margin-top: 21px;
+#reference {
+  .x-instance-method.Swift {
+    margin-left: 15px;
+  }
+  .chapter {
+    overflow-x: hidden;
+    border-top: 0;
+    border-left: 1px solid rgba(233, 233, 233, 1);
+    border-right: 1px solid rgba(233, 233, 233, 1);
+    border-bottom: 1px solid rgba(233, 233, 233, 1);
+  }
+  .nav-chapters {
+    height: 100%;
+  }
+  .part-name {
+    color: #000;
+    cursor: default;
+    padding: 15px 15px 15px 20px;
+    min-height: 61px;
+    &.tasks {
+      background: #fff;
+      overflow: auto;
+    }
+  }
+  .book-parts a {
+    display: initial;
+    margin-left: 0;
+  }
+  .nav-chapters li {
+    color: rgba(128, 128, 128, 1);
+    margin-left: 12px;
+    padding-left: 10px;
+    text-indent: -10px;
+  }
+  .chapter-name {
+    margin-top: 21px;
+  }
 }
 
 .rubber-band-gap {
@@ -62,168 +59,145 @@ html, body, div, span, h1, h3, h4, p, a, code, em, img, ul, li, table, tbody, tr
   margin: 0 0 0 247px;
 }
 
-#reference .task-name-container {
-  background: #fff;
-  left: -25px;
-  margin-bottom: 0;
-  padding: 35px 25px 0;
-  position: relative;
-  width: 100%;
-}
-
-#reference .section-name {
-  cursor: pointer;
-  display: inline-block;
-}
-
-#reference .section .section {
-  margin-top: 0;
-}
-
-#reference .task-group-section {
-  padding: 1px 25px 0;
-}
-
-#reference .symbol {
-  background: #fff;
-  left: -25px;
-  list-style-type: none;
-  padding: 13px 25px 0;
-  position: relative;
-  width: 100%;
-}
-
-#reference .task-group-term {
-  font-size: 1.4em;
-  word-break: break-all;
-}
-
-#reference .task-group-term>code {
-  display: inline-block;
-}
-
-#reference .pointy-thing-container {
-  background: #fff;
-  border-bottom: 1px solid rgba(233, 233, 233, 1);
-  left: -25px;
-  padding-left: 25px;
-  padding-right: 25px;
-  padding-bottom: 13px;
-  position: relative;
-  width: 100%;
-}
-
-#reference .pointy-thing {
-  background: rgba(249, 249, 249, 1);
-  border-left: 1px solid rgba(233, 233, 233, 1);
-  border-top: 1px solid rgba(233, 233, 233, 1);
-  height: 12px;
-  left: 21px;
-  top: -7px;
-  -webkit-transform: rotate(45deg);
-  -moz-transform: rotate(45deg);
-  -o-transform: rotate(45deg);
-  transform: rotate(45deg);
-  position: absolute;
-  width: 12px;
-}
-
-#reference .height-container {
-  display: none;
-  left: -25px;
-  padding: 0 25px;
-  position: relative;
-  width: 100%;
-  overflow: hidden;
-}
-
-#reference .height-container .section {
-  background: rgba(249, 249, 249, 1);
-  border-bottom: 1px solid rgba(233, 233, 233, 1);
-  left: -25px;
-  margin: 0;
-  padding: 13px 25px 0;
-  position: relative;
-  width: 100%;
-}
-
-#reference .height-container .section h4 {
-  font-size: 13px;
-  line-height: 1.5;
-  margin-top: 21px;
-}
-
-#reference .section .declaration {
-  margin-top: 21px;
-}
-
-#reference .section .declaration code {
-  color: rgba(128, 128, 128, 1);
-  margin-bottom: 15px;
-  padding-bottom: 6px;
-}
-
-#reference .declaration div .para {
-  margin-bottom: 0;
-}
-
-#reference .task-group .item .graybox {
-  margin: 5px 0 26px;
-}
-
-#reference .symbol .graybox .para:last-of-type {
-  margin-bottom: 0;
-  padding-bottom: 0;
-}
-
-#reference .parameters .graybox tr td:first-of-type {
-  text-align: right;
-  padding: 7px;
-  vertical-align: top;
-  word-break: normal;
-  width: 40px;
-}
-
-#reference em.term,
-#reference em.parameter-name {
-  color: rgba(65, 65, 65, 1);
-  font-size: 12px;
-  line-height: 1.5;
-}
-
-#reference .height-container .section>div:last-of-type {
-  margin-bottom: 15px;
-}
-
-#reference #footer {
-  width: 614px;
-  z-index: 1;
-}
-
-#reference .item .para {
-  padding-bottom: 0;
-  margin: 0 0 15px;
-}
-
-#reference a[name] {
-  padding-top: 112px;
-  margin: -112px 0 0;
-}
-
-#reference .height-container td {
-  max-width: inherit;
-}
-
-#reference .declaration .n a {
-  color: inherit;
-}
-
-#reference .declaration .n a:hover {
-  border-bottom: 1px solid;
-}
-
-#reference .copyright {
-  margin: 10px 0;
+#reference {
+  .task-name-container {
+    background: #fff;
+    left: -25px;
+    margin-bottom: 0;
+    padding: 35px 25px 0;
+    position: relative;
+    width: 100%;
+  }
+  .section-name {
+    cursor: pointer;
+    display: inline-block;
+  }
+  .section .section {
+    margin-top: 0;
+  }
+  .task-group-section {
+    padding: 1px 25px 0;
+  }
+  .symbol {
+    background: #fff;
+    left: -25px;
+    list-style-type: none;
+    padding: 13px 25px 0;
+    position: relative;
+    width: 100%;
+  }
+  .task-group-term {
+    font-size: 1.4em;
+    word-break: break-all;
+    > code {
+      display: inline-block;
+    }
+  }
+  .pointy-thing-container {
+    background: #fff;
+    border-bottom: 1px solid rgba(233, 233, 233, 1);
+    left: -25px;
+    padding-left: 25px;
+    padding-right: 25px;
+    padding-bottom: 13px;
+    position: relative;
+    width: 100%;
+  }
+  .pointy-thing {
+    background: rgba(249, 249, 249, 1);
+    border-left: 1px solid rgba(233, 233, 233, 1);
+    border-top: 1px solid rgba(233, 233, 233, 1);
+    height: 12px;
+    left: 21px;
+    top: -7px;
+    -webkit-transform: rotate(45deg);
+    -moz-transform: rotate(45deg);
+    -o-transform: rotate(45deg);
+    transform: rotate(45deg);
+    position: absolute;
+    width: 12px;
+  }
+  .height-container {
+    display: none;
+    left: -25px;
+    padding: 0 25px;
+    position: relative;
+    width: 100%;
+    overflow: hidden;
+    .section {
+      background: rgba(249, 249, 249, 1);
+      border-bottom: 1px solid rgba(233, 233, 233, 1);
+      left: -25px;
+      margin: 0;
+      padding: 13px 25px 0;
+      position: relative;
+      width: 100%;
+      h4 {
+        font-size: 13px;
+        line-height: 1.5;
+        margin-top: 21px;
+      }
+    }
+  }
+  .section .declaration {
+    margin-top: 21px;
+    code {
+      color: rgba(128, 128, 128, 1);
+      margin-bottom: 15px;
+      padding-bottom: 6px;
+    }
+  }
+  .declaration div .para {
+    margin-bottom: 0;
+  }
+  .task-group .item .graybox {
+    margin: 5px 0 26px;
+  }
+  .symbol .graybox .para:last-of-type {
+    margin-bottom: 0;
+    padding-bottom: 0;
+  }
+  .parameters .graybox tr td:first-of-type {
+    text-align: right;
+    padding: 7px;
+    vertical-align: top;
+    word-break: normal;
+    width: 40px;
+  }
+  em {
+    &.term, &.parameter-name {
+      color: rgba(65, 65, 65, 1);
+      font-size: 12px;
+      line-height: 1.5;
+    }
+  }
+  .height-container .section > div:last-of-type {
+    margin-bottom: 15px;
+  }
+  #footer {
+    width: 614px;
+    z-index: 1;
+  }
+  .item .para {
+    padding-bottom: 0;
+    margin: 0 0 15px;
+  }
+  a[name] {
+    padding-top: 112px;
+    margin: -112px 0 0;
+  }
+  .height-container td {
+    max-width: inherit;
+  }
+  .declaration .n a {
+    color: inherit;
+    &:hover {
+      border-bottom: 1px solid;
+    }
+  }
+  .copyright {
+    margin: 10px 0;
+  }
 }
 
 .nav-chapters {
@@ -277,7 +251,7 @@ a[name] {
   background-color: #fff;
   border: 1px solid rgba(233, 233, 233, 1);
   border-top: 0;
-  box-shadow: 0 0 1px rgba(0, 0, 0, .07);
+  box-shadow: 0 0 1px rgba(0, 0, 0, 0.07);
   display: block;
   margin-left: 246px;
   min-height: calc(100% - 173px);
@@ -301,16 +275,15 @@ a[name] {
 
 .section {
   padding: 15px 25px 0px;
-}
-
-.section .section {
-  margin: 30px 0 0;
-  padding: 0;
+  .section {
+    margin: 30px 0 0;
+    padding: 0;
+  }
 }
 
 header {
   background-color: rgba(65, 65, 65, 1);
-  box-shadow: 0 1px 1px rgba(0, 0, 0, .07);
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.07);
   color: #fff;
   height: 25px;
   letter-spacing: .05em;
@@ -326,11 +299,11 @@ header {
   padding-top: 6px;
   vertical-align: middle;
   float: left;
-}
-
-.header-text a {
-  color: #fff;
-  text-decoration: none;
+  color: $doc_coverage_color;
+  a {
+    color: #fff;
+    text-decoration: none;
+  }
 }
 
 #header-icon {
@@ -433,7 +406,7 @@ h3.section-name:before {
   border-left: 1px solid rgba(233, 233, 233, 1);
   border-right: 1px solid rgba(233, 233, 233, 1);
   bottom: 0;
-  box-shadow: 0 0 1px rgba(0, 0, 0, .07);
+  box-shadow: 0 0 1px rgba(0, 0, 0, 0.07);
   overflow: auto;
   -webkit-overflow-scrolling: touch;
   position: fixed;
@@ -508,15 +481,11 @@ h3.section-name:before {
 div.Swift {
   padding: 4px 0 2px 10px;
   margin: 10px 0 21px;
-}
-
-div.Swift {
   border-left: 5px solid rgba(205, 233, 244, 1);
-}
-
-div.Swift .aside-title {
-  color: rgba(75, 138, 251, 1);
-  -webkit-user-select: none;
+  .aside-title {
+    color: rgba(75, 138, 251, 1);
+    -webkit-user-select: none;
+  }
 }
 
 #footer {
@@ -536,12 +505,11 @@ div.Swift .aside-title {
   margin: 20px 0 36px;
   text-align: left;
   width: 100%;
-}
-
-.graybox p {
-  margin: 0;
-  word-break: break-word;
-  min-width: 50px;
+  p {
+    margin: 0;
+    word-break: break-word;
+    min-width: 50px;
+  }
 }
 
 td {