From c2399db08ae8ced863a38854f243372f4830ebcd Mon Sep 17 00:00:00 2001 From: Alexandre Bourlier Date: Thu, 26 Apr 2018 08:20:33 +0200 Subject: [PATCH] Project detail page done --- src/html/project.html | 23 +++++++++++----- src/models.py | 3 ++- src/scss/_member.scss | 2 -- src/scss/_project.scss | 57 +++++++++++++++++++++++++++++++++++----- src/scss/_projects.scss | 8 ++++-- src/scss/_variables.scss | 1 + 6 files changed, 76 insertions(+), 18 deletions(-) diff --git a/src/html/project.html b/src/html/project.html index 7d96693..62deb25 100644 --- a/src/html/project.html +++ b/src/html/project.html @@ -21,15 +21,24 @@ diff --git a/src/models.py b/src/models.py index 667756c..65b5482 100644 --- a/src/models.py +++ b/src/models.py @@ -26,6 +26,7 @@ class Project(models.Model): name = models.CharField(max_length=255, default='') number = models.PositiveIntegerField(default='0') client = models.OneToOneField("Client") + team = models.ManyToManyField("Member") def __str__(self): return self.name @@ -53,7 +54,7 @@ class ChatRoom(models.Model): name = models.CharField(max_length=255, default='') description = models.CharField(max_length=255, default='') members = models.ManyToManyField("Member") - administrator = models.ManyToManyField("Member") + owner = models.ForeignKey("Member", related_name="owned_chatrooms") def __str__(self): return self.name diff --git a/src/scss/_member.scss b/src/scss/_member.scss index 8efc89a..79aa023 100644 --- a/src/scss/_member.scss +++ b/src/scss/_member.scss @@ -17,8 +17,6 @@ &, img { width: 100%; - max-width: 320px; - min-width: 100%; } div[name="name"] { diff --git a/src/scss/_project.scss b/src/scss/_project.scss index 0c0102a..31f7b8f 100644 --- a/src/scss/_project.scss +++ b/src/scss/_project.scss @@ -1,9 +1,54 @@ -#project-detail { - display: block; - padding-top: 10px; +#project { + #project-detail { + #project-info { + display: block; + padding-top: 10px; - div[name="label"] { - display: flex; - font-weight: bold; + div[name="label"] { + display: flex; + font-weight: bold; + } + + &, img { + width: 100%; + } + } + + #project-team { + ldp-display { + display: flex; + align-items: center; + margin-bottom: 10px; + + img { + width: 50px; + border-radius: 100px; + } + + div[name="name"] { + display: flex; + margin-left: 10px; + } + } + } + } + + .section { + @extend %detail-section; + margin-top: 40px; + } +} + +@media (min-width: $sm-with) { + #project { + #project-detail { + #project-info { + ldp-display-client { + display: block; + float: right; + width: 300px; + } + } + } } } diff --git a/src/scss/_projects.scss b/src/scss/_projects.scss index cc82c4d..a24e197 100644 --- a/src/scss/_projects.scss +++ b/src/scss/_projects.scss @@ -12,7 +12,8 @@ height: 65px; &:hover { - font-weight: bold; + background-color: $hd-color-faded; + color: white; } ldp-display-div[name="number"] { @@ -20,7 +21,10 @@ } ldp-display-client[name="client"] { - &, img { + display: block; + width: 70px; + + img { width: 50px; } } diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss index 9423ce5..d18c79c 100644 --- a/src/scss/_variables.scss +++ b/src/scss/_variables.scss @@ -1,4 +1,5 @@ $hd-color: rgb(253, 200, 21); +$hd-color-faded: rgba(253, 200, 21, 0.8); $twitter-color: #1DA1F2; $menu-height: 46px;