Skip to content

Commit

Permalink
Merge bf487b1 into 819623c
Browse files Browse the repository at this point in the history
  • Loading branch information
@oesukam
oesukam committed Mar 26, 2019
2 parents 819623c + bf487b1 commit 8c491a7
Show file tree
Hide file tree
Showing 11 changed files with 2,131 additions and 87 deletions.
2,044 changes: 2,044 additions & 0 deletions ui/css/style.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ui/pages/admin-dashboard.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<div class="row">
<div class="col-3" style="background-color: #fff; border-radius: 15px;">
<div class="is-column">
<div class="title-1">840</div>
<div class="title-1">368</div>
<div class="title-3 color-gray">Active users</div>
<br />
<div class="title-1">190</div>
Expand Down
2 changes: 1 addition & 1 deletion ui/pages/admin-view-reports.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<div class="row">
<div class="col-12 padding-less">
<div class="input search">
<input type="text" placeholder="Filter reports ..." />
<input type="text" placeholder="Filter reports" />
</div>
</div>
</div>
Expand Down
18 changes: 9 additions & 9 deletions ui/pages/admin-view-users.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<div class="row">
<div class="col-12 padding-less">
<div class="input search">
<input type="text" placeholder="Filter users ..." />
<input type="text" placeholder="Filter users" />
</div>
</div>
</div>
Expand All @@ -103,7 +103,7 @@
<th>First Name</th>
<th>Last Name</th>
<th>Articles</th>
<th>Registered At</th>
<th>Registered on</th>
<th class="align-center">User type</th>
<th class="align-center">Status</th>
</tr>
Expand All @@ -114,7 +114,7 @@
<td>Rose</td>
<td>Maina</td>
<td>50</td>
<td>Registered At</td>
<td>2018-01-07</td>
<td class="align-center">
<a href="#modal-user-type"><i class="fa fa-pencil"></i> user</a>
</td>
Expand All @@ -125,9 +125,9 @@
<tr>
<td>2</td>
<td>Grace</td>
<td>Kimoto</td>
<td>Kimotho</td>
<td>50</td>
<td>Registered At</td>
<td>2018-01-07</td>
<td class="align-center">
<a href="#modal-user-type"><i class="fa fa-pencil"></i> user</a>
</td>
Expand All @@ -140,7 +140,7 @@
<td>Daniel</td>
<td>Nziranziza</td>
<td>10</td>
<td>Registered At</td>
<td>2018-01-07</td>
<td class="align-center">
<a href="#modal-user-type"><i class="fa fa-pencil"></i> user</a>
</td>
Expand All @@ -153,7 +153,7 @@
<td>Caleb</td>
<td>Mugisha</td>
<td>50</td>
<td>Registered At</td>
<td>2018-01-07</td>
<td class="align-center">
<a href="#modal-user-type"><i class="fa fa-pencil"></i> user</a>
</td>
Expand All @@ -166,7 +166,7 @@
<td>Fabrice</td>
<td>Manzi</td>
<td>50</td>
<td>Registered At</td>
<td>2018-01-07</td>
<td class="align-center">
<a href="#modal-user-type"><i class="fa fa-pencil"></i> user</a>
</td>
Expand All @@ -179,7 +179,7 @@
<td>Olivier</td>
<td>Esuka</td>
<td>50</td>
<td>Registered At</td>
<td>2018-01-07</td>
<td class="align-center">
<a href="#modal-user-type"><i class="fa fa-pencil"></i> user</a>
</td>
Expand Down
60 changes: 32 additions & 28 deletions ui/pages/articles-view.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<li><a href="./articles-user-all.html">My Articles</a></li>
<li class="separator"></li>
<li><a href="../pages/profile-edit.html">Settings</a></li>
<li><a href="../pages/admin-dashboard.html">Dashboard</a></li>
<li><a href="../pages/admin-dashboard.html">Dashboard</a></li>
<li><a href="#">Sign out</a></li>
</ul>
</button>
Expand Down Expand Up @@ -91,34 +91,34 @@ <h1 class="article-view-title">North Antartic View</h1>
</p>

<p class="article-date">Published On: July 25, 2018</p>

<div class="row">
<div class="article-side-actions">
<span>5 min</span>
<span class="article-icon hover-primary margin-top">&nbsp;4&nbsp;<i class="fa fa-star-o"></i></span>
<button class="article-icon hover-primary margin-top">
<i class="fa fa-thumbs-up"></i>
</button>
<button class="article-icon hover-primary margin-top">
<i class="fa fa-thumbs-down article-icon"></i>
</button>
<button class="article-icon hover-primary margin-top">
<i
onclick="bookmarkIcon(this)"
class="fa fa-bookmark article-icon"
title="bookmark this article"
></i>
<!-- <button class="article-icon margin-top">
<i class="fa fa-star-o"></i>
</button>-->
<!-- <div class="view-favorites">
Stars
<div class="view-stars">
<span class="color-gray star-1"></span>
<span class="color-gray star-2"></span>
</div>
</div> -->
</div>
<div class="article-side-actions">
<span>5 min</span>
<span class="article-icon hover-primary margin-top">&nbsp;4&nbsp;<i class="fa fa-star-o"></i></span>
<button class="article-icon hover-primary margin-top">
<i class="fa fa-thumbs-up"></i>
</button>
<button class="article-icon hover-primary margin-top">
<i class="fa fa-thumbs-down article-icon"></i>
</button>
<button class="article-icon hover-primary margin-top">
<i
onclick="bookmarkIcon(this)"
class="fa fa-bookmark article-icon"
title="bookmark this article"
></i>
<!-- <button class="article-icon margin-top">
<i class="fa fa-star-o"></i>
</button>-->
<!-- <div class="view-favorites">
Stars
<div class="view-stars">
<span class="color-gray star-1"></span>
<span class="color-gray star-2"></span>
</div>
</div> -->
</div>
<div class="article-share">
<p>Share this article</p>
<button class="article-icon hover-primary">
Expand Down Expand Up @@ -149,7 +149,11 @@ <h1 class="article-view-title">North Antartic View</h1>
<label for="star1" title="text">1 star</label>
</div>
</div>
<div class="items-center">
<a href="#modal-report" class="hover-primary"><i class="fa fa-file"></i> Report</a>
</div>
</div>

</div>
</div>
</div>
Expand Down
19 changes: 14 additions & 5 deletions ui/scss/base/_form.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,13 @@ input::placeholder {
color: #fff;
}

.text-area {
border-radius: 0.5rem;
border: 1px solid $input-border-color;
padding: 0.5rem 1rem;
width: 100%;
}

.button {
padding: 10px 20px;
min-width: 100px;
Expand Down Expand Up @@ -154,17 +161,19 @@ a.button {

.custom-dropdown {
position: relative;
display: inline-block;
vertical-align: middle;
margin: 10px;
display: flex;
align-items: center;
margin: 1rem 0;
width: 100%;
position: relative;
select {
background-color: $primary-light;
color: rgba($color: #000000, $alpha: 0.6);
font-size: inherit;
padding: 0.5em;
padding-right: 2.5em;
width: 100%;
border: 0;
margin: 0;
margin-left: 0.5rem;
border-radius: 3px;
text-indent: 0.01px;
text-overflow: '';
Expand Down
4 changes: 4 additions & 0 deletions ui/scss/base/_global.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@
z-index: 999999;
background-color: rgba(0, 0, 0, 0.5);
overflow: hidden;
&.dark {
background-color: rgba(0, 0, 0, 0.8);
}
&.active {
display: flex;
}
Expand All @@ -45,6 +48,7 @@
-moz-border-radius: 5px;
-ms-border-radius: 5px;
-o-border-radius: 5px;
overflow: hidden;
.modal__title {
font-size: 1.3rem;
text-align: center;
Expand Down
6 changes: 6 additions & 0 deletions ui/scss/base/_typography.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,9 @@
.underlined {
text-decoration: underline;
}

.hover-primary {
&:hover {
color: $primary;
}
}
7 changes: 7 additions & 0 deletions ui/scss/layout/_grid-layout.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,13 @@
margin-bottom: 20px;
}

.p-10 {
padding: 10px;
}

.p-20 {
padding: 20px;
}
.pagination {
display: flex;
justify-content: center;
Expand Down
18 changes: 6 additions & 12 deletions ui/scss/pages/_articles-view-page.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,24 @@
justify-content: center;
align-items: center;
}

.article-image img {
height: 40px;
margin-bottom: 5px;
}
.article-image span {
font-size: 1rem;
}

.article-content {
text-align: justify;
line-height: 1.3rem;
font-size: 0.9rem;
color: rgba(0, 0, 0, 0.8);
}

.article-date {
margin: 20px 0;
font-size: 0.6rem;
color: rgba(0, 0, 0, 0.3);
}

.article-side-actions {
position: fixed;
right: 3vw;
Expand All @@ -53,7 +49,6 @@
background-color: transparent;
}
}

.view-favorites {
display: flex;
flex-direction: column;
Expand All @@ -67,14 +62,12 @@
.star-2 {
font-size: 1.5rem;
}

.wrapper2 {
display: flex;
flex-direction: row;
justify-content: flex-end;
// align-items: right;
}

.rating-wrapper {
display: flex;
flex-direction: row;
Expand All @@ -86,7 +79,6 @@
text-align: right;
}
}

.article-share {
margin: 10px 0;
display: flex;
Expand All @@ -96,12 +88,10 @@
color: rgba(0, 0, 0, 0.3);
text-align: right;
padding-right: 20px;
button{
button {
background-color: transparent;
}

}

@media screen and (max-width: $tablet-width) {
.article-side-actions {
position: static;
Expand Down Expand Up @@ -135,4 +125,8 @@
margin-top: -4px;
}
}
}
}

#modal-report:target {
display: flex;
}
Loading

0 comments on commit 8c491a7

Please sign in to comment.