diff --git a/config/default/default.settings.php b/config/default/default.settings.php index 33fcd73..460f407 100644 --- a/config/default/default.settings.php +++ b/config/default/default.settings.php @@ -61,12 +61,14 @@ $conf = array( # 'landing_page' => 1, // Social links: -# 'social_website' => 'http://www.example.com', -# 'social_rss' => 'http://www.example.com/feed', -# 'social_twitter' => 'http://twitter.com/username', -# 'social_facebook' => 'http://facebook.com/userpage', -# 'social_linkedin' => 'http://linkedin.com/in/username', -# 'social_contact' => 'http://www.example.com/contact', +# 'social_website' => 'https://www.example.com', +# 'social_rss' => 'https://www.example.com/feed', +# 'social_twitter' => 'https://twitter.com/username', +# 'social_facebook' => 'https://facebook.com/userpage', +# 'social_linkedin' => 'https://linkedin.com/in/username', +# 'social_github' => 'https://github.com/username', +# 'social_gitlab' => 'https://gitlab.com/username', +# 'social_contact' => 'https://www.example.com/contact', // Uncomment to show logo when printing pages: # 'print_logo' => 1, diff --git a/themes/zuitedesk/css/fonticons.css b/themes/zuitedesk/css/fonticons.css index 5e24e34..c610420 100755 --- a/themes/zuitedesk/css/fonticons.css +++ b/themes/zuitedesk/css/fonticons.css @@ -1,11 +1,11 @@ @font-face { font-family: 'fonticons'; - src: url('../font/fonticons.eot?63556011'); - src: url('../font/fonticons.eot?63556011#iefix') format('embedded-opentype'), - url('../font/fonticons.woff2?63556011') format('woff2'), - url('../font/fonticons.woff?63556011') format('woff'), - url('../font/fonticons.ttf?63556011') format('truetype'), - url('../font/fonticons.svg?63556011#fonticons') format('svg'); + src: url('../font/fonticons.eot?45092274'); + src: url('../font/fonticons.eot?45092274#iefix') format('embedded-opentype'), + url('../font/fonticons.woff2?45092274') format('woff2'), + url('../font/fonticons.woff?45092274') format('woff'), + url('../font/fonticons.ttf?45092274') format('truetype'), + url('../font/fonticons.svg?45092274#fonticons') format('svg'); font-weight: normal; font-style: normal; } @@ -15,7 +15,7 @@ @media screen and (-webkit-min-device-pixel-ratio:0) { @font-face { font-family: 'fonticons'; - src: url('../font/fonticons.svg?63556011#fonticons') format('svg'); + src: url('../font/fonticons.svg?45092274#fonticons') format('svg'); } } */ @@ -121,7 +121,9 @@ .icon-team:before { content: '\e83f'; } /* '' */ .icon-kanban:before { content: '\e841'; } /* '' */ .icon-timetracking:before { content: '\e842'; } /* '' */ +.icon-github:before { content: '\f09b'; } /* '' */ .icon-task:before { content: '\f12e'; } /* '' */ .icon-invoice:before { content: '\f153'; } /* '' */ .icon-org:before { content: '\f19c'; } /* '' */ -.icon-event:before { content: '\f273'; } /* '' */ \ No newline at end of file +.icon-event:before { content: '\f273'; } /* '' */ +.icon-gitlab:before { content: '\f296'; } /* '' */ \ No newline at end of file diff --git a/themes/zuitedesk/css/navigation.css b/themes/zuitedesk/css/navigation.css index a79859f..b50f625 100644 --- a/themes/zuitedesk/css/navigation.css +++ b/themes/zuitedesk/css/navigation.css @@ -71,6 +71,10 @@ ul.social-menu .social-link-facebook:hover a { ul.social-menu .social-link-linkedin:hover a { background-color: #419cca; } +ul.social-menu .social-link-github:hover a, +ul.social-menu .social-link-gitlab:hover a { + background-color: #bd2c00; +} ul.social-menu .social-link-mail:hover a { background-color: #9fae37; } diff --git a/themes/zuitedesk/font/fonticons.eot b/themes/zuitedesk/font/fonticons.eot index e55bf6d..f562aa0 100755 Binary files a/themes/zuitedesk/font/fonticons.eot and b/themes/zuitedesk/font/fonticons.eot differ diff --git a/themes/zuitedesk/font/fonticons.svg b/themes/zuitedesk/font/fonticons.svg index 22e4f05..e47c702 100755 --- a/themes/zuitedesk/font/fonticons.svg +++ b/themes/zuitedesk/font/fonticons.svg @@ -1,7 +1,7 @@ -Copyright (C) 2017 by original authors @ fontello.com +Copyright (C) 2018 by original authors @ fontello.com @@ -138,6 +138,8 @@ + + @@ -145,6 +147,8 @@ + + \ No newline at end of file diff --git a/themes/zuitedesk/font/fonticons.ttf b/themes/zuitedesk/font/fonticons.ttf index deac888..0853e44 100755 Binary files a/themes/zuitedesk/font/fonticons.ttf and b/themes/zuitedesk/font/fonticons.ttf differ diff --git a/themes/zuitedesk/font/fonticons.woff b/themes/zuitedesk/font/fonticons.woff index 86ac76b..eb682e9 100755 Binary files a/themes/zuitedesk/font/fonticons.woff and b/themes/zuitedesk/font/fonticons.woff differ diff --git a/themes/zuitedesk/font/fonticons.woff2 b/themes/zuitedesk/font/fonticons.woff2 index 40c0d48..999487d 100755 Binary files a/themes/zuitedesk/font/fonticons.woff2 and b/themes/zuitedesk/font/fonticons.woff2 differ diff --git a/themes/zuitedesk/template.php b/themes/zuitedesk/template.php index 1a413a0..7ed778e 100644 --- a/themes/zuitedesk/template.php +++ b/themes/zuitedesk/template.php @@ -243,6 +243,8 @@ function zuitedesk_preprocess_page(&$vars, $hook) { $sl .= _zuitedesk_social_link('social_twitter', 'Twitter', 'twitter'); $sl .= _zuitedesk_social_link('social_facebook', 'Facebook', 'facebook'); $sl .= _zuitedesk_social_link('social_linkedin', 'Linkedin', 'linkedin'); + $sl .= _zuitedesk_social_link('social_github', 'Github', 'github'); + $sl .= _zuitedesk_social_link('social_gitlab', 'Gitlab', 'gitlab'); $sl .= _zuitedesk_social_link('social_contact', 'Mail', 'mail'); $_SESSION['socialmenu'] = $sl; }