Skip to content

Commit 00daf42

Browse files
committed
Fix Foundation Deprecations
* 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. * Point to a previous version of Hipchat because version `1.6.0` broke the OAuth flow. SEE: foundation/foundation-sites#9419 SEE: sass/sass#1599 SEE: hipchat/hipchat-rb#202
1 parent 7132551 commit 00daf42

File tree

4 files changed

+21
-16
lines changed

4 files changed

+21
-16
lines changed

ama_styles.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Gem::Specification.new do |s|
6262
s.add_development_dependency 'rubocop', '0.49.1'
6363
s.add_development_dependency 'factory_girl'
6464
s.add_development_dependency 'colorize'
65-
s.add_development_dependency 'hipchat'
65+
s.add_development_dependency 'hipchat', '~> 1.5.4'
6666
s.add_development_dependency 'rake'
6767
s.add_development_dependency 'rest-client'
6868
s.add_development_dependency 'rest-client-jogger'

app/assets/stylesheets/_settings.scss

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -108,22 +108,22 @@ $header-font-family: $body-font-family;
108108
$header-font-weight: 700;
109109
$header-font-style: normal;
110110
$font-family-monospace: Consolas, 'Liberation Mono', Courier, monospace;
111-
$header-sizes: (
111+
$header-styles: (
112112
small: (
113-
'h1': 20,
114-
'h2': 20,
115-
'h3': 19,
116-
'h4': 18,
117-
'h5': 17,
118-
'h6': 16,
113+
'h1': ('font-size': 20),
114+
'h2': ('font-size': 20),
115+
'h3': ('font-size': 19),
116+
'h4': ('font-size': 18),
117+
'h5': ('font-size': 17),
118+
'h6': ('font-size': 16),
119119
),
120120
medium: (
121-
'h1': 20,
122-
'h2': 20,
123-
'h3': 18,
124-
'h4': 16,
125-
'h5': 14,
126-
'h6': 12,
121+
'h1': ('font-size': 20),
122+
'h2': ('font-size': 20),
123+
'h3': ('font-size': 18),
124+
'h4': ('font-size': 16),
125+
'h5': ('font-size': 14),
126+
'h6': ('font-size': 12),
127127
),
128128
);
129129
$header-color: inherit;

app/assets/stylesheets/layout_components/forms.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,12 @@ small.error{
389389
}
390390

391391
.error__page-error{
392-
@extend small.error;
392+
display: block;
393+
clear: both;
394+
padding: 0.375rem 0.5625rem 0.5625rem;
395+
font-size: $base-font-size;
396+
background: $brand-red;
397+
color: $white;
393398
margin-bottom: $base-margin;
394399
}
395400

lib/ama/styles/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
module AMA
44
module Styles
5-
VERSION = '1.11.1'
5+
VERSION = '1.11.2'
66
end
77
end

0 commit comments

Comments
 (0)