Skip to content

Commit

Permalink
Merge pull request #156 from ably/web-2213-discord-icon-link
Browse files Browse the repository at this point in the history
[WEB-2213] Add discord icon link too footer
  • Loading branch information
Dominik authored Mar 14, 2022
2 parents 19c16e0 + 9095cd4 commit 2383ffb
Show file tree
Hide file tree
Showing 14 changed files with 49 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
ably-ui (6.5.3)
ably-ui (6.5.3.dev.0ab7c2f)
view_component (>= 2.33, < 2.50)

GEM
Expand Down
15 changes: 14 additions & 1 deletion cypress/integration/core/footer/__snapshots__/snapshots.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,12 @@ exports[`Footer Snapshot Test > react > test case common to both #0`] = `
class="h-24 pr-24 text-cool-black hover:text-icon-github"
href="https://github.com/ably/"
><svg class=" " style="width: 1.5rem; height: 1.5rem;">
<use xlink:href="#sprite-github"></use></svg
<use xlink:href="#sprite-github"></use></svg></a
><a
class="h-24 pr-24 text-cool-black hover:text-icon-discord"
href="https://discord.com/invite/wPnfgACt"
><svg class=" " style="width: 1.5rem; height: 1.5rem;">
<use xlink:href="#sprite-discord"></use></svg
></a>
<div class="border-l border-mid-grey h-40"></div>
<a
Expand Down Expand Up @@ -581,6 +586,14 @@ exports[`Footer Snapshot Test > view component > test case common to both #0`] =
<use xlink:href="#sprite-github"></use>
</svg>
</a>
<a
class="h-24 pr-24 text-cool-black hover:text-icon-discord"
href="https://discord.com/invite/wPnfgACt"
>
<svg class=" " style="width: 1.5rem; height: 1.5rem">
<use xlink:href="#sprite-discord"></use>
</svg>
</a>
<div class="border-l border-mid-grey h-40"></div>
<a
class="flex flex-row pl-24 text-cool-black hover:text-icon-glassdoor"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -947,7 +947,12 @@ exports[`Footer Snapshot Test > react > test case common to both #0`] = `
class="h-24 pr-24 text-cool-black hover:text-icon-github"
href="https://github.com/ably/"
><svg class=" " style="width: 1.5rem; height: 1.5rem;">
<use xlink:href="#sprite-github"></use></svg
<use xlink:href="#sprite-github"></use></svg></a
><a
class="h-24 pr-24 text-cool-black hover:text-icon-discord"
href="https://discord.com/invite/wPnfgACt"
><svg class=" " style="width: 1.5rem; height: 1.5rem;">
<use xlink:href="#sprite-discord"></use></svg
></a>
<div class="border-l border-mid-grey h-40"></div>
<a
Expand Down
2 changes: 1 addition & 1 deletion lib/ably_ui/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module AblyUi
VERSION = '6.5.3'
VERSION = '6.5.3.dev.0ab7c2f'
end
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ably/ui",
"version": "6.5.3",
"version": "6.5.3-dev.0ab7c2f",
"description": "Home of the Ably design system library ([design.ably.com](https://design.ably.com)). It provides a showcase, development/test environment and a publishing pipeline for different distributables.",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion preview/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ gem 'view_component', '~> 2.33.0', require: 'view_component/engine'

gem 'responders'

gem 'ably-ui', '6.5.3', require: 'ably_ui'
gem 'ably-ui', '6.5.3.dev.0ab7c2f', require: 'ably_ui'
4 changes: 2 additions & 2 deletions preview/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
ably-ui (6.5.3)
ably-ui (6.5.3.dev.0ab7c2f)
view_component (>= 2.33, < 2.50)
actioncable (6.0.3.4)
actionpack (= 6.0.3.4)
Expand Down Expand Up @@ -169,7 +169,7 @@ PLATFORMS
ruby

DEPENDENCIES
ably-ui (= 6.5.3)
ably-ui (= 6.5.3.dev.0ab7c2f)
bootsnap (>= 1.4.2)
byebug
listen (~> 3.2)
Expand Down
2 changes: 1 addition & 1 deletion preview/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "preview",
"private": true,
"dependencies": {
"@ably/ui": "6.5.3",
"@ably/ui": "6.5.3-dev.0ab7c2f",
"@babel/preset-react": "^7.12.5",
"@rails/ujs": "^6.0.0",
"@rails/webpacker": "4.3.0",
Expand Down
8 changes: 4 additions & 4 deletions preview/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# yarn lockfile v1


"@ably/[email protected]":
version "6.5.3"
resolved "https://registry.yarnpkg.com/@ably/ui/-/ui-6.5.3.tgz#ca3a36c9652c0b849eaca81a824c89b1bea07177"
integrity sha512-wVdpqo8ZQU0YFTd6LAkmIKKyPy5UK3NOKs90VNJ8oudbaqb4ZQrmpNHdFQyE0mAYMWK6U8Lf7BeTSpyuP1A9nA==
"@ably/[email protected]-dev.0ab7c2f":
version "6.5.3-dev.0ab7c2f"
resolved "https://registry.yarnpkg.com/@ably/ui/-/ui-6.5.3-dev.0ab7c2f.tgz#b7fedca2cf81355dd7c0f6615fb2536f6c811b18"
integrity sha512-qVFPkvnEJqd0MpiZzThxwX3L/fNVg66kXn2+wmdQt2aEx+8gTa3nqDSOF11NMTfqGqx4mF6WuBbMbhhwaESKJg==
dependencies:
array-flat-polyfill "^1.0.1"
deepmerge "^4.2.2"
Expand Down
3 changes: 3 additions & 0 deletions src/core/Footer/component.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,9 @@
<a class="h-24 pr-24 text-cool-black hover:text-icon-github" href="https://github.com/ably/">
<%= render(AblyUi::Core::Icon.new(name: "github", size: "1.5rem")) %>
</a>
<a class="h-24 pr-24 text-cool-black hover:text-icon-discord" href="https://discord.com/invite/wPnfgACt">
<%= render(AblyUi::Core::Icon.new(name: "discord", size: "1.5rem")) %>
</a>
<div class="border-l border-mid-grey h-40"></div>
<a
class="flex flex-row pl-24 text-cool-black hover:text-icon-glassdoor"
Expand Down
3 changes: 3 additions & 0 deletions src/core/Footer/component.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,9 @@ export default function Footer({ paths, urlBase }) {
<a className="h-24 pr-24 text-cool-black hover:text-icon-github" href="https://github.com/ably/">
<Icon name="github" size="1.5rem" />
</a>
<a className="h-24 pr-24 text-cool-black hover:text-icon-discord" href="https://discord.com/invite/wPnfgACt">
<Icon name="discord" size="1.5rem" />
</a>
<div className="border-l border-mid-grey h-40"></div>
<a
className="flex flex-row pl-24 text-cool-black hover:text-icon-glassdoor"
Expand Down
10 changes: 10 additions & 0 deletions src/core/icons/discord.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/core/styles/properties.css
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
--icon-color-twitter: #2caae1;
--icon-color-glassdoor: #0baa41;
--icon-color-github: #000000;
--icon-color-discord: #5865f2;

--gradient-active-orange: linear-gradient(
61.2deg,
Expand Down
1 change: 1 addition & 0 deletions tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ module.exports = {
"icon-twitter": "var(--icon-color-twitter)",
"icon-glassdoor": "var(--icon-color-glassdoor)",
"icon-github": "var(--icon-color-github)",
"icon-discord": "var(--icon-color-discord)",
},
fontFamily: {
sans: ["NEXT Book", "Arial", "Helvetica", "sans-serif"],
Expand Down

0 comments on commit 2383ffb

Please sign in to comment.