Skip to content

Commit 23d69d0

Browse files
committed
Move images to more descriptive locations
Also remove the inoperable `asset` function set from _functions.scss
1 parent fbcc355 commit 23d69d0

File tree

16 files changed

+19
-49
lines changed

16 files changed

+19
-49
lines changed

dynamic/css/abstracts/_functions.scss

-30
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,6 @@
33
/// ===============================
44
////
55

6-
/// Native `url(..)` function wrapper
7-
/// @author Hugo Giraudel
8-
/// @param {String} $type - asset type folder (e.g. `fonts/`)
9-
/// @param {String} $path - asset path
10-
/// @param {String} $base [$base-url] - base URL for the asset
11-
/// @return {Url}
12-
@function asset($type, $path, $base: $base-url) {
13-
@return url($base + $type + $path);
14-
}
15-
16-
/// Returns URL to an image based on its path
17-
/// @author Hugo Giraudel
18-
/// @param {String} $path - image path
19-
/// @param {String} $base [$base-url] - base URL
20-
/// @return {Url}
21-
/// @require $base-url
22-
@function image($path, $base: $base-url) {
23-
@return asset($base, 'images/', $path);
24-
}
25-
26-
/// Returns URL to a font based on its path
27-
/// @author Hugo Giraudel
28-
/// @param {String} $path - font path
29-
/// @param {String} $base [$base-url] - base URL
30-
/// @return {Url}
31-
/// @require $base-url
32-
@function font($path, $base: $base-url) {
33-
@return asset($base, 'fonts/', $path);
34-
}
35-
366

377
/// Converts a px value to rem (base on the default font size of 16px)
388
/// @author Drew Pirrone-Brusse

dynamic/css/base/_base.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ a {
110110
width : p2r(12px); /* 2 */
111111
height : p2r(10px);
112112
margin-right : p2r(-1px); /* 3 */
113-
// background : inline-image('layout/external.png') no-repeat right; /* 1 */
113+
// background : inline-image('/images/elements/external.png') no-repeat right; /* 1 */
114114
background : url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAUklEQVR42m3O0QkAMQgD0JvWNZzDndwpRz5SepcIQWof6APgk+5GiKOZwa8EHTMGqwp3ONzdDFUXYufbYES6WVCfHB7EuW5mF7R1goqgVYQhBl+awCunCZHg2gAAAABJRU5ErkJggg==') no-repeat right;
115115
}
116116
}
@@ -130,7 +130,7 @@ a {
130130
display : inline-block;
131131
width : p2r(16px); /* 2 */
132132
height : p2r(16px);
133-
// background : inline-image("layout/pdf.png") no-repeat right; /* 1 */
133+
// background : inline-image('/images/elements/pdf.png') no-repeat right; /* 1 */
134134
background: url('data:image/png;base64,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') no-repeat right;
135135
}
136136
}

dynamic/css/components/_social-button.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
height : 42px;
2424
width : 42px;
2525

26-
background-image : url('/images/social_media/social-sprite.png');
26+
background-image : url('/images/index/social-sprite.png');
2727
background-repeat : no-repeat;
2828
background-position-y : 0;
2929

@@ -38,7 +38,7 @@
3838
height : 42px;
3939
width : 42px;
4040

41-
background-image : url('/images/social_media/social-sprite.png');
41+
background-image : url('/images/index/social-sprite.png');
4242
background-repeat : no-repeat;
4343
background-position-y : -42px;
4444

dynamic/css/layout/_banner.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// Padding for the top-level element
88
$banner-padding-left-md-up : ($content-nav-padding-left + 0.5rem);
99

10-
// Basho Docs Logo -- Assumed to wrap /images/layout/basho_docs_logo.png
10+
// Basho Docs Logo -- Assumed to wrap /images/branding/basho_docs_logo.png
1111
// The native size of this image is 312px x 69px. Scale it to ~48% for the
1212
// sm-down layouts, and ~52% for the md-up.
1313
$banner-logo-width-sm-down : p2r(150px);
@@ -49,7 +49,7 @@ $banner-background-secondary : $gray-45;
4949

5050
/**
5151
* Basho Docs Logo
52-
* Assumed to wrap a <img src="/images/layout/basho_docs_logo.png"> element.
52+
* Assumed to wrap a <img src="/images/branding/basho_docs_logo.png"> element.
5353
* 1. For sm-down layouts, center this element in the banner.
5454
* 2. For md-up, revert the positioning to static upper-left, and apply a
5555
* padding to manually push the image text to just below the intra-brand

dynamic/css/pages/index.scss

+3-3
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@
251251
font-size : 1.2rem;
252252

253253
@include wide-from('lg') {
254-
background : url(/images/index/highlights-bg-split.jpg) left/cover;
254+
background : url('/images/index/highlights-bg-split.jpg') left/cover;
255255
}
256256
}
257257
.highlight__container {
@@ -311,7 +311,7 @@
311311
color : $light-background-warm;
312312

313313
background-color : $cyan-darker;
314-
background : url(/images/index/highlights-bg-dark.jpg);
314+
background : url('/images/index/highlights-bg-dark.jpg');
315315

316316
.highlight__link {
317317
color : $light-background-warm;
@@ -342,7 +342,7 @@
342342
color : $cyan-darker;
343343

344344
background-color : $light-background-warm;
345-
background : url(/images/index/highlights-bg-light.jpg) repeat;
345+
background : url('/images/index/highlights-bg-light.jpg') repeat;
346346

347347
.highlight__link {
348348
color : $cyan-darker;

layouts/index.html

+7-7
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<meta charset="utf-8">
1919
<meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
2020
<meta name="viewport" content="width=device-width">
21-
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
21+
<link rel="shortcut icon" href="/images/branding/favicon.ico" type="image/x-icon" />
2222

2323
<title>Basho Documentation</title>
2424

@@ -68,8 +68,8 @@ <h1><strong>Welcome to the <br class="hidden-md-up"> Basho Docs</strong></h1>
6868
<a class="block product__card" href="/riak/kv/latest/">
6969
<span class="inline-block product__title"><!--
7070
--><span class="inline-block product__logo product__logo--invertible"><!--
71-
--><img class="logo logo--primary" src="/images/index/riak-logo.png"><!--
72-
--><img class="logo logo--inverted" src="/images/index/riak-logo-inverted.png"><!--
71+
--><img class="logo logo--primary" src="/images/branding/riak-logo.png"><!--
72+
--><img class="logo logo--inverted" src="/images/branding/riak-logo-inverted.png"><!--
7373
--></span><!--
7474
-->Riak<span class="product__title-highlight">KV</span><!--
7575
--></span>
@@ -82,8 +82,8 @@ <h1><strong>Welcome to the <br class="hidden-md-up"> Basho Docs</strong></h1>
8282
<a class="block product__card" href="/riak/ts/latest/">
8383
<span class="inline-block product__title"><!--
8484
--><span class="inline-block product__logo product__logo--invertible"><!--
85-
--><img class="logo logo--primary" src="/images/index/riak-logo.png"><!--
86-
--><img class="logo logo--inverted" src="/images/index/riak-logo-inverted.png"><!--
85+
--><img class="logo logo--primary" src="/images/branding/riak-logo.png"><!--
86+
--><img class="logo logo--inverted" src="/images/branding/riak-logo-inverted.png"><!--
8787
--></span><!--
8888
-->Riak<span class="product__title-highlight">TS</span><!--
8989
--></span>
@@ -96,8 +96,8 @@ <h1><strong>Welcome to the <br class="hidden-md-up"> Basho Docs</strong></h1>
9696
<a class="block product__card" href="/riak/cs/latest/">
9797
<span class="inline-block product__title"><!--
9898
--><span class="inline-block product__logo product__logo--invertible"><!--
99-
--><img class="logo logo--primary" src="/images/index/riak-logo.png"><!--
100-
--><img class="logo logo--inverted" src="/images/index/riak-logo-inverted.png"><!--
99+
--><img class="logo logo--primary" src="/images/branding/riak-logo.png"><!--
100+
--><img class="logo logo--inverted" src="/images/branding/riak-logo-inverted.png"><!--
101101
--></span><!--
102102
-->Riak<span class="product__title-highlight">CS</span><!--
103103
--></span>

layouts/partials/banner.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<!-- Docs logo -->
2323
<div class="float-left banner__docs-logo">
24-
<a href="/index.html" class="block docs-logo"><img class="docs-logo__image" src="/images/layout/basho_docs_logo.png"></a>
24+
<a href="/index.html" class="block docs-logo"><img class="docs-logo__image" src="/images/branding/basho_docs_logo.png"></a>
2525
</div>
2626

2727

layouts/partials/content-navigation.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
{{ if $project_name_html }}
4141
<a class="inline-block float-left product__title" href="/"><!--
42-
--><img class="product__logo" src="/images/index/riak-logo.png"><!--
42+
--><img class="product__logo" src="/images/branding/riak-logo.png"><!--
4343
-->{{ $project_name_html | safeHTML }}
4444
</a>
4545
{{ end }}

layouts/partials/head.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<meta charset="utf-8">
1818
<meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
1919
<meta name="viewport" content="width=device-width">
20-
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
20+
<link rel="shortcut icon" href="/images/branding/favicon.ico" type="image/x-icon" />
2121

2222
<title>{{ if $title_supertext }}{{ $title_supertext }} {{ end }}{{ $title }}</title>
2323

File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)