diff --git a/app/assets/images/favicons/google_branding/logo_docs_128px.png b/app/assets/images/favicons/google_branding/logo_docs_128px.png deleted file mode 100644 index a1c4e5f7bd5..00000000000 Binary files a/app/assets/images/favicons/google_branding/logo_docs_128px.png and /dev/null differ diff --git a/app/assets/images/favicons/google_branding/logo_docs_48px.png b/app/assets/images/favicons/google_branding/logo_docs_48px.png new file mode 100644 index 00000000000..f1fe798f0ef Binary files /dev/null and b/app/assets/images/favicons/google_branding/logo_docs_48px.png differ diff --git a/app/assets/images/favicons/google_branding/logo_drive_128px.png b/app/assets/images/favicons/google_branding/logo_drive_128px.png deleted file mode 100644 index 0eb48a7469f..00000000000 Binary files a/app/assets/images/favicons/google_branding/logo_drive_128px.png and /dev/null differ diff --git a/app/assets/images/favicons/google_branding/logo_drive_48px.png b/app/assets/images/favicons/google_branding/logo_drive_48px.png new file mode 100644 index 00000000000..ff595ca1e70 Binary files /dev/null and b/app/assets/images/favicons/google_branding/logo_drive_48px.png differ diff --git a/app/assets/images/favicons/google_branding/logo_forms_128px.png b/app/assets/images/favicons/google_branding/logo_forms_128px.png deleted file mode 100644 index 621321b0cf7..00000000000 Binary files a/app/assets/images/favicons/google_branding/logo_forms_128px.png and /dev/null differ diff --git a/app/assets/images/favicons/google_branding/logo_forms_48px.png b/app/assets/images/favicons/google_branding/logo_forms_48px.png new file mode 100644 index 00000000000..4ba7be23df4 Binary files /dev/null and b/app/assets/images/favicons/google_branding/logo_forms_48px.png differ diff --git a/app/assets/images/favicons/google_branding/logo_sheets_128px.png b/app/assets/images/favicons/google_branding/logo_sheets_128px.png deleted file mode 100644 index a99181d743d..00000000000 Binary files a/app/assets/images/favicons/google_branding/logo_sheets_128px.png and /dev/null differ diff --git a/app/assets/images/favicons/google_branding/logo_sheets_48px.png b/app/assets/images/favicons/google_branding/logo_sheets_48px.png new file mode 100644 index 00000000000..0a3cdc3c502 Binary files /dev/null and b/app/assets/images/favicons/google_branding/logo_sheets_48px.png differ diff --git a/app/assets/images/favicons/google_branding/logo_slides_128px.png b/app/assets/images/favicons/google_branding/logo_slides_128px.png deleted file mode 100644 index 538226c80f4..00000000000 Binary files a/app/assets/images/favicons/google_branding/logo_slides_128px.png and /dev/null differ diff --git a/app/assets/images/favicons/google_branding/logo_slides_48px.png b/app/assets/images/favicons/google_branding/logo_slides_48px.png new file mode 100644 index 00000000000..66b5155d690 Binary files /dev/null and b/app/assets/images/favicons/google_branding/logo_slides_48px.png differ diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss index aff56f5e476..a966a6c01d7 100644 --- a/app/assets/stylesheets/common/base/onebox.scss +++ b/app/assets/stylesheets/common/base/onebox.scss @@ -110,6 +110,7 @@ aside.onebox { @include onebox-favicon('githubissue', 'github'); @include onebox-favicon('githubgist', 'github'); @include onebox-favicon('amazon', 'amazon'); + @include onebox-favicon('googledocs', 'google_branding/logo_drive_48px'); .onebox-body { @@ -153,10 +154,23 @@ aside.onebox { @mixin gdocs-logo($type) { &.g-#{$type}-logo { - background: image-url("favicons/google_branding/logo_#{$type}_128px.png") no-repeat; + background: image-url("favicons/google_branding/logo_#{$type}_48px.png") no-repeat; } } +.googledocs-onebox-logo { + width: 60px; + height: 50px; + float: left; + @include gdocs-logo('docs'); + @include gdocs-logo('forms'); + @include gdocs-logo('sheets'); + @include gdocs-logo('slides'); + @include gdocs-logo('calendar'); + @include gdocs-logo('drive'); +} + +// Google Calendar Placeholder .gdocs-onebox-splash { background-color: blend-primary-secondary(30%); color: $primary; @@ -165,12 +179,9 @@ aside.onebox { display: inline-block; width: 128px; height: 128px; - @include gdocs-logo('docs'); - @include gdocs-logo('forms'); - @include gdocs-logo('sheets'); - @include gdocs-logo('slides'); - @include gdocs-logo('calendar'); - @include gdocs-logo('drive'); + &.g-calendar-logo { + background: image-url("favicons/google_branding/logo_calendar_128px.png") no-repeat; + } } }