Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: codeforamerica/honeycrisp-gem
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.9.1
Choose a base ref
...
head repository: codeforamerica/honeycrisp-gem
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.9.2
Choose a head ref
  • 11 commits
  • 18 files changed
  • 6 contributors

Commits on Dec 13, 2019

  1. Copy the full SHA
    2aa7c23 View commit details

Commits on Dec 14, 2019

  1. Add tabs to code examples for different languages (html, erb)

    - remove code that attaches button to display html code example
    - don't show the erb tab if rendering the example with ERB produces the same output
    - HTML and ERB examples both have white backgrounds
    
    Co-authored-by: Travis Grathwell <[email protected]>
    Co-authored-by: Laura Kogler <[email protected]>
    3 people authored and mrotondo committed Dec 14, 2019
    Copy the full SHA
    c28980c View commit details
  2. Remove CTA button. Modify button--link class to look exactly like an …

    …a tag. Add documentation for buttons. Closes #115
    mrotondo committed Dec 14, 2019
    Copy the full SHA
    3fbce1c View commit details

Commits on Dec 17, 2019

  1. Add documentation to progress indicators

    Closes #148
    
    Co-authored-by: Ben Sheldon <[email protected]>
    lkogler and bensheldon committed Dec 17, 2019
    Copy the full SHA
    a7b7e9b View commit details
  2. Fix positioning of section anchors

    Co-authored-by: Ben Sheldon <[email protected]>
    lkogler and bensheldon committed Dec 17, 2019
    Copy the full SHA
    8841589 View commit details
  3. Insert paragraph break

    Also move html_escape to site of use
    
    Co-authored-by: Ben Sheldon <[email protected]>
    lkogler and bensheldon committed Dec 17, 2019
    Copy the full SHA
    309e0dd View commit details

Commits on Dec 18, 2019

  1. Change from <button> to <a> elements for pagination

    Closes #149
    
    Co-authored-by: Ben Sheldon <[email protected]>
    lkogler and bensheldon committed Dec 18, 2019
    Copy the full SHA
    d7a4747 View commit details

Commits on Jan 13, 2020

  1. Adjusts how upload buttons are highlighted on focus. (#161)

    * Adjusts how upload buttons are highlighted on focus.
    
    The previous solution had two issues: the focus was rectangular despite the rounded rect button style, and the upload button lost its spacing, causing GCF's documents upload page to lay out incorrectly.
    
    * Added documentation of upload button highlighting css
    mrotondo authored Jan 13, 2020
    Copy the full SHA
    8790bac View commit details
  2. Update Rack dependency to 2.0.8 for security issue (#162)

    * Update Rack dependency to 2.0.8 for security issue
    mrotondo authored Jan 13, 2020
    Copy the full SHA
    763ed62 View commit details

Commits on Jan 14, 2020

  1. Copy the full SHA
    9c58eb1 View commit details
  2. Bump version to 0.9.2.

    mrotondo committed Jan 14, 2020
    Copy the full SHA
    86e878b View commit details
62 changes: 52 additions & 10 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,45 @@
# Change Log
# Changelog

## [v0.9.2](https://github.com/codeforamerica/honeycrisp-gem/tree/v0.9.2) (2020-01-13)

[Full Changelog](https://github.com/codeforamerica/honeycrisp-gem/compare/v0.9.1...v0.9.2)

**Implemented enhancements:**

- Update documentation display template [\#121](https://github.com/codeforamerica/honeycrisp-gem/issues/121)
- Move labels and extraneous button types to admin-specific file [\#115](https://github.com/codeforamerica/honeycrisp-gem/issues/115)
- Display names and hex codes on color samples [\#104](https://github.com/codeforamerica/honeycrisp-gem/issues/104)

**Closed issues:**

- Documentation for pagination HTML should show links, not buttons [\#149](https://github.com/codeforamerica/honeycrisp-gem/issues/149)
- Add documentation to progress indicators [\#148](https://github.com/codeforamerica/honeycrisp-gem/issues/148)

**Merged pull requests:**

- Update github\_changelog\_generator gem [\#163](https://github.com/codeforamerica/honeycrisp-gem/pull/163) ([mrotondo](https://github.com/mrotondo))
- Update Rack dependency to 2.0.8 for security issue [\#162](https://github.com/codeforamerica/honeycrisp-gem/pull/162) ([mrotondo](https://github.com/mrotondo))
- Adjusts how upload buttons are highlighted on focus. [\#161](https://github.com/codeforamerica/honeycrisp-gem/pull/161) ([mrotondo](https://github.com/mrotondo))
- Change from \<button\> to \<a\> elements for pagination [\#153](https://github.com/codeforamerica/honeycrisp-gem/pull/153) ([lkogler](https://github.com/lkogler))
- Add documentation to progress indicators [\#150](https://github.com/codeforamerica/honeycrisp-gem/pull/150) ([lkogler](https://github.com/lkogler))
- Button cleanup [\#147](https://github.com/codeforamerica/honeycrisp-gem/pull/147) ([mrotondo](https://github.com/mrotondo))
- Update Colors section of styleguide [\#146](https://github.com/codeforamerica/honeycrisp-gem/pull/146) ([mrotondo](https://github.com/mrotondo))
- Add tabs to code examples for different languages \(html, erb\) [\#139](https://github.com/codeforamerica/honeycrisp-gem/pull/139) ([jenny-heath](https://github.com/jenny-heath))

## [v0.9.1](https://github.com/codeforamerica/honeycrisp-gem/tree/v0.9.1) (2019-12-10)

## [v0.9.1](https://github.com/codeforamerica/honeycrisp-gem/tree/v0.9.1) (2019-12-09)
[Full Changelog](https://github.com/codeforamerica/honeycrisp-gem/compare/v0.9.0...v0.9.1)

**Implemented enhancements:**

- Put spacing examples into two columns [\#132](https://github.com/codeforamerica/honeycrisp-gem/issues/132)
- Add Honeycrisp branding [\#122](https://github.com/codeforamerica/honeycrisp-gem/issues/122)
- Add development instructions to README [\#34](https://github.com/codeforamerica/honeycrisp-gem/issues/34)
- Make padding classes more flexible. [\#20](https://github.com/codeforamerica/honeycrisp-gem/issues/20)

**Fixed bugs:**

- Syntax highlighting incorrect for embedded ruby in styleguide reference [\#106](https://github.com/codeforamerica/honeycrisp-gem/issues/106)
- Spacing issues with date fields and the last question on a page [\#13](https://github.com/codeforamerica/honeycrisp-gem/issues/13)

**Closed issues:**

@@ -26,32 +55,37 @@
- Vendorize prism [\#131](https://github.com/codeforamerica/honeycrisp-gem/pull/131) ([hartsick](https://github.com/hartsick))

## [v0.9.0](https://github.com/codeforamerica/honeycrisp-gem/tree/v0.9.0) (2019-11-05)

[Full Changelog](https://github.com/codeforamerica/honeycrisp-gem/compare/v0.8.0...v0.9.0)

**Fixed bugs:**

- Make padding classes more flexible. [\#20](https://github.com/codeforamerica/honeycrisp-gem/issues/20)
- Syntax highlighting incorrect for embedded ruby in styleguide reference [\#106](https://github.com/codeforamerica/honeycrisp-gem/issues/106)

**Merged pull requests:**

- Add migration guide [\#130](https://github.com/codeforamerica/honeycrisp-gem/pull/130) ([hartsick](https://github.com/hartsick))
- Documentation page: display explanation between example and code [\#128](https://github.com/codeforamerica/honeycrisp-gem/pull/128) ([jenny-heath](https://github.com/jenny-heath))
- Accessibility design details [\#123](https://github.com/codeforamerica/honeycrisp-gem/pull/123) ([norrishung](https://github.com/norrishung))

## [v0.8.0](https://github.com/codeforamerica/honeycrisp-gem/tree/v0.8.0) (2019-10-10)

[Full Changelog](https://github.com/codeforamerica/honeycrisp-gem/compare/v0.7.1...v0.8.0)

**Merged pull requests:**

- Add crossmark and checkmark list patterns to design system [\#127](https://github.com/codeforamerica/honeycrisp-gem/pull/127) ([norrishung](https://github.com/norrishung))

## [v0.7.1](https://github.com/codeforamerica/honeycrisp-gem/tree/v0.7.1) (2019-10-09)

[Full Changelog](https://github.com/codeforamerica/honeycrisp-gem/compare/v0.7.0...v0.7.1)

**Merged pull requests:**

- Bump rubyzip from 1.2.2 to 1.3.0 [\#126](https://github.com/codeforamerica/honeycrisp-gem/pull/126) ([dependabot[bot]](https://github.com/apps/dependabot))

## [v0.7.0](https://github.com/codeforamerica/honeycrisp-gem/tree/v0.7.0) (2019-10-08)

[Full Changelog](https://github.com/codeforamerica/honeycrisp-gem/compare/v0.6.5...v0.7.0)

**Implemented enhancements:**
@@ -61,12 +95,12 @@

**Merged pull requests:**

- Documentation page: display explanation between example and code [\#128](https://github.com/codeforamerica/honeycrisp-gem/pull/128) ([jenny-heath](https://github.com/jenny-heath))
- Adding an accordion pattern [\#125](https://github.com/codeforamerica/honeycrisp-gem/pull/125) ([norrishung](https://github.com/norrishung))
- Hide unchecked follow up questions on page load [\#119](https://github.com/codeforamerica/honeycrisp-gem/pull/119) ([tdooner](https://github.com/tdooner))
- Fix follow-up to work for single checkbox [\#118](https://github.com/codeforamerica/honeycrisp-gem/pull/118) ([tdooner](https://github.com/tdooner))

## [v0.6.5](https://github.com/codeforamerica/honeycrisp-gem/tree/v0.6.5) (2019-07-15)

[Full Changelog](https://github.com/codeforamerica/honeycrisp-gem/compare/v0.6.4...v0.6.5)

**Implemented enhancements:**
@@ -77,40 +111,45 @@

- Upgrade lodash to address CVE [\#117](https://github.com/codeforamerica/honeycrisp-gem/pull/117) ([hartsick](https://github.com/hartsick))
- Update toolbar for new GCF behaviors [\#116](https://github.com/codeforamerica/honeycrisp-gem/pull/116) ([tdooner](https://github.com/tdooner))
- Add a section about spacing to reference page [\#111](https://github.com/codeforamerica/honeycrisp-gem/pull/111) ([jenny-heath](https://github.com/jenny-heath))

## [v0.6.4](https://github.com/codeforamerica/honeycrisp-gem/tree/v0.6.4) (2019-07-01)

[Full Changelog](https://github.com/codeforamerica/honeycrisp-gem/compare/v0.6.2...v0.6.4)

**Merged pull requests:**

- Simplified step-bar-description [\#113](https://github.com/codeforamerica/honeycrisp-gem/pull/113) ([embarnard](https://github.com/embarnard))
- Add a section about spacing to reference page [\#111](https://github.com/codeforamerica/honeycrisp-gem/pull/111) ([jenny-heath](https://github.com/jenny-heath))
- Fix bug on step progress bar: increment current\_step on a 0 index system [\#110](https://github.com/codeforamerica/honeycrisp-gem/pull/110) ([embarnard](https://github.com/embarnard))
- added student pair emoji [\#109](https://github.com/codeforamerica/honeycrisp-gem/pull/109) ([embarnard](https://github.com/embarnard))

## [v0.6.2](https://github.com/codeforamerica/honeycrisp-gem/tree/v0.6.2) (2019-06-25)

[Full Changelog](https://github.com/codeforamerica/honeycrisp-gem/compare/v0.6.1...v0.6.2)

**Merged pull requests:**

- added student pair emoji [\#109](https://github.com/codeforamerica/honeycrisp-gem/pull/109) ([embarnard](https://github.com/embarnard))
- Add emoji for "older man and woman" [\#108](https://github.com/codeforamerica/honeycrisp-gem/pull/108) ([tdooner](https://github.com/tdooner))
- Add support for optional progress step bar labels [\#107](https://github.com/codeforamerica/honeycrisp-gem/pull/107) ([hartsick](https://github.com/hartsick))

## [v0.6.1](https://github.com/codeforamerica/honeycrisp-gem/tree/v0.6.1) (2019-06-06)

[Full Changelog](https://github.com/codeforamerica/honeycrisp-gem/compare/v0.6.0...v0.6.1)

**Merged pull requests:**

- Add new type of notice [\#103](https://github.com/codeforamerica/honeycrisp-gem/pull/103) ([jenny-heath](https://github.com/jenny-heath))

## [v0.6.0](https://github.com/codeforamerica/honeycrisp-gem/tree/v0.6.0) (2019-05-21)

[Full Changelog](https://github.com/codeforamerica/honeycrisp-gem/compare/v0.5.11...v0.6.0)

**Merged pull requests:**

- Accessibility improvements from GCF audit [\#101](https://github.com/codeforamerica/honeycrisp-gem/pull/101) ([hartsick](https://github.com/hartsick))

## [v0.5.11](https://github.com/codeforamerica/honeycrisp-gem/tree/v0.5.11) (2019-04-04)

[Full Changelog](https://github.com/codeforamerica/honeycrisp-gem/compare/v0.5.10...v0.5.11)

**Fixed bugs:**
@@ -124,8 +163,10 @@
- Add Percy snapshot to CircleCI [\#93](https://github.com/codeforamerica/honeycrisp-gem/pull/93) ([bensheldon](https://github.com/bensheldon))
- Refactor all styleguide examples to use partial; add link to isolated example [\#89](https://github.com/codeforamerica/honeycrisp-gem/pull/89) ([bensheldon](https://github.com/bensheldon))
- Add link to Github repo and issue submission [\#88](https://github.com/codeforamerica/honeycrisp-gem/pull/88) ([hartsick](https://github.com/hartsick))
- Make accessibility improvements [\#83](https://github.com/codeforamerica/honeycrisp-gem/pull/83) ([bensheldon](https://github.com/bensheldon))

## [v0.5.10](https://github.com/codeforamerica/honeycrisp-gem/tree/v0.5.10) (2019-02-16)

[Full Changelog](https://github.com/codeforamerica/honeycrisp-gem/compare/v0.5.9...v0.5.10)

**Implemented enhancements:**
@@ -138,13 +179,15 @@
**Merged pull requests:**

- Add rubocop [\#87](https://github.com/codeforamerica/honeycrisp-gem/pull/87) ([hartsick](https://github.com/hartsick))
- Make accessibility improvements [\#83](https://github.com/codeforamerica/honeycrisp-gem/pull/83) ([bensheldon](https://github.com/bensheldon))
- Add show more pattern to molecules [\#82](https://github.com/codeforamerica/honeycrisp-gem/pull/82) ([anule](https://github.com/anule))
- Add anchorlink to individual examples [\#81](https://github.com/codeforamerica/honeycrisp-gem/pull/81) ([bensheldon](https://github.com/bensheldon))
- Add Brewfile and instructions for Chromedriver [\#80](https://github.com/codeforamerica/honeycrisp-gem/pull/80) ([bensheldon](https://github.com/bensheldon))
- Add changelog generation and instructions [\#73](https://github.com/codeforamerica/honeycrisp-gem/pull/73) ([hartsick](https://github.com/hartsick))

## [v0.5.9](https://github.com/codeforamerica/honeycrisp-gem/tree/v0.5.9) (2019-02-08)

[Full Changelog](https://github.com/codeforamerica/honeycrisp-gem/compare/03e893bd371986a17bada20d5fb49c3550dd3d77...v0.5.9)

**Implemented enhancements:**

- Update error message examples [\#62](https://github.com/codeforamerica/honeycrisp-gem/issues/62)
@@ -198,7 +241,6 @@
- Add CfaFormBuilder [\#26](https://github.com/codeforamerica/honeycrisp-gem/pull/26) ([wschaefer-cfa](https://github.com/wschaefer-cfa))
- bump rack due to security vulnerability [\#25](https://github.com/codeforamerica/honeycrisp-gem/pull/25) ([wschaefer-cfa](https://github.com/wschaefer-cfa))
- Bump gem version [\#23](https://github.com/codeforamerica/honeycrisp-gem/pull/23) ([hartsick](https://github.com/hartsick))
- Darken base teal color to improve contrast [\#19](https://github.com/codeforamerica/honeycrisp-gem/pull/19) ([hartsick](https://github.com/hartsick))
- Pull in latest GCF styleguide [\#12](https://github.com/codeforamerica/honeycrisp-gem/pull/12) ([hartsick](https://github.com/hartsick))
- Fix styling on non-main styleguide pages [\#11](https://github.com/codeforamerica/honeycrisp-gem/pull/11) ([hartsick](https://github.com/hartsick))
- Declare layout for Styleguide [\#10](https://github.com/codeforamerica/honeycrisp-gem/pull/10) ([hartsick](https://github.com/hartsick))
@@ -209,4 +251,4 @@



\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -4,3 +4,5 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }

# Specify your gem's dependencies in cfa-styleguide.gemspec
gemspec

gem "rack", ">= 2.0.8"
42 changes: 22 additions & 20 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
cfa-styleguide (0.9.1)
cfa-styleguide (0.9.2)
autoprefixer-rails
bourbon
jquery-rails
@@ -51,8 +51,8 @@ GEM
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
arel (9.0.0)
ast (2.4.0)
autoprefixer-rails (9.7.3)
@@ -93,22 +93,22 @@ GEM
equalizer (0.0.11)
erubi (1.8.0)
execjs (2.7.0)
faraday (0.15.3)
faraday (0.17.3)
multipart-post (>= 1.2, < 3)
faraday-http-cache (2.0.0)
faraday (~> 0.8)
ffi (1.10.0)
github_changelog_generator (1.14.3)
github_changelog_generator (1.15.0)
activesupport
faraday-http-cache
multi_json
octokit (~> 4.6)
rainbow (>= 2.1)
rainbow (>= 2.2.1)
rake (>= 10.0)
retriable (~> 2.1)
retriable (~> 3.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
i18n (1.6.0)
i18n (1.8.2)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
jaro_winkler (1.5.2)
@@ -127,16 +127,17 @@ GEM
mimemagic (0.3.3)
mini_mime (1.0.1)
mini_portile2 (2.4.0)
minitest (5.11.3)
multi_json (1.13.1)
multipart-post (2.0.0)
minitest (5.14.0)
multi_json (1.14.1)
multipart-post (2.1.1)
neat (1.8.0)
sass (>= 3.3)
thor (~> 0.19)
nio4r (2.3.1)
nokogiri (1.10.5)
mini_portile2 (~> 2.4.0)
octokit (4.13.0)
octokit (4.15.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
parallel (1.13.0)
parser (2.6.0.0)
@@ -149,8 +150,8 @@ GEM
pry-byebug (3.6.0)
byebug (~> 10.0)
pry (~> 0.10)
public_suffix (3.0.3)
rack (2.0.6)
public_suffix (4.0.3)
rack (2.1.1)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.2.1)
@@ -180,10 +181,10 @@ GEM
rainbow (3.0.0)
rake (10.5.0)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
rb-inotify (0.10.1)
ffi (~> 1.0)
regexp_parser (1.3.0)
retriable (2.1.0)
retriable (3.1.2)
rspec (3.8.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
@@ -222,9 +223,9 @@ GEM
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
selenium-webdriver (3.141.0)
childprocess (~> 0.5)
rubyzip (~> 1.2, >= 1.2.2)
@@ -237,7 +238,7 @@ GEM
sprockets (>= 3.0.0)
thor (0.20.3)
thread_safe (0.3.6)
tzinfo (1.2.5)
tzinfo (1.2.6)
thread_safe (~> 0.1)
unicode-display_width (1.4.1)
virtus (1.0.5)
@@ -263,6 +264,7 @@ DEPENDENCIES
github_changelog_generator
percy-capybara (~> 4.0.0.pre.beta2)
pry-byebug
rack (>= 2.0.8)
rails (>= 3.1)
rake (~> 10.0)
rspec
1 change: 1 addition & 0 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@ GitHubChangelogGenerator::RakeTask.new :changelog do |config|
config.user = "codeforamerica"
config.project = "honeycrisp-gem"
config.future_release = "v#{Cfa::Styleguide::VERSION}"
config.exclude_labels = ["discussion", "wontfix"]
end

namespace :lint do
37 changes: 16 additions & 21 deletions app/assets/stylesheets/atoms/_buttons.scss
Original file line number Diff line number Diff line change
@@ -41,22 +41,6 @@
}
}

.button--cta {
color: #FFFFFF;
background-color: $color-magenta;
border-color: $color-magenta;
box-shadow: 0 2px 0px $color-magenta-dark;
&:hover {
background-color: $color-magenta-dark;
border-color: $color-magenta-dark;
color: #FFFFFF;
}
&:active {
background-color: $color-magenta-dark;
border-color: $color-magenta-dark;
}
}

.button--primary {
color: #FFFFFF;
background-color: $color-teal;
@@ -98,12 +82,23 @@
}

.button--link {
background: transparent;
border: none;
box-shadow: none;
text-decoration: underline;
// This is in place to remove default HTML button styling
align-items: normal;
background-color: rgba(0,0,0,0);
border-style: none;
box-sizing: content-box;
cursor: pointer;
color: inherit;
display: inline;
font: inherit;
height: auto;
padding: 0;
perspective-origin: 0 0;
text-align: start;
text-decoration: underline;
transform-origin: 0 0;
width: auto;

@extend a
}

.button__icon {
9 changes: 6 additions & 3 deletions app/assets/stylesheets/atoms/_form-elements.scss
Original file line number Diff line number Diff line change
@@ -213,10 +213,13 @@ label {
}

.file-upload {
@include outline-within();
display: inline-block;
.button {
margin: 0;

// The ~ denotes a "subsequent sibling" per https://www.w3.org/TR/selectors-4/#general-sibling-combinators
// This rule expects that an element with class .button will occur after a focused input element as children
// of the .file-upload element, as is the case in the example HTML in the styleguide.
input:focus ~ .button {
@include outline-unconditional;
}
}

Loading