From f6744ec9e04f05791af98615199701f000ef233d Mon Sep 17 00:00:00 2001 From: Alexandre Bourlier Date: Thu, 26 Apr 2018 18:48:53 +0200 Subject: [PATCH] Channels list and detail pages done --- index.php | 2 ++ src/html/channel.html | 63 +++++++++++++++++++++++++++++++++++++++ src/html/channels.html | 9 ++++++ src/html/groups.html | 6 ---- src/html/menu.html | 7 +++-- src/scss/_channel.scss | 62 ++++++++++++++++++++++++++++++++++++++ src/scss/_channels.scss | 25 ++++++++++++++++ src/scss/_groupsList.scss | 26 ---------------- src/scss/_home.scss | 19 ------------ src/scss/main.scss | 8 ++--- 10 files changed, 170 insertions(+), 57 deletions(-) create mode 100644 src/html/channel.html create mode 100644 src/html/channels.html delete mode 100644 src/html/groups.html create mode 100644 src/scss/_channel.scss create mode 100644 src/scss/_channels.scss delete mode 100644 src/scss/_groupsList.scss delete mode 100644 src/scss/_home.scss diff --git a/index.php b/index.php index e5f7413..b92e1d6 100644 --- a/index.php +++ b/index.php @@ -38,6 +38,8 @@ + + diff --git a/src/html/channel.html b/src/html/channel.html new file mode 100644 index 0000000..fe2c431 --- /dev/null +++ b/src/html/channel.html @@ -0,0 +1,63 @@ + + + diff --git a/src/html/channels.html b/src/html/channels.html new file mode 100644 index 0000000..1187d52 --- /dev/null +++ b/src/html/channels.html @@ -0,0 +1,9 @@ + diff --git a/src/html/groups.html b/src/html/groups.html deleted file mode 100644 index d5c2741..0000000 --- a/src/html/groups.html +++ /dev/null @@ -1,6 +0,0 @@ - diff --git a/src/html/menu.html b/src/html/menu.html index dc61f22..341453c 100644 --- a/src/html/menu.html +++ b/src/html/menu.html @@ -25,9 +25,12 @@ Projet - + - Groupes + Channels + + + channel diff --git a/src/scss/_channel.scss b/src/scss/_channel.scss new file mode 100644 index 0000000..ce76d22 --- /dev/null +++ b/src/scss/_channel.scss @@ -0,0 +1,62 @@ +#channel { + #channel-detail { + #channel-info { + display: block; + padding-top: 10px; + + div[name="name"] { + font-weight: bold; + } + } + + ldp-display-member { + img { + width: 50px; + border-radius: 100px; + } + + span { + padding-left: 5px; + } + } + + #chat-members { + ldp-display { + display: flex; + align-items: center; + margin-bottom: 10px; + + img { + width: 50px; + border-radius: 100px; + } + + div[name="name"] { + display: flex; + margin-left: 10px; + } + } + } + } + + div[name="admin"], + .section { + @extend %detail-section; + margin-top: 40px; + } +} + +@media (min-width: $sm-with) { + #channel { + #channel-detail { + #channel-info { + ldp-display-client { + display: block; + float: right; + width: 300px; + } + } + } + } +} + diff --git a/src/scss/_channels.scss b/src/scss/_channels.scss new file mode 100644 index 0000000..efd811f --- /dev/null +++ b/src/scss/_channels.scss @@ -0,0 +1,25 @@ +#channels { + #channels-list { + display: flex; + flex-direction: column; + margin-top: 40px; + + ldp-display { + @extend %td; + cursor: pointer; + display: flex; + align-items: center; + height: 65px; + + &:hover { + background-color: $hd-color-faded; + color: white; + } + + ldp-display-div[name="name"] { + width: 130px; + } + } + } +} + diff --git a/src/scss/_groupsList.scss b/src/scss/_groupsList.scss deleted file mode 100644 index 29b7a21..0000000 --- a/src/scss/_groupsList.scss +++ /dev/null @@ -1,26 +0,0 @@ -#groupsList { - display: flex; - flex-direction: column; -} - -#groupsList>ldp-display { - display: flex; - flex-direction: row; -} - -#groupsList ul { - display: inline-flex; -} - - -/* TEST */ -#groupsList>ldp-display { - border: 1px dashed royalblue; - -} -#groupsList ul { - border: 3px solid green; -} -#groupsList .title { - border: 3px solid blueviolet; -} diff --git a/src/scss/_home.scss b/src/scss/_home.scss deleted file mode 100644 index 0fd5586..0000000 --- a/src/scss/_home.scss +++ /dev/null @@ -1,19 +0,0 @@ -#home { - height: 100%; -} - -#logoContainer { - height: 100%; - display: flex; - justify-content: center; - align-items: center; -} - -#logoContainer>img { - transition: transform .4s; -} - -#logoContainer>img:hover { - transform: scale(1.5); -} -/* MEDIA QUERY Pour centrer sur un petit écran */ diff --git a/src/scss/main.scss b/src/scss/main.scss index d51d62d..f8aee45 100644 --- a/src/scss/main.scss +++ b/src/scss/main.scss @@ -6,11 +6,11 @@ @import "forms"; // Specific -@import "home"; @import "menu"; +@import "dashboard"; @import "members"; @import "member"; -@import "groupsList"; -@import "project"; @import "projects"; -@import "dashboard"; +@import "project"; +@import "channels"; +@import "channel";