From b0b24baa20122c717346bf39936571d0b87b010c Mon Sep 17 00:00:00 2001 From: Alexandre Bourlier Date: Thu, 19 Apr 2018 19:51:20 +0200 Subject: [PATCH] Chat component integrated on the member profile --- .gitmodules | 3 +++ dist/lib/xmpp-chat-component | 1 + index.php | 7 +++--- src/html/member.html | 13 +++++++---- src/html/members.html | 4 ---- src/html/menu.html | 2 +- src/scss/_menu.scss | 42 ++++++++++++++++-------------------- src/scss/_variables.scss | 2 +- 8 files changed, 37 insertions(+), 37 deletions(-) create mode 160000 dist/lib/xmpp-chat-component diff --git a/.gitmodules b/.gitmodules index e07c1ab..5ac647f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "dist/lib/webcomponentsjs"] path = dist/lib/webcomponentsjs url = https://github.com/webcomponents/webcomponentsjs +[submodule "dist/lib/xmpp-chat-component"] + path = dist/lib/xmpp-chat-component + url = git@git.happy-dev.fr:happy-dev/xmpp-chat-component.git diff --git a/dist/lib/xmpp-chat-component b/dist/lib/xmpp-chat-component new file mode 160000 index 0000000..ffed7b6 --- /dev/null +++ b/dist/lib/xmpp-chat-component @@ -0,0 +1 @@ +Subproject commit ffed7b6c77ff46ee93f5d2de185e4984d1988d47 diff --git a/index.php b/index.php index e092e4b..5347223 100644 --- a/index.php +++ b/index.php @@ -12,10 +12,6 @@ Happy Dev App - - - - @@ -25,9 +21,12 @@ + + + diff --git a/src/html/member.html b/src/html/member.html index 3d1f1c3..dabf8d2 100644 --- a/src/html/member.html +++ b/src/html/member.html @@ -1,8 +1,13 @@