Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small changes for mini theme #392

Merged
merged 6 commits into from
Jul 4, 2022
Merged

Small changes for mini theme #392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
74e8578
using Umbraco.Extensions (for GetCropUrl)
erikjanwestendorp Jul 2, 2022
3a1e344
IsNullOrWhiteSpace
erikjanwestendorp Jul 2, 2022
e679a6b
Use Smidge
erikjanwestendorp Jul 2, 2022
7d79d20
Null check
erikjanwestendorp Jul 2, 2022
42216a8
Update Share.cshtml
erikjanwestendorp Jul 2, 2022
5bbd4a6
Use Umbraco.Extensions (GetCropUrl)
erikjanwestendorp Jul 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Articulate/App_Plugins/Articulate/Themes/Mini/Views/Author.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@using Articulate
@using Umbraco.Extensions

@model Articulate.Models.AuthorModel
@{
Expand Down
3 changes: 1 addition & 2 deletions src/Articulate/App_Plugins/Articulate/Themes/Mini/Views/List.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@using Articulate
@using Articulate.Models

@using Umbraco.Extensions

@model Articulate.Models.ListModel
@{
Expand Down
22 changes: 10 additions & 12 deletions src/Articulate/App_Plugins/Articulate/Themes/Mini/Views/Master.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@

@addTagHelper *, Smidge
@using Articulate;

@model Articulate.Models.IMasterModel

<!doctype html>
Expand Down Expand Up @@ -27,25 +28,22 @@
<meta http-equiv="imagetoolbar" content="no">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<![endif]-->
@{ Html
.RequiresCss("https://fonts.googleapis.com/css?family=Raleway:200")
.RequiresCss("https://fonts.googleapis.com/css?family=Open+Sans:300")
.RequiresCss("https://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css")
.RequiresJs("https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js")
.RequiresThemedCssFolder(Model);
}

@Html.RenderCssHere()
<link href="https://fonts.googleapis.com/css?family=Raleway:200" rel="stylesheet" />
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300" rel="stylesheet" />
<link href="https://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet" />

<link href="articulate-mini-css" rel="stylesheet" />

@RenderSection("Header", false)
</head>

<body class="@ViewBag.CssBodyClass">

@RenderBody()

@Html.RenderJsHere()
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js" type="text/javascript"></script>

@Html.GoogleAnalyticsTracking(Model)
</body>

</html>
</html>
4 changes: 2 additions & 2 deletions src/Articulate/App_Plugins/Articulate/Themes/Mini/Views/Partials/Header.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<div class="header-placeholder">&nbsp;</div>

@{
var backgroundStyle = !Model.BlogBanner.IsNullOrWhiteSpace()
var backgroundStyle = !string.IsNullOrWhiteSpace(Model.BlogBanner)
? "background-image: url(" + Model.BlogBanner + ");"
: "";
}

<div class="header-content" style="@backgroundStyle">


@if (!Model.BlogLogo.IsNullOrWhiteSpace())
@if (!string.IsNullOrWhiteSpace(Model.BlogLogo))
{
<a class="logo" href="@Url.ArticulateRootUrl(Model)"><img src="@Model.BlogLogo" alt="Blog Logo" class="blog-logo" /></a>
}
Expand Down
7 changes: 4 additions & 3 deletions src/Articulate/App_Plugins/Articulate/Themes/Mini/Views/Partials/Share.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
@using Articulate
@using Umbraco.Cms.Core.Models.PublishedContent
@using Umbraco.Extensions
@model Articulate.Models.PostModel

<!--- SHARING SECTION --->
<div class="post-share">
<i class="share-button fa fa-share fa-2x"></i>
<a title="Share on Facebook" target="_blank" href="http://www.facebook.com/sharer.php?u=@UmbracoContext.UrlAbsolute(Model.Id)">
<a title="Share on Facebook" target="_blank" href="http://www.facebook.com/sharer.php?u=@Model.Url(mode: UrlMode.Absolute)">
<div class="share-button"><i class="fa fa-facebook-square fa-2x"></i></div>
</a>
<a title="Share on Twitter" target="_blank" href="http://twitter.com/[email protected]&amp;url=@UmbracoContext.UrlAbsolute(Model.Id)">
<a title="Share on Twitter" target="_blank" href="http://twitter.com/[email protected]&amp;url=@Model.Url(mode: UrlMode.Absolute)">
<div class="share-button"><i class="fa fa-twitter-square fa-2x"></i></div>
</a>
</div>
2 changes: 1 addition & 1 deletion src/Articulate/App_Plugins/Articulate/Themes/Mini/Views/Post.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
</div>
<div class="hrule"></div>
<div class="postContent">
@if (!Model.CroppedPostImageUrl.IsNullOrWhiteSpace())
@if (!string.IsNullOrWhiteSpace(Model.CroppedPostImageUrl))
{
<img class="postImage" alt="@Model.Name" src="@Model.CroppedPostImageUrl" />
}
Expand Down
2 changes: 2 additions & 0 deletions src/Articulate/Components/ArticulateComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ public void Initialize()
_bundleManager.CreateCss("articulate-material-css", RequiredThemedCssFolder("Material"));

_bundleManager.CreateCss("articulate-phantom-css", RequiredThemedCssFolder("Phantom"));

_bundleManager.CreateCss("articulate-mini-css", RequiredThemedCssFolder("Mini"));
}

public void Terminate()
Expand Down