Skip to content

Commit 67762fb

Browse files
Migrated _sass code to fix deprecation warnings. (Phlow#262)
Thank you so much for your work @RemcoSchrijver! I don't care so much about the formatting. If it works, that's great for me. And the version of the foundation framework is outdated nowadays and even the actual version isn't truly supported anymore. So thankyouverymuch from Cologne/Germany, Moritz
1 parent 2dd89bd commit 67762fb

15 files changed

+1317
-639
lines changed

.ruby-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.0.6

Gemfile.lock

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.8.4)
4+
addressable (2.8.5)
55
public_suffix (>= 2.0.2, < 6.0)
66
asciidoctor (1.5.8)
77
coderay (1.1.1)
@@ -17,7 +17,7 @@ GEM
1717
faraday-net_http (3.0.2)
1818
ffi (1.15.5)
1919
forwardable-extended (2.6.0)
20-
google-protobuf (3.23.4)
20+
google-protobuf (3.23.4-x86_64-linux)
2121
http_parser.rb (0.8.0)
2222
i18n (1.14.1)
2323
concurrent-ruby (~> 1.0)
@@ -66,11 +66,11 @@ GEM
6666
rb-fsevent (0.11.2)
6767
rb-inotify (0.10.1)
6868
ffi (~> 1.0)
69-
rexml (3.2.5)
70-
rouge (4.1.2)
69+
rexml (3.2.6)
70+
rouge (4.1.3)
7171
ruby2_keywords (0.0.5)
7272
safe_yaml (1.0.5)
73-
sass-embedded (1.63.6)
73+
sass-embedded (1.64.2)
7474
google-protobuf (~> 3.23)
7575
rake (>= 13.0.0)
7676
sawyer (0.9.2)
@@ -82,7 +82,7 @@ GEM
8282
webrick (1.8.1)
8383

8484
PLATFORMS
85-
ruby
85+
x86_64-linux
8686

8787
DEPENDENCIES
8888
asciidoctor (~> 1.5.4)
@@ -93,4 +93,4 @@ DEPENDENCIES
9393
jekyll-paginate
9494

9595
BUNDLED WITH
96-
1.17.1
96+
2.4.18

_sass/_03_settings_mixins_media_queries.scss

Lines changed: 117 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ $base-font-size: 100% !default;
2929
//
3030
// We use this to control border radius.
3131
// $radius - Default: $global-radius || 4px
32-
@mixin radius($radius:$global-radius) {
32+
@mixin radius($radius: $global-radius) {
3333
@if $radius {
3434
border-radius: $radius;
3535
}
@@ -39,13 +39,15 @@ $base-font-size: 100% !default;
3939
//
4040
// We use this to create equal side border radius on elements.
4141
// $side - Options: left, right, top, bottom
42-
@mixin side-radius($side, $radius:$global-radius) {
43-
@if ($side == left or $side == right) {
42+
@mixin side-radius($side, $radius: $global-radius) {
43+
@if ($side ==left or $side ==right) {
4444
-webkit-border-bottom-#{$side}-radius: $radius;
4545
-webkit-border-top-#{$side}-radius: $radius;
4646
border-bottom-#{$side}-radius: $radius;
4747
border-top-#{$side}-radius: $radius;
48-
} @else {
48+
}
49+
50+
@else {
4951
-webkit-#{$side}-left-radius: $radius;
5052
-webkit-#{$side}-right-radius: $radius;
5153
border-#{$side}-left-radius: $radius;
@@ -57,11 +59,14 @@ $base-font-size: 100% !default;
5759
//
5860
// We can control whether or not we have inset shadows edges.
5961
// $active - Default: true, Options: false
60-
@mixin inset-shadow($active:true) {
62+
@mixin inset-shadow($active: true) {
6163
box-shadow: $shiny-edge-size $shiny-edge-color inset;
6264

63-
@if $active { &:active {
64-
box-shadow: $shiny-edge-size $shiny-edge-active-color inset; } }
65+
@if $active {
66+
&:active {
67+
box-shadow: $shiny-edge-size $shiny-edge-active-color inset;
68+
}
69+
}
6570
}
6671

6772
// @mixins
@@ -70,17 +75,17 @@ $base-font-size: 100% !default;
7075
// $property - Default: all, Options: http://www.w3.org/TR/css3-transitions/#animatable-properties
7176
// $speed - Default: 300ms
7277
// $ease - Default:ease-out, Options: http://css-tricks.com/almanac/properties/t/transition-timing-function/
73-
@mixin single-transition($property:all, $speed:300ms, $ease:ease-out) {
78+
@mixin single-transition($property: all, $speed: 300ms, $ease: ease-out) {
7479
transition: $property $speed $ease;
7580
}
7681

7782
// @mixins
7883
//
7984
// We use this to add box-sizing across browser prefixes
80-
@mixin box-sizing($type:border-box) {
85+
@mixin box-sizing($type: border-box) {
8186
-webkit-box-sizing: $type; // Android < 2.3, iOS < 4
82-
-moz-box-sizing: $type; // Firefox < 29
83-
box-sizing: $type; // Chrome, IE 8+, Opera, Safari 5.1
87+
-moz-box-sizing: $type; // Firefox < 29
88+
box-sizing: $type; // Chrome, IE 8+, Opera, Safari 5.1
8489
}
8590

8691
// @mixins
@@ -95,19 +100,23 @@ $base-font-size: 100% !default;
95100
width: 0;
96101
height: 0;
97102
border: inset $triangle-size;
98-
@if ($triangle-direction == top) {
103+
104+
@if ($triangle-direction ==top) {
99105
border-color: $triangle-color transparent transparent transparent;
100106
border-top-style: solid;
101107
}
102-
@if ($triangle-direction == bottom) {
108+
109+
@if ($triangle-direction ==bottom) {
103110
border-color: transparent transparent $triangle-color transparent;
104111
border-bottom-style: solid;
105112
}
106-
@if ($triangle-direction == left) {
113+
114+
@if ($triangle-direction ==left) {
107115
border-color: transparent transparent transparent $triangle-color;
108116
border-left-style: solid;
109117
}
110-
@if ($triangle-direction == right) {
118+
119+
@if ($triangle-direction ==right) {
111120
border-color: transparent $triangle-color transparent transparent;
112121
border-right-style: solid;
113122
}
@@ -135,29 +144,33 @@ $base-font-size: 100% !default;
135144
@if $top {
136145
top: $top;
137146
}
147+
138148
@else {
139149
top: 50%;
140150
margin-top: (-$width/2);
141151
}
152+
142153
@if $left {
143154
left: $left;
144155
}
156+
145157
@else {
146158
left: ($tabbar-menu-icon-width - $width)/2;
147159
}
148160
}
161+
149162
@else {
150163
top: 50%;
151164
margin-top: -($width/2);
152165
#{$opposite-direction}: $topbar-link-padding;
153166
}
154167

155-
box-shadow:
156-
0 0 0 $thickness $color,
157-
0 $gap + $thickness 0 $thickness $color,
158-
0 (2 * $gap + 2*$thickness) 0 $thickness $color;
168+
box-shadow: 0 0 0 $thickness $color,
169+
0 ($gap + $thickness) 0 $thickness $color,
170+
0 (2 * $gap + 2*$thickness) 0 $thickness $color;
159171
width: $width;
160172
}
173+
161174
span:hover:after {
162175
box-shadow:
163176
0 0 0 $thickness $hover-color,
@@ -168,8 +181,16 @@ $base-font-size: 100% !default;
168181

169182
// We use this to do clear floats
170183
@mixin clearfix {
171-
&:before, &:after { content: " "; display: table; }
172-
&:after { clear: both; }
184+
185+
&:before,
186+
&:after {
187+
content: " ";
188+
display: table;
189+
}
190+
191+
&:after {
192+
clear: both;
193+
}
173194
}
174195

175196
// @mixins
@@ -178,7 +199,7 @@ $base-font-size: 100% !default;
178199
// $selector - Used for selector state. Default: focus, Options: hover, active, visited
179200
// $fade-time - Default: 300ms
180201
// $glowing-effect-color - Default: fade-out($primary-color, .25)
181-
@mixin block-glowing-effect($selector:focus, $fade-time:300ms, $glowing-effect-color:fade-out($primary-color, .25)) {
202+
@mixin block-glowing-effect($selector: focus, $fade-time: 300ms, $glowing-effect-color: fade-out($primary-color, .25)) {
182203
transition: box-shadow $fade-time, border-color $fade-time ease-in-out;
183204

184205
&:#{$selector} {
@@ -192,8 +213,8 @@ $base-font-size: 100% !default;
192213
// We use this to translate elements in 2D
193214
// $horizontal: Default: 0
194215
// $vertical: Default: 0
195-
@mixin translate2d($horizontal:0, $vertical:0) {
196-
transform: translate($horizontal,$vertical)
216+
@mixin translate2d($horizontal: 0, $vertical: 0) {
217+
transform: translate($horizontal, $vertical)
197218
}
198219

199220
// @mixins
@@ -224,10 +245,13 @@ $base-font-size: 100% !default;
224245
$text-direction: ltr !default;
225246
$default-float: left !default;
226247
$opposite-direction: right !default;
227-
@if $text-direction == ltr {
248+
249+
@if $text-direction ==ltr {
228250
$default-float: left;
229251
$opposite-direction: right;
230-
} @else {
252+
}
253+
254+
@else {
231255
$default-float: right;
232256
$opposite-direction: left;
233257
}
@@ -250,11 +274,26 @@ $column-gutter: rem-calc(30) !default;
250274
// d. Media Query Ranges
251275
// - - - - - - - - - - - - - - - - - - - - - - - - -
252276

253-
$small-range: (0em, 40em);
254-
$medium-range: (40.063em, 64em);
255-
$large-range: (64.063em, 90em);
256-
$xlarge-range: (90.063em, 120em);
257-
$xxlarge-range: (120.063em, 99999999em);
277+
$small-range: (
278+
0em,
279+
40em
280+
);
281+
$medium-range: (
282+
40.063em,
283+
64em
284+
);
285+
$large-range: (
286+
64.063em,
287+
90em
288+
);
289+
$xlarge-range: (
290+
90.063em,
291+
120em
292+
);
293+
$xxlarge-range: (
294+
120.063em,
295+
99999999em
296+
);
258297

259298

260299
$screen: "only screen" !default;
@@ -293,7 +332,7 @@ $cursor-text-value: text !default;
293332

294333
@include exports("global") {
295334

296-
// Meta styles are included in all builds, as they are a dependancy of the Javascript.
335+
// Meta styles are included in all builds, as they are a dependency of the Javascript.
297336
// Used to provide media query values for javascript components.
298337
// Forward slash placed around everything to convince PhantomJS to read the value.
299338

@@ -353,7 +392,10 @@ $cursor-text-value: text !default;
353392
@if $include-html-global-classes {
354393

355394
// Must be 100% for off canvas to work
356-
html, body { height: 100%; }
395+
html,
396+
body {
397+
height: 100%;
398+
}
357399

358400
// Set box-sizing globally to handle padding and border widths
359401
*,
@@ -363,7 +405,9 @@ $cursor-text-value: text !default;
363405
}
364406

365407
html,
366-
body { font-size: $base-font-size; }
408+
body {
409+
font-size: $base-font-size;
410+
}
367411

368412
// Default body styles
369413
body {
@@ -379,25 +423,42 @@ $cursor-text-value: text !default;
379423
cursor: $cursor-auto-value;
380424
}
381425

382-
a:hover { cursor: $cursor-pointer-value; }
426+
a:hover {
427+
cursor: $cursor-pointer-value;
428+
}
383429

384430
// Grid Defaults to get images and embeds to work properly
385-
img { max-width: 100%; height: auto; }
431+
img {
432+
max-width: 100%;
433+
height: auto;
434+
}
386435

387-
img { -ms-interpolation-mode: bicubic; }
436+
img {
437+
-ms-interpolation-mode: bicubic;
438+
}
388439

389440
#map_canvas,
390441
.map_canvas {
442+
391443
img,
392444
embed,
393-
object { max-width: none !important;
445+
object {
446+
max-width: none !important;
394447
}
395448
}
396449

397450
// Miscellaneous useful HTML classes
398-
.left { float: left !important; }
399-
.right { float: right !important; }
400-
.clearfix { @include clearfix; }
451+
.left {
452+
float: left !important;
453+
}
454+
455+
.right {
456+
float: right !important;
457+
}
458+
459+
.clearfix {
460+
@include clearfix;
461+
}
401462

402463
// Hide visually and from screen readers
403464
.hide {
@@ -406,13 +467,18 @@ $cursor-text-value: text !default;
406467
}
407468

408469
// Hide visually and from screen readers, but maintain layout
409-
.invisible { visibility: hidden; }
470+
.invisible {
471+
visibility: hidden;
472+
}
410473

411474
// Font smoothing
412475
// Antialiased font smoothing works best for light text on a dark background.
413476
// Apply to single elements instead of globally to body.
414477
// Note this only applies to webkit-based desktop browsers and Firefox 25 (and later) on the Mac.
415-
.antialiased { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; }
478+
.antialiased {
479+
-webkit-font-smoothing: antialiased;
480+
-moz-osx-font-smoothing: grayscale;
481+
}
416482

417483
// Get rid of gap under images by making them display: inline-block; by default
418484
img {
@@ -425,9 +491,14 @@ $cursor-text-value: text !default;
425491
//
426492

427493
// Make sure textarea takes on height automatically
428-
textarea { height: auto; min-height: 50px; }
494+
textarea {
495+
height: auto;
496+
min-height: 50px;
497+
}
429498

430499
// Make select elements 100% width by default
431-
select { width: 100%; }
500+
select {
501+
width: 100%;
502+
}
432503
}
433-
}
504+
}

0 commit comments

Comments
 (0)