Skip to content

Commit

Permalink
Hide non-mobile elements by BS classes. Closes #181
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffputz committed Mar 1, 2020
1 parent 1570e3f commit 60da3b7
Show file tree
Hide file tree
Showing 12 changed files with 14 additions and 26 deletions.
2 changes: 1 addition & 1 deletion src/PopForums.Mvc/Areas/Forums/Views/Account/Posts.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<td class="newIndicator"><a asp-controller="Forum" asp-action="Topic" asp-route-id="@topic.UrlName"><pf-topicReadIndicator topic="@topic" pagedTopicContainer="@Model" imagePath="/lib/PopForums/" /></a></td>
<td>
<h2>@Html.ActionLink(topic.Title, "Topic", "Forum", new { id = topic.UrlName, pageNumber = 1 }, null)</h2>
<small class="float-right forumDetails">
<small class="float-right d-none d-sm-block">
@PopForums.Resources.StartedBy: @topic.StartedByName @PopForums.Resources.In @Model.ForumTitles[topic.ForumID] | @PopForums.Resources.Views: @topic.ViewCount | @PopForums.Resources.Replies: @topic.ReplyCount | @PopForums.Resources.Last: <span class="lastPostTime fTime" data-utc="@topic.LastPostTime.ToString("o")">@TimeFormattingService.GetFormattedTime(topic.LastPostTime, profile)</span> @PopForums.Resources.By @topic.LastPostName
</small>
</td>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ else
</td>
<td>
<h2><a asp-controller="@ForumController.Name" asp-action="Topic" asp-route-id="@topic.UrlName" asp-route-pageNumber="">@topic.Title</a></h2>
<small class="pull-right forumDetails">
<small class="float-right d-none d-sm-block">
@PopForums.Resources.StartedBy: @topic.StartedByName @PopForums.Resources.In @Model.ForumTitles[topic.ForumID] | @PopForums.Resources.Views: @topic.ViewCount | @PopForums.Resources.Replies: @topic.ReplyCount | @PopForums.Resources.Last: <span class="lastPostTime fTime" data-utc="@topic.LastPostTime.ToString("o")">@TimeFormattingService.GetFormattedTime(topic.LastPostTime, profile)</span> @PopForums.Resources.By @topic.LastPostName
</small>
</td>
Expand Down
4 changes: 2 additions & 2 deletions src/PopForums.Mvc/Areas/Forums/Views/Forum/Index.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ else
</td>
<td>
<h2><a asp-controller="@ForumController.Name" asp-action="Topic" asp-route-id="@topic.UrlName" asp-route-pageNumber="">@topic.Title</a></h2>
<small class="float-right forumDetails">
<small class="float-right d-none d-sm-block">
@PopForums.Resources.StartedBy: @topic.StartedByName | @PopForums.Resources.Views: @topic.ViewCount.ToString("N0") | @PopForums.Resources.Replies: @topic.ReplyCount.ToString("N0") | @PopForums.Resources.Last: <span class="lastPostTime fTime" data-utc="@topic.LastPostTime.ToString("o")">@TimeFormattingService.GetFormattedTime(topic.LastPostTime, profile)</span> @PopForums.Resources.By @topic.LastPostName
</small>
</td>
Expand All @@ -77,7 +77,7 @@ else
</td>
<td>
<h2><a class="titleLink" href=""></a></h2>
<small class="float-right forumDetails">
<small class="float-right d-none d-sm-block">
@PopForums.Resources.StartedBy: <span class="startedByName"></span> | @PopForums.Resources.Views: <span class="viewCount"></span> | @PopForums.Resources.Replies: <span class="replyCount"></span> | @PopForums.Resources.Last: <span class="lastPostTime fTime" data-utc=""></span> @PopForums.Resources.By <span class="lastPostName"></span>
</small>
</td>
Expand Down
2 changes: 1 addition & 1 deletion src/PopForums.Mvc/Areas/Forums/Views/Forum/IndexQA.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ else
</td>
<td>
<h2><a asp-controller="@ForumController.Name" asp-action="Topic" asp-route-id="@topic.UrlName">@topic.Title</a></h2>
<small class="float-right">
<small class="float-right d-none d-sm-block">
@PopForums.Resources.StartedBy: @topic.StartedByName | @PopForums.Resources.Views: @topic.ViewCount.ToString("N0") | @PopForums.Resources.Replies: @topic.ReplyCount.ToString("N0") | @PopForums.Resources.Last: <span class="lastPostTime fTime" data-utc="@topic.LastPostTime.ToString("o")">@TimeFormattingService.GetFormattedTime(topic.LastPostTime, profile)</span> @PopForums.Resources.By @topic.LastPostName
</small>
</td>
Expand Down
2 changes: 1 addition & 1 deletion src/PopForums.Mvc/Areas/Forums/Views/Forum/PostItem.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</div>
@if (Model.Profile != null && !Model.Profile.HideVanity && (Model.Avatars).ContainsKey(Model.Post.UserID))
{
<img src="@Url.Action("Avatar", "Image", new {id = (Model.Avatars)[Model.Post.UserID]})" alt="@String.Format(PopForums.Resources.NameAvatar, Model.Post.Name)" class="avatar float-right ml-3 mb-3" />
<img src="@Url.Action("Avatar", "Image", new {id = (Model.Avatars)[Model.Post.UserID]})" alt="@String.Format(PopForums.Resources.NameAvatar, Model.Post.Name)" class="avatar float-right ml-3 mb-3 d-none d-sm-block" />
}

@Html.Raw(Model.Post.FullText)
Expand Down
2 changes: 1 addition & 1 deletion src/PopForums.Mvc/Areas/Forums/Views/Forum/QAPost.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
</div>
@if (!hideVanity && Model.Avatars.ContainsKey(Model.Post.UserID))
{
<img src="@Url.Action("Avatar", "Image", new { id = (Model.Avatars)[Model.Post.UserID] })" alt="@String.Format(PopForums.Resources.NameAvatar, Model.Post.Name)" class="avatar float-right ml-3 mb-3" />
<img src="@Url.Action("Avatar", "Image", new { id = (Model.Avatars)[Model.Post.UserID] })" alt="@String.Format(PopForums.Resources.NameAvatar, Model.Post.Name)" class="avatar float-right ml-3 mb-3 d-none d-sm-block" />
}

<div class="@if (Model.PostWithChildren.LastReadTime.HasValue && Model.PostWithChildren.Post.PostTime > Model.PostWithChildren.LastReadTime)
Expand Down
4 changes: 2 additions & 2 deletions src/PopForums.Mvc/Areas/Forums/Views/Forum/Recent.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</td>
<td>
<h2>@Html.ActionLink(topic.Title, "Topic", "Forum", new { id = topic.UrlName, pageNumber = 1 }, null)</h2>
<small class="float-right forumDetails">
<small class="float-right d-none d-sm-block">
@PopForums.Resources.StartedBy: @topic.StartedByName @PopForums.Resources.In @Model.ForumTitles[topic.ForumID] | @PopForums.Resources.Views: @topic.ViewCount | @PopForums.Resources.Replies: @topic.ReplyCount | @PopForums.Resources.Last: <span class="lastPostTime fTime" data-utc="@topic.LastPostTime.ToString("o")">@TimeFormattingService.GetFormattedTime(topic.LastPostTime, profile)</span> @PopForums.Resources.By @topic.LastPostName
</small>
</td>
Expand All @@ -57,7 +57,7 @@
</td>
<td>
<h2><a class="titleLink" href=""></a></h2>
<small class="float-right forumDetails">
<small class="float-right d-none d-sm-block">
@PopForums.Resources.StartedBy: <span class="startedByName"></span> @PopForums.Resources.In <span class="forumTitle"></span> | @PopForums.Resources.Views: <span class="viewCount"></span> | @PopForums.Resources.Replies: <span class="replyCount"></span> | @PopForums.Resources.Last: <span class="lastPostTime fTime" data-utc=""></span> @PopForums.Resources.By <span class="lastPostName"></span>
</small>
</td>
Expand Down
4 changes: 2 additions & 2 deletions src/PopForums.Mvc/Areas/Forums/Views/Home/Index.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<td>
<h2><a asp-controller="Forum" asp-action="Index" asp-route-urlName="@forum.UrlName">@forum.Title</a></h2>
<p>@forum.Description</p>
<small class="float-right text-secondary forumDetails">
<small class="float-right text-secondary d-none d-sm-block">
@PopForums.Resources.Topics: <span class="topicCount">@forum.TopicCount.ToString("N0")</span> | @PopForums.Resources.Posts: <span class="postCount">@forum.PostCount.ToString("N0")</span> | @PopForums.Resources.Last: <span class="lastPostTime fTime" data-utc="@forum.LastPostTime.ToString("o")">@TimeFormattingService.GetFormattedTime(forum.LastPostTime, profile)</span> @PopForums.Resources.By <span class="lastPostName">@forum.LastPostName</span>
</small>
</td>
Expand All @@ -52,7 +52,7 @@
<td>
<h2><a asp-controller="Forum" asp-action="Index" asp-route-urlName="@forum.UrlName">@forum.Title</a></h2>
<p>@forum.Description</p>
<small class="float-right text-secondary forumDetails">
<small class="float-right text-secondary d-none d-sm-block">
@PopForums.Resources.Topics: <span class="topicCount">@forum.TopicCount.ToString("N0")</span> | @PopForums.Resources.Posts: <span class="postCount">@forum.PostCount.ToString("N0")</span> | @PopForums.Resources.Last: <span class="lastPostTime fTime" data-utc="@forum.LastPostTime.ToString("o")">@TimeFormattingService.GetFormattedTime(forum.LastPostTime, profile)</span> @PopForums.Resources.By <span class="lastPostName">@forum.LastPostName</span>
</small>
</td>
Expand Down
2 changes: 1 addition & 1 deletion src/PopForums.Mvc/Areas/Forums/Views/Search/Index.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ else
</td>
<td>
<h2>@Html.ActionLink(topic.Title, "Topic", "Forum", new { id = topic.UrlName, pageNumber = 1 }, null)</h2>
<small class="pull-right forumDetails">
<small class="float-right d-none d-sm-block">
@PopForums.Resources.StartedBy: @topic.StartedByName @PopForums.Resources.In @Model.ForumTitles[topic.ForumID] | @PopForums.Resources.Views: @topic.ViewCount | @PopForums.Resources.Replies: @topic.ReplyCount | @PopForums.Resources.Last: <span class="lastPostTime fTime" data-utc="@topic.LastPostTime.ToString("o")">@TimeFormattingService.GetFormattedTime(topic.LastPostTime, profile)</span> @PopForums.Resources.By @topic.LastPostName
</small>
</td>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ else
</td>
<td>
<h2><a asp-controller="@ForumController.Name" asp-action="Topic" asp-route-id="@topic.UrlName" asp-route-pageNumber="">@topic.Title</a></h2>
<small class="pull-right forumDetails">
<small class="float-right d-none d-sm-block">
@PopForums.Resources.StartedBy: @topic.StartedByName @PopForums.Resources.In @Model.ForumTitles[topic.ForumID] | @PopForums.Resources.Views: @topic.ViewCount | @PopForums.Resources.Replies: @topic.ReplyCount | @PopForums.Resources.Last: <span class="lastPostTime fTime" data-utc="@topic.LastPostTime.ToString("o")">@TimeFormattingService.GetFormattedTime(topic.LastPostTime, profile)</span> @PopForums.Resources.By @topic.LastPostName
</small>
</td>
Expand Down
2 changes: 1 addition & 1 deletion src/PopForums.Web/wwwroot/lib/PopForums/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@popworldmedia/popforums",
"version": "17.0.0-prerelease.92",
"version": "17.0.0-prerelease.102",
"description": "POP Forums client side",
"scripts": {},
"repository": {
Expand Down
12 changes: 0 additions & 12 deletions src/PopForums.Web/wwwroot/lib/PopForums/src/PopForums.css
Original file line number Diff line number Diff line change
Expand Up @@ -171,18 +171,6 @@

/* queries */

@media(max-width:479px) {
#ForumContainer .avatar {
display: none;
}
}

@media(max-width:639px) {
#ForumContainer .forumDetails {
display: none;
}
}

@media(min-width:1px) {
#ForumContainer #PreviewModal .modal-dialog {
width: 90%!important;
Expand Down

0 comments on commit 60da3b7

Please sign in to comment.