Skip to content

Commit

Permalink
Fix Foundation Deprecations
Browse files Browse the repository at this point in the history
* Foundation deprecated the `header-sizes` variable name with
  version `6.3`. The new name is `header-styles` and it uses a
  slightly different format.
* Fix a SASS depreation warning about extending from the compound
  selector `small.error`. This will be removed in a future version
  of SASS.
* Revert to hipchat API version 1 because the tokens for V2
  were not properly authenticating with Hipchat and the
  hipchat gem.

SEE: foundation/foundation-sites#9419
SEE: sass/sass#1599
SEE: hipchat/hipchat-rb#202
  • Loading branch information
jessedoyle committed Aug 18, 2017
1 parent 7132551 commit ce3293d
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 17 deletions.
26 changes: 13 additions & 13 deletions app/assets/stylesheets/_settings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -108,22 +108,22 @@ $header-font-family: $body-font-family;
$header-font-weight: 700;
$header-font-style: normal;
$font-family-monospace: Consolas, 'Liberation Mono', Courier, monospace;
$header-sizes: (
$header-styles: (
small: (
'h1': 20,
'h2': 20,
'h3': 19,
'h4': 18,
'h5': 17,
'h6': 16,
'h1': ('font-size': 20),
'h2': ('font-size': 20),
'h3': ('font-size': 19),
'h4': ('font-size': 18),
'h5': ('font-size': 17),
'h6': ('font-size': 16),
),
medium: (
'h1': 20,
'h2': 20,
'h3': 18,
'h4': 16,
'h5': 14,
'h6': 12,
'h1': ('font-size': 20),
'h2': ('font-size': 20),
'h3': ('font-size': 18),
'h4': ('font-size': 16),
'h5': ('font-size': 14),
'h6': ('font-size': 12),
),
);
$header-color: inherit;
Expand Down
7 changes: 6 additions & 1 deletion app/assets/stylesheets/layout_components/forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,12 @@ small.error{
}

.error__page-error{
@extend small.error;
display: block;
clear: both;
padding: 0.375rem 0.5625rem 0.5625rem;
font-size: $base-font-size;
background: $brand-red;
color: $white;
margin-bottom: $base-margin;
}

Expand Down
4 changes: 2 additions & 2 deletions lib/ama/styles/internal/hipchat.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ def end_deploy_message(opts = {})
private

def client
::HipChat::Client.new(api_token)
::HipChat::Client.new(api_token, api_version: 'v1')
end

def api_token
ENV.fetch('HIPCHAT_TOKEN_V2')
ENV.fetch('HIPCHAT_TOKEN')
end

def room
Expand Down
2 changes: 1 addition & 1 deletion lib/ama/styles/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

module AMA
module Styles
VERSION = '1.11.1'
VERSION = '1.11.2'
end
end

0 comments on commit ce3293d

Please sign in to comment.