diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-13 08:54:56 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-13 08:54:56 +0000 |
commit | 98291295a782b5fdf74e0b4742a35857054facbb (patch) | |
tree | 7d550285f6bd5dac6478bbe025c699d2990fe57e | |
parent | f194fd848b7e7990f8ddbcd35609772951ee5dc1 (diff) | |
parent | 5431368ad1c918b5e246a4b174f0c3b8d3713c67 (diff) | |
download | gitlab-ce-98291295a782b5fdf74e0b4742a35857054facbb.tar.gz |
Merge branch 'rs-issue-1908' into 'master'
Add Safari/iOS and Windows 8 logo information
Now that we've got our :fire: new logo, let's spread it around a bit more!
Closes #1908
See merge request !944
-rw-r--r-- | app/assets/images/msapplication-tile.png | bin | 0 -> 6102 bytes | |||
-rw-r--r-- | app/assets/images/touch-icon-ipad-retina.png | bin | 0 -> 8130 bytes | |||
-rw-r--r-- | app/assets/images/touch-icon-ipad.png | bin | 0 -> 3493 bytes | |||
-rw-r--r-- | app/assets/images/touch-icon-iphone-retina.png | bin | 0 -> 4997 bytes | |||
-rw-r--r-- | app/assets/images/touch-icon-iphone.png | bin | 0 -> 2766 bytes | |||
-rw-r--r-- | app/views/layouts/_head.html.haml | 19 |
6 files changed, 17 insertions, 2 deletions
diff --git a/app/assets/images/msapplication-tile.png b/app/assets/images/msapplication-tile.png Binary files differnew file mode 100644 index 00000000000..f8c5c8b28b4 --- /dev/null +++ b/app/assets/images/msapplication-tile.png diff --git a/app/assets/images/touch-icon-ipad-retina.png b/app/assets/images/touch-icon-ipad-retina.png Binary files differnew file mode 100644 index 00000000000..feb32b48ec9 --- /dev/null +++ b/app/assets/images/touch-icon-ipad-retina.png diff --git a/app/assets/images/touch-icon-ipad.png b/app/assets/images/touch-icon-ipad.png Binary files differnew file mode 100644 index 00000000000..a6ddc543509 --- /dev/null +++ b/app/assets/images/touch-icon-ipad.png diff --git a/app/assets/images/touch-icon-iphone-retina.png b/app/assets/images/touch-icon-iphone-retina.png Binary files differnew file mode 100644 index 00000000000..8bf7ccb7534 --- /dev/null +++ b/app/assets/images/touch-icon-iphone-retina.png diff --git a/app/assets/images/touch-icon-iphone.png b/app/assets/images/touch-icon-iphone.png Binary files differnew file mode 100644 index 00000000000..87da550f8be --- /dev/null +++ b/app/assets/images/touch-icon-iphone.png diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index dbc68c39bf1..54cddc30b74 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -7,14 +7,29 @@ %title= page_title = favicon_link_tag 'favicon.ico' - = stylesheet_link_tag "application", :media => "all" - = stylesheet_link_tag "print", :media => "print" + + = stylesheet_link_tag "application", media: "all" + = stylesheet_link_tag "print", media: "print" + = javascript_include_tag "application" + = csrf_meta_tags + = include_gon + %meta{name: 'viewport', content: 'width=device-width, initial-scale=1, maximum-scale=1'} %meta{name: 'theme-color', content: '#474D57'} + -# Apple Safari/iOS home screen icons + = favicon_link_tag 'touch-icon-iphone.png', rel: 'apple-touch-icon' + = favicon_link_tag 'touch-icon-ipad.png', rel: 'apple-touch-icon', sizes: '76x76' + = favicon_link_tag 'touch-icon-iphone-retina.png', rel: 'apple-touch-icon', sizes: '120x120' + = favicon_link_tag 'touch-icon-ipad-retina.png', rel: 'apple-touch-icon', sizes: '152x152' + + -# Windows 8 pinned site tile + %meta{name: 'msapplication-TileImage', content: image_url('msapplication-tile.png')} + %meta{name: 'msapplication-TileColor', content: '#30353E'} + = yield :meta_tags = render 'layouts/google_analytics' if extra_config.has_key?('google_analytics_id') |