Skip to content
This repository has been archived by the owner on Aug 19, 2020. It is now read-only.

CD-46 image directories #24

Merged
merged 4 commits into from
Aug 13, 2018
Merged

CD-46 image directories #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1e19130
create img directory, move favicons, homescreen icons, icon folder co…
left23 Aug 13, 2018
131482c
update paths to img dir
left23 Aug 13, 2018
a671bfd
update path to img dir
left23 Aug 13, 2018
5cc45a1
resolve merge conflict in styles.css by regenerate
left23 Aug 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion css/styles.css
View file
Open in desktop

Large diffs are not rendered by default.

0 android-chrome-192x192.png → img/android-chrome-192x192.png
View file
Open in desktop
File renamed without changes
0 android-chrome-512x512.png → img/android-chrome-512x512.png
View file
Open in desktop
File renamed without changes
0 apple-touch-icon.png → img/apple-touch-icon.png
View file
Open in desktop
File renamed without changes
0 favicon-16x16.png → img/favicon-16x16.png
View file
Open in desktop
File renamed without changes
0 favicon-32x32.png → img/favicon-32x32.png
View file
Open in desktop
File renamed without changes
0 icons/selection.json → img/icons/selection.json
View file
Open in desktop
File renamed without changes.
0 icons/unocha-icons.eot → img/icons/unocha-icons.eot
View file
Open in desktop
File renamed without changes.
0 icons/unocha-icons.svg → img/icons/unocha-icons.svg
View file
Open in desktop
File renamed without changes
0 icons/unocha-icons.ttf → img/icons/unocha-icons.ttf
View file
Open in desktop
File renamed without changes.
0 icons/unocha-icons.woff → img/icons/unocha-icons.woff
View file
Open in desktop
File renamed without changes.
0 logos/logos-sprite.png → img/logos/logos-sprite.png
View file
Open in desktop
File renamed without changes
0 logos/logos-sprite.svg → img/logos/logos-sprite.svg
View file
Open in desktop
File renamed without changes
0 logos/ocha-logo-mobile.png → img/logos/ocha-logo-mobile.png
View file
Open in desktop
File renamed without changes
0 logos/ocha-logo-mobile.svg → img/logos/ocha-logo-mobile.svg
View file
Open in desktop
File renamed without changes
0 logos/ocha-logo-white.png → img/logos/ocha-logo-white.png
View file
Open in desktop
File renamed without changes
0 logos/ocha-logo-white.svg → img/logos/ocha-logo-white.svg
View file
Open in desktop
File renamed without changes
0 logos/ocha-logo.png → img/logos/ocha-logo.png
View file
Open in desktop
File renamed without changes
0 logos/ocha-logo.svg → img/logos/ocha-logo.svg
View file
Open in desktop
File renamed without changes
0 mstile-144x144.png → img/mstile-144x144.png
View file
Open in desktop
File renamed without changes
0 mstile-150x150.png → img/mstile-150x150.png
View file
Open in desktop
File renamed without changes
0 mstile-310x150.png → img/mstile-310x150.png
View file
Open in desktop
File renamed without changes
0 mstile-310x310.png → img/mstile-310x310.png
View file
Open in desktop
File renamed without changes
0 mstile-70x70.png → img/mstile-70x70.png
View file
Open in desktop
File renamed without changes
0 safari-pinned-tab.svg → img/safari-pinned-tab.svg
View file
Open in desktop
File renamed without changes
10 changes: 5 additions & 5 deletions sass/cd/_cd-icons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

@font-face {
font-family: 'unocha-icons';
src: url('../icons/unocha-icons.eot?jb5mn9');
src: url('../icons/unocha-icons.eot?jb5mn9#iefix') format('embedded-opentype'),
url('../icons/unocha-icons.ttf?jb5mn9') format('truetype'),
url('../icons/unocha-icons.woff?jb5mn9') format('woff'),
url('../icons/unocha-icons.svg?jb5mn9#unocha-icons') format('svg');
src: url('../img/icons/unocha-icons.eot?jb5mn9');
src: url('../img/icons/unocha-icons.eot?jb5mn9#iefix') format('embedded-opentype'),
url('../img/icons/unocha-icons.ttf?jb5mn9') format('truetype'),
url('../img/icons/unocha-icons.woff?jb5mn9') format('woff'),
url('../img/icons/unocha-icons.svg?jb5mn9#unocha-icons') format('svg');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

irony, fonts in an image directory 🙃

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ha. I thought the same to myself. Not for long though :)

font-weight: normal;
font-style: normal;
}
Expand Down
4 changes: 2 additions & 2 deletions sass/cd/cd-footer/_cd-mandate.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
}

.cd-mandate__logo {
background: url('../logos/ocha-logo-white.svg') 0 center no-repeat;
background: url('../img/logos/ocha-logo-white.svg') 0 center no-repeat;
display: block;
height: 33px;
width: 135px;
margin: 0 auto;

.no-svg & {
background: url('../logos/ocha-logo-white.png') 0 center no-repeat;
background: url('../img/logos/ocha-logo-white.png') 0 center no-repeat;
}
}

Expand Down
8 changes: 4 additions & 4 deletions sass/cd/cd-header/_cd-logo.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
}

.cd-site-logo {
background: url('../logos/ocha-logo-mobile.svg') center no-repeat;
background: url('../img/logos/ocha-logo-mobile.svg') center no-repeat;
display: block;
width: 52px;
height: $cd-site-header-height;
Expand All @@ -21,17 +21,17 @@
}

.no-svg & {
background: url('../logos/ocha-logo-mobile.png') center no-repeat;
background: url('../img/logos/ocha-logo-mobile.png') center no-repeat;
}
}

@include tablet {
.cd-site-logo {
background: url('../logos/ocha-logo.svg') center no-repeat;
background: url('../img/logos/ocha-logo.svg') center no-repeat;
width: 186px; // width may need to be adjusted depending on logo width.

.no-svg & {
background: url('../logos/ocha-logo-mobile.png') center no-repeat;
background: url('../img/logos/ocha-logo-mobile.png') center no-repeat;
}
}
}
8 changes: 4 additions & 4 deletions sass/cd/cd-header/_cd-sites-menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
}

.cd-sites-btn__logo {
background: url('../logos/logos-sprite.svg') 0 -144px no-repeat;
background: url('../img/logos/logos-sprite.svg') 0 -144px no-repeat;
display: inline-block;
flex-shrink: 0;
height: 18px;
margin-right: 4px;
width: 21px;

.no-svg & {
background: url('../logos/logos-sprite.png') 0 -144px no-repeat;
background: url('../img/logos/logos-sprite.png') 0 -144px no-repeat;
}
}

Expand Down Expand Up @@ -95,15 +95,15 @@
}

.cd-sites-dropdown__logo {
background: url('../logos/logos-sprite.svg') 0 0 no-repeat;
background: url('../img/logos/logos-sprite.svg') 0 0 no-repeat;
display: inline-block;
height: 18px;
margin-left: 24px;
position: relative;
width: 82px;

.no-svg & {
background: url('../logos/logos-sprite.png') 0 0 no-repeat;
background: url('../img/logos/logos-sprite.png') 0 0 no-repeat;
}

&:before {
Expand Down
12 changes: 6 additions & 6 deletions template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function ocha_basic_preprocess_html(&$vars) {
$apple = array(
'#tag' => 'link',
'#attributes' => array(
'href' => base_path() . path_to_theme() . '/apple-touch-icon.png',
'href' => base_path() . path_to_theme() . '/img/apple-touch-icon.png',
'rel' => 'apple-touch-icon',
'sizes' => '180x180',
),
Expand All @@ -60,7 +60,7 @@ function ocha_basic_preprocess_html(&$vars) {
$fav_32 = array(
'#tag' => 'link',
'#attributes' => array(
'href' => base_path() . path_to_theme() . '/favicon-32x32.png',
'href' => base_path() . path_to_theme() . '/img/favicon-32x32.png',
'rel' => 'icon',
'sizes' => '32x32',
'type' => 'image/png',
Expand All @@ -70,7 +70,7 @@ function ocha_basic_preprocess_html(&$vars) {
$fav_16 = array(
'#tag' => 'link',
'#attributes' => array(
'href' => base_path() . path_to_theme() . '/favicon-16x16.png',
'href' => base_path() . path_to_theme() . '/img/favicon-16x16.png',
'rel' => 'icon',
'sizes' => '16x16',
'type' => 'image/png',
Expand All @@ -80,7 +80,7 @@ function ocha_basic_preprocess_html(&$vars) {
$safari_pinned_tab = array(
'#tag' => 'link',
'#attributes' => array(
'href' => base_path() . path_to_theme() . '/safari-pinned-tab.svg',
'href' => base_path() . path_to_theme() . '/img/safari-pinned-tab.svg',
'rel' => 'mask-icon',
'color' => '#5bbad5',
),
Expand Down Expand Up @@ -120,12 +120,12 @@ function ocha_basic_pwa_manifest_alter(&$manifest) {
// to your heart's content.
$manifest['icons'] = [
[
'src' => url(drupal_get_path('theme', 'ocha_basic') . '/android-chrome-512x512.png'),
'src' => url(drupal_get_path('theme', 'ocha_basic') . '/img/android-chrome-512x512.png'),
'sizes' => '512x512',
'type' => 'image/png',
],
[
'src' => url(drupal_get_path('theme', 'ocha_basic') . '/android-chrome-192x192.png'),
'src' => url(drupal_get_path('theme', 'ocha_basic') . '/img/android-chrome-192x192.png'),
'sizes' => '192x192',
'type' => 'image/png',
],
Expand Down