materialize-sass 0.97.8 → 1.0.0.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (150) hide show
  1. checksums.yaml +5 -5
  2. data/.gitattributes +1 -0
  3. data/.gitignore +1 -0
  4. data/README.md +34 -32
  5. data/Rakefile +38 -21
  6. data/assets/javascripts/materialize/anime.min.js +417 -0
  7. data/assets/javascripts/materialize/autocomplete.js +504 -0
  8. data/assets/javascripts/materialize/buttons.js +409 -0
  9. data/assets/javascripts/materialize/cards.js +34 -0
  10. data/assets/javascripts/materialize/carousel.js +797 -0
  11. data/assets/javascripts/materialize/cash.js +990 -0
  12. data/assets/javascripts/materialize/characterCounter.js +180 -0
  13. data/assets/javascripts/materialize/chips.js +564 -0
  14. data/assets/javascripts/materialize/collapsible.js +337 -0
  15. data/assets/javascripts/materialize/component.js +57 -0
  16. data/assets/javascripts/materialize/datepicker.js +935 -0
  17. data/assets/javascripts/materialize/dropdown.js +659 -0
  18. data/assets/javascripts/materialize/extras/nouislider.js +2147 -0
  19. data/assets/javascripts/materialize/extras/nouislider.min.js +1 -0
  20. data/assets/javascripts/materialize/forms.js +244 -0
  21. data/assets/javascripts/materialize/global.js +408 -0
  22. data/assets/javascripts/materialize/materialbox.js +513 -0
  23. data/assets/javascripts/materialize/modal.js +449 -0
  24. data/assets/javascripts/materialize/parallax.js +173 -0
  25. data/assets/javascripts/materialize/pushpin.js +179 -0
  26. data/assets/javascripts/materialize/range.js +310 -0
  27. data/assets/javascripts/materialize/scrollspy.js +328 -0
  28. data/assets/javascripts/materialize/select.js +497 -0
  29. data/assets/javascripts/materialize/sidenav.js +655 -0
  30. data/assets/javascripts/materialize/slider.js +424 -0
  31. data/assets/javascripts/materialize/tabs.js +476 -0
  32. data/assets/javascripts/materialize/tapTarget.js +364 -0
  33. data/assets/javascripts/materialize/timepicker.js +647 -0
  34. data/assets/javascripts/materialize/toasts.js +355 -0
  35. data/assets/javascripts/materialize/tooltip.js +351 -0
  36. data/{app/assets → assets}/javascripts/materialize/waves.js +42 -47
  37. data/{app/assets → assets}/javascripts/materialize-sprockets.js +12 -13
  38. data/assets/javascripts/materialize.js +12374 -0
  39. data/assets/stylesheets/materialize/components/_badges.scss +55 -0
  40. data/{app/assets → assets}/stylesheets/materialize/components/_buttons.scss +99 -58
  41. data/{app/assets → assets}/stylesheets/materialize/components/_cards.scss +14 -6
  42. data/{app/assets → assets}/stylesheets/materialize/components/_carousel.scss +12 -7
  43. data/{app/assets → assets}/stylesheets/materialize/components/_chips.scss +13 -6
  44. data/{app/assets → assets}/stylesheets/materialize/components/_collapsible.scss +16 -15
  45. data/assets/stylesheets/materialize/components/_color-classes.scss +32 -0
  46. data/{app/assets/stylesheets/materialize/components/_color.scss → assets/stylesheets/materialize/components/_color-variables.scss} +2 -44
  47. data/assets/stylesheets/materialize/components/_datepicker.scss +191 -0
  48. data/{app/assets → assets}/stylesheets/materialize/components/_dropdown.scss +35 -15
  49. data/{app/assets → assets}/stylesheets/materialize/components/_global.scss +96 -125
  50. data/{app/assets → assets}/stylesheets/materialize/components/_grid.scss +45 -36
  51. data/{app/assets → assets}/stylesheets/materialize/components/_icons-material-design.scss +0 -0
  52. data/{app/assets → assets}/stylesheets/materialize/components/_materialbox.scss +13 -12
  53. data/{app/assets → assets}/stylesheets/materialize/components/_modal.scss +7 -3
  54. data/{app/assets → assets}/stylesheets/materialize/components/_navbar.scss +29 -11
  55. data/assets/stylesheets/materialize/components/_normalize.scss +447 -0
  56. data/{app/assets → assets}/stylesheets/materialize/components/_preloader.scss +2 -2
  57. data/assets/stylesheets/materialize/components/_pulse.scss +34 -0
  58. data/{app/assets/stylesheets/materialize/components/_sideNav.scss → assets/stylesheets/materialize/components/_sidenav.scss} +47 -47
  59. data/{app/assets → assets}/stylesheets/materialize/components/_slider.scss +0 -0
  60. data/{app/assets → assets}/stylesheets/materialize/components/_table_of_contents.scss +5 -5
  61. data/{app/assets → assets}/stylesheets/materialize/components/_tabs.scss +10 -10
  62. data/assets/stylesheets/materialize/components/_tapTarget.scss +103 -0
  63. data/assets/stylesheets/materialize/components/_timepicker.scss +183 -0
  64. data/{app/assets → assets}/stylesheets/materialize/components/_toast.scss +7 -14
  65. data/{app/assets → assets}/stylesheets/materialize/components/_tooltip.scss +3 -3
  66. data/assets/stylesheets/materialize/components/_transitions.scss +13 -0
  67. data/{app/assets → assets}/stylesheets/materialize/components/_typography.scss +8 -9
  68. data/{app/assets → assets}/stylesheets/materialize/components/_variables.scss +65 -29
  69. data/assets/stylesheets/materialize/components/_waves.scss +114 -0
  70. data/{app/assets → assets}/stylesheets/materialize/components/forms/_checkboxes.scss +26 -46
  71. data/{app/assets → assets}/stylesheets/materialize/components/forms/_file-input.scss +6 -0
  72. data/{app/assets → assets}/stylesheets/materialize/components/forms/_forms.scss +0 -0
  73. data/{app/assets → assets}/stylesheets/materialize/components/forms/_input-fields.scss +131 -63
  74. data/assets/stylesheets/materialize/components/forms/_radio-buttons.scss +115 -0
  75. data/{app/assets → assets}/stylesheets/materialize/components/forms/_range.scss +35 -33
  76. data/{app/assets → assets}/stylesheets/materialize/components/forms/_select.scss +88 -19
  77. data/{app/assets → assets}/stylesheets/materialize/components/forms/_switches.scss +32 -21
  78. data/assets/stylesheets/materialize/extras/nouislider.css +406 -0
  79. data/{app/assets → assets}/stylesheets/materialize.scss +10 -9
  80. data/lib/materialize-sass/engine.rb +9 -7
  81. data/lib/materialize-sass/helpers.rb +38 -0
  82. data/lib/materialize-sass/version.rb +1 -1
  83. data/lib/materialize-sass.rb +13 -28
  84. data/materialize-sass.gemspec +5 -5
  85. metadata +97 -119
  86. data/app/assets/fonts/roboto/Roboto-Bold.eot +0 -0
  87. data/app/assets/fonts/roboto/Roboto-Bold.ttf +0 -0
  88. data/app/assets/fonts/roboto/Roboto-Bold.woff +0 -0
  89. data/app/assets/fonts/roboto/Roboto-Bold.woff2 +0 -0
  90. data/app/assets/fonts/roboto/Roboto-Light.eot +0 -0
  91. data/app/assets/fonts/roboto/Roboto-Light.ttf +0 -0
  92. data/app/assets/fonts/roboto/Roboto-Light.woff +0 -0
  93. data/app/assets/fonts/roboto/Roboto-Light.woff2 +0 -0
  94. data/app/assets/fonts/roboto/Roboto-Medium.eot +0 -0
  95. data/app/assets/fonts/roboto/Roboto-Medium.ttf +0 -0
  96. data/app/assets/fonts/roboto/Roboto-Medium.woff +0 -0
  97. data/app/assets/fonts/roboto/Roboto-Medium.woff2 +0 -0
  98. data/app/assets/fonts/roboto/Roboto-Regular.eot +0 -0
  99. data/app/assets/fonts/roboto/Roboto-Regular.ttf +0 -0
  100. data/app/assets/fonts/roboto/Roboto-Regular.woff +0 -0
  101. data/app/assets/fonts/roboto/Roboto-Regular.woff2 +0 -0
  102. data/app/assets/fonts/roboto/Roboto-Thin.eot +0 -0
  103. data/app/assets/fonts/roboto/Roboto-Thin.ttf +0 -0
  104. data/app/assets/fonts/roboto/Roboto-Thin.woff +0 -0
  105. data/app/assets/fonts/roboto/Roboto-Thin.woff2 +0 -0
  106. data/app/assets/javascripts/materialize/animation.js +0 -9
  107. data/app/assets/javascripts/materialize/buttons.js +0 -267
  108. data/app/assets/javascripts/materialize/cards.js +0 -26
  109. data/app/assets/javascripts/materialize/carousel.js +0 -454
  110. data/app/assets/javascripts/materialize/character_counter.js +0 -72
  111. data/app/assets/javascripts/materialize/chips.js +0 -289
  112. data/app/assets/javascripts/materialize/collapsible.js +0 -160
  113. data/app/assets/javascripts/materialize/date_picker/picker.date.js +0 -1430
  114. data/app/assets/javascripts/materialize/date_picker/picker.js +0 -1123
  115. data/app/assets/javascripts/materialize/dropdown.js +0 -265
  116. data/app/assets/javascripts/materialize/extras/nouislider.js +0 -1666
  117. data/app/assets/javascripts/materialize/extras/nouislider.min.js +0 -1
  118. data/app/assets/javascripts/materialize/forms.js +0 -682
  119. data/app/assets/javascripts/materialize/global.js +0 -98
  120. data/app/assets/javascripts/materialize/hammer.min.js +0 -1
  121. data/app/assets/javascripts/materialize/init.js +0 -174
  122. data/app/assets/javascripts/materialize/initial.js +0 -11
  123. data/app/assets/javascripts/materialize/jquery.easing.1.3.js +0 -205
  124. data/app/assets/javascripts/materialize/jquery.hammer.js +0 -33
  125. data/app/assets/javascripts/materialize/jquery.timeago.min.js +0 -1
  126. data/app/assets/javascripts/materialize/materialbox.js +0 -269
  127. data/app/assets/javascripts/materialize/modal.js +0 -184
  128. data/app/assets/javascripts/materialize/parallax.js +0 -58
  129. data/app/assets/javascripts/materialize/prism.js +0 -8
  130. data/app/assets/javascripts/materialize/pushpin.js +0 -71
  131. data/app/assets/javascripts/materialize/scrollFire.js +0 -48
  132. data/app/assets/javascripts/materialize/scrollspy.js +0 -284
  133. data/app/assets/javascripts/materialize/sideNav.js +0 -370
  134. data/app/assets/javascripts/materialize/slider.js +0 -321
  135. data/app/assets/javascripts/materialize/tabs.js +0 -164
  136. data/app/assets/javascripts/materialize/toasts.js +0 -137
  137. data/app/assets/javascripts/materialize/tooltip.js +0 -236
  138. data/app/assets/javascripts/materialize/transitions.js +0 -169
  139. data/app/assets/javascripts/materialize/velocity.min.js +0 -5
  140. data/app/assets/javascripts/materialize.js +0 -5
  141. data/app/assets/stylesheets/materialize/components/_mixins.scss +0 -5
  142. data/app/assets/stylesheets/materialize/components/_normalize.scss +0 -424
  143. data/app/assets/stylesheets/materialize/components/_prefixer.scss +0 -384
  144. data/app/assets/stylesheets/materialize/components/_roboto.scss +0 -49
  145. data/app/assets/stylesheets/materialize/components/_waves.scss +0 -177
  146. data/app/assets/stylesheets/materialize/components/date_picker/_default.date.scss +0 -435
  147. data/app/assets/stylesheets/materialize/components/date_picker/_default.scss +0 -201
  148. data/app/assets/stylesheets/materialize/components/date_picker/_default.time.scss +0 -125
  149. data/app/assets/stylesheets/materialize/components/forms/_radio-buttons.scss +0 -117
  150. data/app/assets/stylesheets/materialize/extras/nouislider.css +0 -259
@@ -22,10 +22,7 @@
22
22
  display: flex;
23
23
 
24
24
  .tab {
25
- -webkit-box-flex: 1;
26
- -webkit-flex-grow: 1;
27
- -ms-flex-positive: 1;
28
- flex-grow: 1;
25
+ flex-grow: 1;
29
26
  }
30
27
  }
31
28
 
@@ -48,6 +45,12 @@
48
45
  text-transform: uppercase;
49
46
 
50
47
  a {
48
+ &:focus,
49
+ &:focus.active {
50
+ background-color: transparentize($tabs-underline-color, .8);
51
+ outline: none;
52
+ }
53
+
51
54
  &:hover,
52
55
  &.active {
53
56
  background-color: transparent;
@@ -62,12 +65,12 @@
62
65
  font-size: 14px;
63
66
  text-overflow: ellipsis;
64
67
  overflow: hidden;
65
- transition: color .28s ease;
68
+ transition: color .28s ease, background-color .28s ease;
66
69
  }
67
70
 
68
71
  &.disabled a,
69
72
  &.disabled a:hover {
70
- color: rgba($tabs-text-color, .7);
73
+ color: rgba($tabs-text-color, .4);
71
74
  cursor: default;
72
75
  }
73
76
  }
@@ -80,15 +83,12 @@
80
83
  }
81
84
  }
82
85
 
83
- // Fixed sideNav hide on smaller
86
+ // Fixed Sidenav hide on smaller
84
87
  @media #{$medium-and-down} {
85
88
  .tabs {
86
89
  display: flex;
87
90
 
88
91
  .tab {
89
- -webkit-box-flex: 1;
90
- -webkit-flex-grow: 1;
91
- -ms-flex-positive: 1;
92
92
  flex-grow: 1;
93
93
 
94
94
  a {
@@ -0,0 +1,103 @@
1
+ .tap-target-wrapper {
2
+ width: 800px;
3
+ height: 800px;
4
+ position: fixed;
5
+ z-index: 1000;
6
+ visibility: hidden;
7
+ transition: visibility 0s .3s;
8
+ }
9
+
10
+ .tap-target-wrapper.open {
11
+ visibility: visible;
12
+ transition: visibility 0s;
13
+
14
+ .tap-target {
15
+ transform: scale(1);
16
+ opacity: .95;
17
+ transition:
18
+ transform .3s cubic-bezier(.42,0,.58,1),
19
+ opacity .3s cubic-bezier(.42,0,.58,1);
20
+ }
21
+
22
+ .tap-target-wave::before {
23
+ transform: scale(1);
24
+ }
25
+ .tap-target-wave::after {
26
+ visibility: visible;
27
+ animation: pulse-animation 1s cubic-bezier(0.24, 0, 0.38, 1) infinite;
28
+ transition:
29
+ opacity .3s,
30
+ transform .3s,
31
+ visibility 0s 1s;
32
+ }
33
+ }
34
+
35
+ .tap-target {
36
+ position: absolute;
37
+ font-size: 1rem;
38
+ border-radius: 50%;
39
+ background-color: $primary-color;
40
+ box-shadow: 0 20px 20px 0 rgba(0,0,0,0.14), 0 10px 50px 0 rgba(0,0,0,0.12), 0 30px 10px -20px rgba(0,0,0,0.2);
41
+ width: 100%;
42
+ height: 100%;
43
+ opacity: 0;
44
+ transform: scale(0);
45
+ transition:
46
+ transform .3s cubic-bezier(.42,0,.58,1),
47
+ opacity .3s cubic-bezier(.42,0,.58,1);
48
+ }
49
+
50
+ .tap-target-content {
51
+ position: relative;
52
+ display: table-cell;
53
+ }
54
+
55
+ .tap-target-wave {
56
+ &::before,
57
+ &::after {
58
+ content: '';
59
+ display: block;
60
+ position: absolute;
61
+ width: 100%;
62
+ height: 100%;
63
+ border-radius: 50%;
64
+ background-color: #ffffff;
65
+ }
66
+ &::before {
67
+ transform: scale(0);
68
+ transition: transform .3s;
69
+ }
70
+ &::after {
71
+ visibility: hidden;
72
+ transition:
73
+ opacity .3s,
74
+ transform .3s,
75
+ visibility 0s;
76
+ z-index: -1;
77
+ }
78
+
79
+ position: absolute;
80
+ border-radius: 50%;
81
+ z-index: 10001;
82
+ }
83
+
84
+ .tap-target-origin {
85
+ &:not(.btn),
86
+ &:not(.btn):hover {
87
+ background: none;
88
+ }
89
+
90
+ top: 50%;
91
+ left: 50%;
92
+ transform: translate(-50%,-50%);
93
+
94
+ z-index: 10002;
95
+ position: absolute !important;
96
+ }
97
+
98
+ @media only screen and (max-width: 600px) {
99
+ .tap-target, .tap-target-wrapper {
100
+ width: 600px;
101
+ height: 600px;
102
+ }
103
+ }
@@ -0,0 +1,183 @@
1
+ /* Timepicker Containers */
2
+ .timepicker-modal {
3
+ max-width: 325px;
4
+ max-height: none;
5
+ }
6
+
7
+ .timepicker-container.modal-content {
8
+ display: flex;
9
+ flex-direction: column;
10
+ padding: 0;
11
+ }
12
+
13
+ .text-primary {
14
+ color: rgba(255, 255, 255, 1);
15
+ }
16
+
17
+
18
+ /* Clock Digital Display */
19
+ .timepicker-digital-display {
20
+ flex: 1 auto;
21
+ background-color: $secondary-color;
22
+ padding: 10px;
23
+ font-weight: 300;
24
+ }
25
+
26
+ .timepicker-text-container {
27
+ font-size: 4rem;
28
+ font-weight: bold;
29
+ text-align: center;
30
+ color: rgba(255, 255, 255, 0.6);
31
+ font-weight: 400;
32
+ position: relative;
33
+ user-select: none;
34
+ }
35
+
36
+ .timepicker-span-hours,
37
+ .timepicker-span-minutes,
38
+ .timepicker-span-am-pm div {
39
+ cursor: pointer;
40
+ }
41
+
42
+ .timepicker-span-hours {
43
+ margin-right: 3px;
44
+ }
45
+
46
+ .timepicker-span-minutes {
47
+ margin-left: 3px;
48
+ }
49
+
50
+ .timepicker-display-am-pm {
51
+ font-size: 1.3rem;
52
+ position: absolute;
53
+ right: 1rem;
54
+ bottom: 1rem;
55
+ font-weight: 400;
56
+ }
57
+
58
+
59
+ /* Analog Clock Display */
60
+ .timepicker-analog-display {
61
+ flex: 2.5 auto;
62
+ }
63
+
64
+ .timepicker-plate {
65
+ background-color: $timepicker-clock-plate-bg;
66
+ border-radius: 50%;
67
+ width: 270px;
68
+ height: 270px;
69
+ overflow: visible;
70
+ position: relative;
71
+ margin: auto;
72
+ margin-top: 25px;
73
+ margin-bottom: 5px;
74
+ user-select: none;
75
+ }
76
+
77
+ .timepicker-canvas,
78
+ .timepicker-dial {
79
+ position: absolute;
80
+ left: 0;
81
+ right: 0;
82
+ top: 0;
83
+ bottom: 0;
84
+ }
85
+ .timepicker-minutes {
86
+ visibility: hidden;
87
+ }
88
+
89
+ .timepicker-tick {
90
+ border-radius: 50%;
91
+ color: $timepicker-clock-color;
92
+ line-height: 40px;
93
+ text-align: center;
94
+ width: 40px;
95
+ height: 40px;
96
+ position: absolute;
97
+ cursor: pointer;
98
+ font-size: 15px;
99
+ }
100
+
101
+ .timepicker-tick.active,
102
+ .timepicker-tick:hover {
103
+ background-color: transparentize($secondary-color, .75);
104
+ }
105
+ .timepicker-dial {
106
+ transition: transform 350ms, opacity 350ms;
107
+ }
108
+ .timepicker-dial-out {
109
+ &.timepicker-hours {
110
+ transform: scale(1.1, 1.1);
111
+ }
112
+
113
+ &.timepicker-minutes {
114
+ transform: scale(.8, .8);
115
+ }
116
+
117
+ opacity: 0;
118
+ }
119
+ .timepicker-canvas {
120
+ transition: opacity 175ms;
121
+
122
+ line {
123
+ stroke: $secondary-color;
124
+ stroke-width: 4;
125
+ stroke-linecap: round;
126
+ }
127
+ }
128
+ .timepicker-canvas-out {
129
+ opacity: 0.25;
130
+ }
131
+ .timepicker-canvas-bearing {
132
+ stroke: none;
133
+ fill: $secondary-color;
134
+ }
135
+ .timepicker-canvas-bg {
136
+ stroke: none;
137
+ fill: $secondary-color;
138
+ }
139
+
140
+
141
+ /* Footer */
142
+ .timepicker-footer {
143
+ margin: 0 auto;
144
+ padding: 5px 1rem;
145
+ display: flex;
146
+ justify-content: space-between;
147
+ }
148
+
149
+ .timepicker-clear {
150
+ color: $error-color;
151
+ }
152
+
153
+ .timepicker-close {
154
+ color: $secondary-color;
155
+ }
156
+
157
+ .timepicker-clear,
158
+ .timepicker-close {
159
+ padding: 0 20px;
160
+ }
161
+
162
+ /* Media Queries */
163
+ @media #{$medium-and-up} {
164
+ .timepicker-modal {
165
+ max-width: 600px;
166
+ }
167
+
168
+ .timepicker-container.modal-content {
169
+ flex-direction: row;
170
+ }
171
+
172
+ .timepicker-text-container {
173
+ top: 32%;
174
+ }
175
+
176
+ .timepicker-display-am-pm {
177
+ position: relative;
178
+ right: auto;
179
+ bottom: auto;
180
+ text-align: center;
181
+ margin-top: 1.2rem;
182
+ }
183
+ }
@@ -22,28 +22,28 @@
22
22
  .toast {
23
23
  @extend .z-depth-1;
24
24
  border-radius: 2px;
25
- top: 0;
25
+ top: 35px;
26
26
  width: auto;
27
- clear: both;
28
27
  margin-top: 10px;
29
28
  position: relative;
30
29
  max-width:100%;
31
30
  height: auto;
32
31
  min-height: $toast-height;
33
32
  line-height: 1.5em;
34
- word-break: break-all;
35
33
  background-color: $toast-color;
36
34
  padding: 10px 25px;
37
35
  font-size: 1.1rem;
38
36
  font-weight: 300;
39
37
  color: $toast-text-color;
40
-
41
38
  display: flex;
42
39
  align-items: center;
43
40
  justify-content: space-between;
41
+ cursor: default;
44
42
 
45
- .btn, .btn-flat {
46
- margin: 0;
43
+ .toast-action {
44
+ color: $toast-action-color;
45
+ font-weight: 500;
46
+ margin-right: -25px;
47
47
  margin-left: 3rem;
48
48
  }
49
49
 
@@ -52,14 +52,7 @@
52
52
  }
53
53
 
54
54
  @media #{$small-and-down} {
55
- width:100%;
55
+ width: 100%;
56
56
  border-radius: 0;
57
57
  }
58
- @media #{$medium-only} {
59
- float: left;
60
- }
61
- @media #{$large-and-up} {
62
- float: right;
63
- }
64
-
65
58
  }
@@ -8,7 +8,6 @@
8
8
  min-height: 36px;
9
9
  line-height: 120%;
10
10
  opacity: 0;
11
- display: none;
12
11
  position: absolute;
13
12
  text-align: center;
14
13
  max-width: calc(100% - 4px);
@@ -16,17 +15,18 @@
16
15
  left: 0;
17
16
  top: 0;
18
17
  pointer-events: none;
18
+ visibility: hidden;
19
+ background-color: #323232;
19
20
  }
20
21
 
21
22
  .backdrop {
22
23
  position: absolute;
23
24
  opacity: 0;
24
- display: none;
25
25
  height: 7px;
26
26
  width: 14px;
27
27
  border-radius: 0 0 50% 50%;
28
28
  background-color: #323232;
29
29
  z-index: -1;
30
30
  transform-origin: 50% 0%;
31
- transform: translate3d(0,0,0);
31
+ visibility: hidden;
32
32
  }
@@ -0,0 +1,13 @@
1
+ // Scale transition
2
+ .scale-transition {
3
+ &.scale-out {
4
+ transform: scale(0);
5
+ transition: transform .2s !important;
6
+ }
7
+
8
+ &.scale-in {
9
+ transform: scale(1);
10
+ }
11
+
12
+ transition: transform .3s cubic-bezier(0.53, 0.01, 0.36, 1.63) !important;
13
+ }
@@ -18,23 +18,23 @@ html{
18
18
  font-size: 15px;
19
19
  }
20
20
 
21
- font-family: "Roboto", sans-serif;
21
+ font-family: $font-stack;
22
22
  font-weight: normal;
23
23
  color: $off-black;
24
24
  }
25
25
  h1, h2, h3, h4, h5, h6 {
26
26
  font-weight: 400;
27
- line-height: 1.1;
27
+ line-height: 1.3;
28
28
  }
29
29
 
30
30
  // Header Styles
31
31
  h1 a, h2 a, h3 a, h4 a, h5 a, h6 a { font-weight: inherit; }
32
- h1 { font-size: $h1-fontsize; line-height: 110%; margin: ($h1-fontsize / 2) 0 ($h1-fontsize / 2.5) 0;}
33
- h2 { font-size: $h2-fontsize; line-height: 110%; margin: ($h2-fontsize / 2) 0 ($h2-fontsize / 2.5) 0;}
34
- h3 { font-size: $h3-fontsize; line-height: 110%; margin: ($h3-fontsize / 2) 0 ($h3-fontsize / 2.5) 0;}
35
- h4 { font-size: $h4-fontsize; line-height: 110%; margin: ($h4-fontsize / 2) 0 ($h4-fontsize / 2.5) 0;}
36
- h5 { font-size: $h5-fontsize; line-height: 110%; margin: ($h5-fontsize / 2) 0 ($h5-fontsize / 2.5) 0;}
37
- h6 { font-size: $h6-fontsize; line-height: 110%; margin: ($h6-fontsize / 2) 0 ($h6-fontsize / 2.5) 0;}
32
+ h1 { font-size: $h1-fontsize; line-height: 110%; margin: ($h1-fontsize / 1.5) 0 ($h1-fontsize / 2.5) 0;}
33
+ h2 { font-size: $h2-fontsize; line-height: 110%; margin: ($h2-fontsize / 1.5) 0 ($h2-fontsize / 2.5) 0;}
34
+ h3 { font-size: $h3-fontsize; line-height: 110%; margin: ($h3-fontsize / 1.5) 0 ($h3-fontsize / 2.5) 0;}
35
+ h4 { font-size: $h4-fontsize; line-height: 110%; margin: ($h4-fontsize / 1.5) 0 ($h4-fontsize / 2.5) 0;}
36
+ h5 { font-size: $h5-fontsize; line-height: 110%; margin: ($h5-fontsize / 1.5) 0 ($h5-fontsize / 2.5) 0;}
37
+ h6 { font-size: $h6-fontsize; line-height: 110%; margin: ($h6-fontsize / 1.5) 0 ($h6-fontsize / 2.5) 0;}
38
38
 
39
39
  // Text Styles
40
40
  em { font-style: italic; }
@@ -45,7 +45,6 @@ small { font-size: 75%; }
45
45
 
46
46
 
47
47
  .flow-text{
48
- font-weight: 300;
49
48
  $i: 0;
50
49
  @while $i <= $intervals {
51
50
  @media only screen and (min-width : 360 + ($i * $interval-size)) {