From 64ccd18e14403b3a3526fa4ef9f1afe0af3e2177 Mon Sep 17 00:00:00 2001 From: Nicole Sullivan Date: Thu, 11 Dec 2014 11:30:40 -0500 Subject: [PATCH] feat(react): Introduce React typography components * Add Heading generator and three type systems which wrap it (Default, Alternate, Marketing) * Add JSX support in the style guide * Point hologram to a fork for jsx support [Finishes #84033714] Signed-off-by: Paul Meskers --- Gemfile | 2 +- Gemfile.lock | 10 +- hologram/doc_assets/_header.html | 1 + src/pivotal-ui/components/typography.scss | 103 +++++++++ .../javascripts/pivotal-ui-react.js | 11 + src/pivotal-ui/javascripts/typography.jsx | 153 ++++++++++++++ test/spec/javascripts/typography_spec.js | 196 ++++++++++++++++++ 7 files changed, 470 insertions(+), 6 deletions(-) create mode 100644 src/pivotal-ui/javascripts/typography.jsx create mode 100644 test/spec/javascripts/typography_spec.js diff --git a/Gemfile b/Gemfile index 743e82846..f10364b08 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'hologram', git: 'https://github.com/gpleiss/hologram.git', branch: 'develop' +gem 'hologram', git: 'https://github.com/pmeskers/hologram.git', branch: 'jsx-templates' gem 'haml' gem 'sass' gem 'compass', '~> 1.0.1' diff --git a/Gemfile.lock b/Gemfile.lock index be70f44fa..4b079fc8c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GIT - remote: https://github.com/gpleiss/hologram.git - revision: 64b3baf29654476425947967d982e070b2199061 - branch: develop + remote: https://github.com/pmeskers/hologram.git + revision: 9de4273497a5ea61f0c335969ab661cd0fa2f54e + branch: jsx-templates specs: hologram (1.2.0) redcarpet (>= 2.2, < 4.0) @@ -52,8 +52,8 @@ GEM rb-fsevent (0.9.4) rb-inotify (0.9.5) ffi (>= 0.5.0) - redcarpet (3.2.0) - rouge (1.7.2) + redcarpet (3.2.1) + rouge (1.7.4) rspec (2.99.0) rspec-core (~> 2.99.0) rspec-expectations (~> 2.99.0) diff --git a/hologram/doc_assets/_header.html b/hologram/doc_assets/_header.html index b310cd0e1..c1755a013 100644 --- a/hologram/doc_assets/_header.html +++ b/hologram/doc_assets/_header.html @@ -11,6 +11,7 @@ +