Permalink
Browse files

Merge branch 'master' of github.com:RubySchools/social_network

  • Loading branch information...
2 parents 981a8aa + 3760083 commit ed3d39a8eed32251c256e3b28dc224b5f671f690 @strix3000 strix3000 committed Feb 28, 2012
Showing with 3,254 additions and 1,557 deletions.
  1. +1 −1 Gemfile
  2. +65 −43 Gemfile.lock
  3. +0 −97 app/assets/stylesheets/blueprint/plugins/buttons/screen.css
  4. +0 −71 app/assets/stylesheets/blueprint/plugins/fancy-type/screen.css
  5. +0 −42 app/assets/stylesheets/blueprint/plugins/link-icons/screen.css
  6. +0 −110 app/assets/stylesheets/blueprint/plugins/rtl/screen.css
  7. +0 −82 app/assets/stylesheets/blueprint/src/forms.css
  8. +0 −280 app/assets/stylesheets/blueprint/src/grid.css
  9. +0 −79 app/assets/stylesheets/blueprint/src/ie.css
  10. +0 −92 app/assets/stylesheets/blueprint/src/print.css
  11. +0 −65 app/assets/stylesheets/blueprint/src/reset.css
  12. +0 −123 app/assets/stylesheets/blueprint/src/typography.css
  13. +0 −307 app/assets/stylesheets/debug/debug.css
  14. +0 −18 app/assets/stylesheets/features/support/jquery.js
  15. +0 −146 app/assets/stylesheets/lib/blueprint/grid.css.erb
  16. +1 −1 config/environments/production.rb
  17. +43 −0 public/assets/AUTHORS.textile
  18. +71 −0 public/assets/Gemfile.lock
  19. +83 −0 public/assets/README.textile
  20. +206 −0 public/assets/TUTORIAL.textile
  21. +1 −0 public/assets/application-2a2e79a398b7b9d1667509f308df1b8f.css
  22. BIN public/assets/application-2a2e79a398b7b9d1667509f308df1b8f.css.gz
  23. +19 −0 public/assets/application-d9c9265f37866dabd92089f4c4f7dd97.js
  24. BIN public/assets/application-d9c9265f37866dabd92089f4c4f7dd97.js.gz
  25. +1 −0 public/assets/application.css
  26. BIN public/assets/application.css.gz
  27. +19 −0 public/assets/application.js
  28. BIN public/assets/application.js.gz
  29. BIN ...ss.png → public/assets/blueprint/plugins/buttons/icons/cross-c7cecbf2f882d83d76089292bd4b0ddf.png
  30. BIN public/assets/blueprint/plugins/buttons/icons/cross.png
  31. BIN .../key.png → public/assets/blueprint/plugins/buttons/icons/key-8e3f74ccdd824651d925f0d4ae82b542.png
  32. BIN public/assets/blueprint/plugins/buttons/icons/key.png
  33. BIN ...ick.png → public/assets/blueprint/plugins/buttons/icons/tick-64f108801155bd6b82a5471d038f25ea.png
  34. BIN public/assets/blueprint/plugins/buttons/icons/tick.png
  35. 0 .../readme.txt → public/assets/blueprint/plugins/buttons/readme-eed7ccc72d6ff6a95654c44f09926937.txt
  36. +32 −0 public/assets/blueprint/plugins/buttons/readme.txt
  37. 0 ...adme.txt → public/assets/blueprint/plugins/fancy-type/readme-afb8c8c1cb3d368148435d113c848932.txt
  38. +14 −0 public/assets/blueprint/plugins/fancy-type/readme.txt
  39. BIN ...c.png → public/assets/blueprint/plugins/link-icons/icons/doc-e7bde22a5e5d85598e3484a0b8ec263a.png
  40. BIN public/assets/blueprint/plugins/link-icons/icons/doc.png
  41. BIN ...png → public/assets/blueprint/plugins/link-icons/icons/email-ed79a6df0cf02d7ecb08f07c6921d2e0.png
  42. BIN public/assets/blueprint/plugins/link-icons/icons/email.png
  43. BIN ... → public/assets/blueprint/plugins/link-icons/icons/external-8aa50a72751d10747941ba0c936187ef.png
  44. BIN public/assets/blueprint/plugins/link-icons/icons/external.png
  45. BIN ....png → public/assets/blueprint/plugins/link-icons/icons/feed-22c8117efb421af196c543effd1e2f99.png
  46. BIN public/assets/blueprint/plugins/link-icons/icons/feed.png
  47. BIN ...im.png → public/assets/blueprint/plugins/link-icons/icons/im-a2728f1f026a912ac8e9231160fc85d0.png
  48. BIN public/assets/blueprint/plugins/link-icons/icons/im.png
  49. BIN ....png → public/assets/blueprint/plugins/link-icons/icons/lock-9c22ca62c20e5f8d84d923e2f1a28a6a.png
  50. BIN public/assets/blueprint/plugins/link-icons/icons/lock.png
  51. BIN ...f.png → public/assets/blueprint/plugins/link-icons/icons/pdf-46ee489efeca8462ee45dcf072569b30.png
  52. BIN public/assets/blueprint/plugins/link-icons/icons/pdf.png
  53. BIN ...g → public/assets/blueprint/plugins/link-icons/icons/visited-89a77d7330a57b48d4c31836e31d859f.png
  54. BIN public/assets/blueprint/plugins/link-icons/icons/visited.png
  55. BIN ...s.png → public/assets/blueprint/plugins/link-icons/icons/xls-6dfc918c29ebc75a10085ba858965ac1.png
  56. BIN public/assets/blueprint/plugins/link-icons/icons/xls.png
  57. 0 ...adme.txt → public/assets/blueprint/plugins/link-icons/readme-c17cacde6fe3e9febd083c4d874efc98.txt
  58. +18 −0 public/assets/blueprint/plugins/link-icons/readme.txt
  59. 0 .../rtl/readme.txt → public/assets/blueprint/plugins/rtl/readme-db22ffdd743417f5517668aa828f3d6e.txt
  60. +10 −0 public/assets/blueprint/plugins/rtl/readme.txt
  61. BIN ...ts/blueprint/src/grid.png → public/assets/blueprint/src/grid-110aed0743c4500f27aff14e1c329a4b.png
  62. BIN public/assets/blueprint/src/grid.png
  63. 0 ...sheets/debug/README.textile → public/assets/debug/README-332000857efddb907b0ebfef7b829d03.textile
  64. +61 −0 public/assets/debug/README.textile
  65. 0 ...ts/stylesheets/debug/debug.html → public/assets/debug/debug-d31522fa2c9ff2e1473c917c529f611f.html
  66. +122 −0 public/assets/debug/debug.html
  67. 0 ...ts.feature → public/assets/features/generate_stylesheets-ef10cbfff459669acc24ceca7e543fe8.feature
  68. +217 −0 public/assets/features/generate_stylesheets.feature
  69. 0 ....rb → public/assets/features/step_definitions/blueprint_steps-8d657a6630288d2d91222ffc63e89e70.rb
  70. +37 −0 public/assets/features/step_definitions/blueprint_steps.rb
  71. 0 ...ueprint_app.rb → public/assets/features/support/blueprint_app-56f750207b6d12d1129d26107eb22418.rb
  72. +13 −0 public/assets/features/support/blueprint_app.rb
  73. 0 ...helpers.rb → public/assets/features/support/blueprint_helpers-0a3164077e591e93a02e0a6cba580eca.rb
  74. +44 −0 public/assets/features/support/blueprint_helpers.rb
  75. 0 ..._element.rb → public/assets/features/support/document_element-ef7730b1c2301b203095e4a677b281cf.rb
  76. +44 −0 public/assets/features/support/document_element.rb
  77. 0 ...t_helpers.rb → public/assets/features/support/element_helpers-ae80390895d539a3bc6fb46636925290.rb
  78. +7 −0 public/assets/features/support/element_helpers.rb
  79. 0 .../features/support/env.rb → public/assets/features/support/env-5df4dba6263946b324bb64012a6fa1b9.rb
  80. +9 −0 public/assets/features/support/env.rb
  81. 0 ...lueprint/blueprint.rb → public/assets/lib/blueprint/blueprint-1a85c05d8a1cb01e76fb6d2648f9c460.rb
  82. +54 −0 public/assets/lib/blueprint/blueprint.rb
  83. 0 ...eprint/compressor.rb → public/assets/lib/blueprint/compressor-56e5c1243d572c8de3b31bb5d642edd5.rb
  84. +295 −0 public/assets/lib/blueprint/compressor.rb
  85. 0 .../blueprint/core_ext.rb → public/assets/lib/blueprint/core_ext-4371a6833f3d6f50f3b250fa16c3febd.rb
  86. +39 −0 public/assets/lib/blueprint/core_ext.rb
  87. 0 ...eprint/css_parser.rb → public/assets/lib/blueprint/css_parser-e4987815fbadc79d0d0137128d28407e.rb
  88. +72 −0 public/assets/lib/blueprint/css_parser.rb
  89. 0 .../custom_layout.rb → public/assets/lib/blueprint/custom_layout-55a388ceb5d849d9620238ea23cacbe1.rb
  90. +72 −0 public/assets/lib/blueprint/custom_layout.rb
  91. 0 ...nt/grid_builder.rb → public/assets/lib/blueprint/grid_builder-ed5cf723136e81a56d032579b4b04d69.rb
  92. +33 −0 public/assets/lib/blueprint/grid_builder.rb
  93. 0 ...lueprint/namespace.rb → public/assets/lib/blueprint/namespace-34c89429b66bf8871bb3ba5e8284a957.rb
  94. +38 −0 public/assets/lib/blueprint/namespace.rb
  95. 0 ...s_names.rb → public/assets/lib/blueprint/semantic_class_names-f44b025cf462c11d0902397447271e53.rb
  96. +64 −0 public/assets/lib/blueprint/semantic_class_names.rb
  97. 0 ...RIGHT.html → public/assets/lib/blueprint/validate/COPYRIGHT-f636a0550cb749897a3ddbd1c2dbe87c.html
  98. +93 −0 public/assets/lib/blueprint/validate/COPYRIGHT.html
  99. 0 {app/assets/stylesheets → public/assets}/lib/blueprint/validate/JIGSAW_COPYRIGHT
  100. 0 ...e/README.html → public/assets/lib/blueprint/validate/README-9f5ab9aebeaddc8f012e0bf822c3056c.html
  101. +83 −0 public/assets/lib/blueprint/validate/README.html
  102. 0 ...NG.txt → public/assets/lib/blueprint/validate/XERCES_COPYING-8552ad1c13170af9c10ad21650ed3539.txt
  103. +56 −0 public/assets/lib/blueprint/validate/XERCES_COPYING.txt
  104. BIN ...tor.jar → public/assets/lib/blueprint/validate/css-validator-cbff492a7ce2013b28c062df41f95fa4.jar
  105. BIN ...→ public/assets/lib/blueprint/validate/css-validator-javadoc-417df61e5935cd8307dbdd569a5f0cf1.jar
  106. BIN public/assets/lib/blueprint/validate/css-validator-javadoc.jar
  107. BIN public/assets/lib/blueprint/validate/css-validator.jar
  108. BIN ...ate/jigsaw.jar → public/assets/lib/blueprint/validate/jigsaw-bc1eb873dac6980e3245465795beaf64.jar
  109. BIN public/assets/lib/blueprint/validate/jigsaw.jar
  110. BIN ...ate/xerces.jar → public/assets/lib/blueprint/validate/xerces-3940ca45ddb4e2d58ff43b715353719d.jar
  111. BIN public/assets/lib/blueprint/validate/xerces.jar
  112. 0 ...lueprint/validator.rb → public/assets/lib/blueprint/validator-9c7901b9c610b40957f6660d6e0bf1a5.rb
  113. +49 −0 public/assets/lib/blueprint/validator.rb
  114. 0 ...sets/stylesheets/lib/compress.rb → public/assets/lib/compress-bb152f11e3e0c9bb55cb8ddd0429af78.rb
  115. +167 −0 public/assets/lib/compress.rb
  116. 0 ...ib/settings.example.yml → public/assets/lib/settings.example-a9303035815d84b8f7c1d03dae217837.yml
  117. +33 −0 public/assets/lib/settings.example.yml
  118. 0 ...sets/stylesheets/lib/validate.rb → public/assets/lib/validate-a693fd31bb12137493da4e4f7db5e108.rb
  119. +15 −0 public/assets/lib/validate.rb
  120. BIN public/assets/logo.png
  121. +69 −0 public/assets/manifest.yml
  122. BIN public/assets/rails.png
  123. BIN ...sd/fixed-width.psd → public/assets/templates/psd/fixed-width-411e4b5a27ecf02d8550359803e4118d.psd
  124. BIN public/assets/templates/psd/fixed-width.psd
  125. 0 ...ts/stylesheets/tests/index.html → public/assets/tests/index-6fdc02addb0a4fe35a7a6da63bc46a95.html
  126. +106 −0 public/assets/tests/index.html
  127. 0 ...ts/parts/elements.html → public/assets/tests/parts/elements-04617595f41bdb3496d3938e22a8ef6b.html
  128. +247 −0 public/assets/tests/parts/elements.html
  129. 0 ...ts/tests/parts/forms.html → public/assets/tests/parts/forms-e3ad2c153298e076189fb5da2d45a3de.html
  130. +204 −0 public/assets/tests/parts/forms.html
  131. 0 ...eets/tests/parts/grid.html → public/assets/tests/parts/grid-3c720320db43a3e631948dfbdf5a2d5c.html
  132. +163 −0 public/assets/tests/parts/grid.html
  133. 0 ...k-icons.html → public/assets/tests/parts/plugins/link-icons-dc950aa72fa2cf2c7e797467c973dc50.html
  134. +89 −0 public/assets/tests/parts/plugins/link-icons.html
  135. 0 .../tests/parts/sample.html → public/assets/tests/parts/sample-f0e1d02674157c91f13a40703167007b.html
  136. +75 −0 public/assets/tests/parts/sample.html
  137. BIN ...sheets/tests/parts/test.jpg → public/assets/tests/parts/test-932feceeb6a8ec4fb9da5e80b2235006.jpg
  138. BIN .../parts/test-small.jpg → public/assets/tests/parts/test-small-00d12b44ed289fa8d2b9f4ee27bcf3a9.jpg
  139. BIN public/assets/tests/parts/test-small.jpg
  140. BIN public/assets/tests/parts/test.jpg
  141. BIN ...eets/tests/parts/valid.png → public/assets/tests/parts/valid-9b0db91fa7fb3b431a3c1223430283c9.png
  142. BIN public/assets/tests/parts/valid.png
View
@@ -12,7 +12,7 @@ gem 'sorcery'
gem 'carrierwave'
gem 'rmagick'
gem 'thin'
-gem 'eventmachine', '~> 1.0.0.beta', :platforms => [:mswin, :mingw]
+gem 'eventmachine'#, '~> 1.0.0.beta', :platforms => [:mswin, :mingw]
# Gems used only for assets and not required
# in production environments by default.
group :assets do
View
@@ -1,60 +1,71 @@
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.2.0)
- actionpack (= 3.2.0)
+ actionmailer (3.2.1)
+ actionpack (= 3.2.1)
mail (~> 2.4.0)
- actionpack (3.2.0)
- activemodel (= 3.2.0)
- activesupport (= 3.2.0)
+ actionpack (3.2.1)
+ activemodel (= 3.2.1)
+ activesupport (= 3.2.1)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- journey (~> 1.0.0)
+ journey (~> 1.0.1)
rack (~> 1.4.0)
rack-cache (~> 1.1)
rack-test (~> 0.6.1)
sprockets (~> 2.1.2)
- activemodel (3.2.0)
- activesupport (= 3.2.0)
+ activemodel (3.2.1)
+ activesupport (= 3.2.1)
builder (~> 3.0.0)
- activerecord (3.2.0)
- activemodel (= 3.2.0)
- activesupport (= 3.2.0)
+ activerecord (3.2.1)
+ activemodel (= 3.2.1)
+ activesupport (= 3.2.1)
arel (~> 3.0.0)
tzinfo (~> 0.3.29)
- activeresource (3.2.0)
- activemodel (= 3.2.0)
- activesupport (= 3.2.0)
- activesupport (3.2.0)
+ activeresource (3.2.1)
+ activemodel (= 3.2.1)
+ activesupport (= 3.2.1)
+ activesupport (3.2.1)
i18n (~> 0.6)
multi_json (~> 1.0)
- addressable (2.2.6)
- arel (3.0.0)
+ addressable (2.2.7)
+ arel (3.0.2)
bcrypt-ruby (3.0.1)
bcrypt-ruby (3.0.1-x86-mingw32)
builder (3.0.0)
cancan (1.6.7)
carrierwave (0.5.8)
activesupport (~> 3.0)
- coffee-rails (3.2.1)
+ coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
- railties (~> 3.2.0.beta)
+ railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.2.0)
- daemons (1.1.6)
+ cucumber (1.1.9)
+ builder (>= 2.1.2)
+ diff-lcs (>= 1.1.2)
+ gherkin (~> 2.9.0)
+ json (>= 1.4.6)
+ term-ansicolor (>= 1.0.6)
+ daemons (1.1.8)
+ diff-lcs (1.1.3)
erubis (2.7.0)
- eventmachine (1.0.0.beta.4.1-x86-mingw32)
+ eventmachine (0.12.10)
execjs (1.3.0)
multi_json (~> 1.0)
faraday (0.7.6)
addressable (~> 2.2)
multipart-post (~> 1.1)
rack (~> 1.1)
+ gherkin (2.9.0)
+ json (>= 1.4.6)
+ gherkin (2.9.0-x86-mingw32)
+ json (>= 1.4.6)
hike (1.2.1)
i18n (0.6.0)
- journey (1.0.0)
+ journey (1.0.3)
jquery-rails (2.0.0)
railties (>= 3.2.0.beta, < 5.0)
thor (~> 0.14)
@@ -65,33 +76,33 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.17.2)
- multi_json (1.0.4)
- multipart-post (1.1.4)
+ multi_json (1.1.0)
+ multipart-post (1.1.5)
oauth (0.4.5)
oauth2 (0.5.2)
faraday (~> 0.7)
multi_json (~> 1.0)
- pg (0.12.2)
- pg (0.12.2-x86-mingw32)
+ pg (0.13.2)
+ pg (0.13.2-x86-mingw32)
polyglot (0.3.3)
- rack (1.4.0)
+ rack (1.4.1)
rack-cache (1.1)
rack (>= 0.4)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.2.0)
- actionmailer (= 3.2.0)
- actionpack (= 3.2.0)
- activerecord (= 3.2.0)
- activeresource (= 3.2.0)
- activesupport (= 3.2.0)
+ rails (3.2.1)
+ actionmailer (= 3.2.1)
+ actionpack (= 3.2.1)
+ activerecord (= 3.2.1)
+ activeresource (= 3.2.1)
+ activesupport (= 3.2.1)
bundler (~> 1.0)
- railties (= 3.2.0)
- railties (3.2.0)
- actionpack (= 3.2.0)
- activesupport (= 3.2.0)
+ railties (= 3.2.1)
+ railties (3.2.1)
+ actionpack (= 3.2.1)
+ activesupport (= 3.2.1)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -100,9 +111,17 @@ GEM
rdoc (3.12)
json (~> 1.4)
rmagick (2.13.1)
- sass (3.1.12)
- sass-rails (3.2.3)
- railties (~> 3.2.0.beta)
+ rspec (2.8.0)
+ rspec-core (~> 2.8.0)
+ rspec-expectations (~> 2.8.0)
+ rspec-mocks (~> 2.8.0)
+ rspec-core (2.8.0)
+ rspec-expectations (2.8.0)
+ diff-lcs (~> 1.1.2)
+ rspec-mocks (2.8.0)
+ sass (3.1.15)
+ sass-rails (3.2.4)
+ railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
sorcery (0.7.6)
@@ -115,7 +134,8 @@ GEM
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- therubyracer (0.9.9)
+ term-ansicolor (1.0.7)
+ therubyracer (0.9.10)
libv8 (~> 3.3.10)
thin (1.3.1)
daemons (>= 1.0.9)
@@ -127,7 +147,7 @@ GEM
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.31)
- uglifier (1.2.2)
+ uglifier (1.2.3)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
@@ -139,12 +159,14 @@ DEPENDENCIES
cancan
carrierwave
coffee-rails (~> 3.2.1)
+ cucumber
daemons
- eventmachine (~> 1.0.0.beta)
+ eventmachine
jquery-rails
pg
rails
rmagick
+ rspec
sass-rails (~> 3.2.3)
sorcery
therubyracer
@@ -1,97 +0,0 @@
-/* --------------------------------------------------------------
-
- buttons.css
- * Gives you some great CSS-only buttons.
-
- Created by Kevin Hale [particletree.com]
- * particletree.com/features/rediscovering-the-button-element
-
- See Readme.txt in this folder for instructions.
-
--------------------------------------------------------------- */
-
-a.button, button {
- display:block;
- float:left;
- margin: 0.7em 0.5em 0.7em 0;
- padding:5px 10px 5px 7px; /* Links */
-
- border:1px solid #dedede;
- border-top:1px solid #eee;
- border-left:1px solid #eee;
-
- background-color:#f5f5f5;
- font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif;
- font-size:100%;
- line-height:130%;
- text-decoration:none;
- font-weight:bold;
- color:#565656;
- cursor:pointer;
-}
-button {
- width:auto;
- overflow:visible;
- padding:4px 10px 3px 7px; /* IE6 */
-}
-button[type] {
- padding:4px 10px 4px 7px; /* Firefox */
- line-height:17px; /* Safari */
-}
-*:first-child+html button[type] {
- padding:4px 10px 3px 7px; /* IE7 */
-}
-button img, a.button img{
- margin:0 3px -3px 0 !important;
- padding:0;
- border:none;
- width:16px;
- height:16px;
- float:none;
-}
-
-
-/* Button colors
--------------------------------------------------------------- */
-
-/* Standard */
-button:hover, a.button:hover{
- background-color:#dff4ff;
- border:1px solid #c2e1ef;
- color:#336699;
-}
-a.button:active{
- background-color:#6299c5;
- border:1px solid #6299c5;
- color:#fff;
-}
-
-/* Positive */
-body .positive {
- color:#529214;
-}
-a.positive:hover, button.positive:hover {
- background-color:#E6EFC2;
- border:1px solid #C6D880;
- color:#529214;
-}
-a.positive:active {
- background-color:#529214;
- border:1px solid #529214;
- color:#fff;
-}
-
-/* Negative */
-body .negative {
- color:#d12f19;
-}
-a.negative:hover, button.negative:hover {
- background-color:#fbe3e4;
- border:1px solid #fbc2c4;
- color:#d12f19;
-}
-a.negative:active {
- background-color:#d12f19;
- border:1px solid #d12f19;
- color:#fff;
-}
@@ -1,71 +0,0 @@
-/* --------------------------------------------------------------
-
- fancy-type.css
- * Lots of pretty advanced classes for manipulating text.
-
- See the Readme file in this folder for additional instructions.
-
--------------------------------------------------------------- */
-
-/* Indentation instead of line shifts for sibling paragraphs. */
- p + p { text-indent:2em; margin-top:-1.5em; }
- form p + p { text-indent: 0; } /* Don't want this in forms. */
-
-
-/* For great looking type, use this code instead of asdf:
- <span class="alt">asdf</span>
- Best used on prepositions and ampersands. */
-
-.alt {
- color: #666;
- font-family: "Warnock Pro", "Goudy Old Style","Palatino","Book Antiqua", Georgia, serif;
- font-style: italic;
- font-weight: normal;
-}
-
-
-/* For great looking quote marks in titles, replace "asdf" with:
- <span class="dquo">&#8220;</span>asdf&#8221;
- (That is, when the title starts with a quote mark).
- (You may have to change this value depending on your font size). */
-
-.dquo { margin-left: -.5em; }
-
-
-/* Reduced size type with incremental leading
- (http://www.markboulton.co.uk/journal/comments/incremental_leading/)
-
- This could be used for side notes. For smaller type, you don't necessarily want to
- follow the 1.5x vertical rhythm -- the line-height is too much.
-
- Using this class, it reduces your font size and line-height so that for
- every four lines of normal sized type, there is five lines of the sidenote. eg:
-
- New type size in em's:
- 10px (wanted side note size) / 12px (existing base size) = 0.8333 (new type size in ems)
-
- New line-height value:
- 12px x 1.5 = 18px (old line-height)
- 18px x 4 = 72px
- 72px / 5 = 14.4px (new line height)
- 14.4px / 10px = 1.44 (new line height in em's) */
-
-p.incr, .incr p {
- font-size: 10px;
- line-height: 1.44em;
- margin-bottom: 1.5em;
-}
-
-
-/* Surround uppercase words and abbreviations with this class.
- Based on work by Jørgen Arnor Gårdsø Lom [http://twistedintellect.com/] */
-
-.caps {
- font-variant: small-caps;
- letter-spacing: 1px;
- text-transform: lowercase;
- font-size:1.2em;
- line-height:1%;
- font-weight:bold;
- padding:0 2px;
-}
Oops, something went wrong.

0 comments on commit ed3d39a

Please sign in to comment.