Skip to content

Google fonts https #229

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

Merged
merged 4 commits into from
Apr 2, 2021
Merged

Google fonts https #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
40fd1d4
Update labels.es.resx
mainmind83 Jun 10, 2020
da6688b
share button translation
Jun 10, 2020
b16886d
general resource
Jun 10, 2020
dcb6925
Remove the protocol from your URL and let the browser determine it
Jun 10, 2020
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,3 +186,5 @@ BlogEngine/.vs/

# Default extensions data
BlogEngine/BlogEngine.NET/App_Data/datastore/extensions/*.xml
/.vs/slnx.sqlite
/.vs/BlogEngine.NET/config/applicationhost.config
2 changes: 1 addition & 1 deletion BlogEngine/BlogEngine.NET/Account/account.master
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<head id="Head1" runat="server">
<title>Account Login</title>
<meta name="description" content="Account Login Membership User Password" />
<link href='http://fonts.googleapis.com/css?family=Roboto:400,500' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Roboto:400,500' rel='stylesheet' type='text/css'>
<link href="account.css" rel="stylesheet" />
<script src="../Scripts/jquery-2.1.4.min.js"></script>
<script type="text/javascript" src="account.js"></script>
Expand Down
5 changes: 4 additions & 1 deletion BlogEngine/BlogEngine.NET/App_GlobalResources/labels.es.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,9 @@
<data name="contact" xml:space="preserve">
<value>Contactarnos</value>
</data>
<data name="share" xml:space="preserve">
<value>Compartir</value>
</data>
<data name="contactForm" xml:space="preserve">
<value>Formulario de Contacto</value>
</data>
Expand Down Expand Up @@ -1736,4 +1739,4 @@
<data name="phoneMain" xml:space="preserve">
<value>Teléfono</value>
</data>
</root>
</root>
3 changes: 3 additions & 0 deletions BlogEngine/BlogEngine.NET/App_GlobalResources/labels.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2594,4 +2594,7 @@
<data name="changeName" xml:space="preserve">
<value>Change Name</value>
</data>
<data name="share" xml:space="preserve">
<value>Share</value>
</data>
</root>
4 changes: 2 additions & 2 deletions BlogEngine/BlogEngine.NET/Custom/Themes/Standard/PostView.ascx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,15 @@
{%><span class="post-category"><i class="fa fa-folder-open"></i> <%=postCategory %></span>
<% } %>
<div class="dropdown post-share float-md-right">
<a class="dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-share-alt"></i>share</a>
<a class="dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-share-alt"></i><%=Resources.labels.share %></a>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuLink">
<a class="dropdown-item item-fb" href="https://www.addtoany.com/add_to/facebook?linkurl=<%=Post.AbsoluteLink %>&amp;linkname=<%=postTitle %>" target="_blank"><i class="fa fa-facebook-square"></i>Facebook</a>
<a class="dropdown-item item-tw" href="https://www.addtoany.com/add_to/twitter?linkurl=<%=Post.AbsoluteLink %>&amp;linkname=<%=postTitle %>" target="_blank"><i class="fa fa-twitter-square"></i>Twitter</a>
<a class="dropdown-item item-gp" href="https://www.addtoany.com/add_to/google_plus?linkurl=<%=Post.AbsoluteLink %>&amp;linkname=<%=postTitle %>" target="_blank"><i class="fa fa-google-plus-square"></i>Google +</a>
<a class="dropdown-item item-ln" href="https://www.addtoany.com/add_to/linkedin?linkurl=<%=Post.AbsoluteLink %>&amp;linkname=<%=postTitle %>" target="_blank"><i class="fa fa-linkedin-square"></i>LinkedIn</a>
<a class="dropdown-item item-pi" href="https://www.addtoany.com/add_to/pinterest?linkurl=<%=Post.AbsoluteLink %>&amp;linkname=<%=postTitle %>" target="_blank"><i class="fa fa-pinterest-square"></i>Pinterest</a>
<a class="dropdown-item item-em" href="https://www.addtoany.com/add_to/email?linkurl=<%=Post.AbsoluteLink %>&amp;linkname=<%=postTitle %>" target="_blank"><i class="fa fa-envelope-square"></i>Email</a>
<a class="dropdown-item item-em" href="https://www.addtoany.com/share?linkurl=<%=Post.AbsoluteLink %>&amp;linkname=<%=postTitle %>" target="_blank"><i class="fa fa-plus-square"></i>Share...</a>
<a class="dropdown-item item-em" href="https://www.addtoany.com/share?linkurl=<%=Post.AbsoluteLink %>&amp;linkname=<%=postTitle %>" target="_blank"><i class="fa fa-plus-square"></i><%=Resources.labels.share %>...</a>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion BlogEngine/BlogEngine.NET/admin/app/editor/filemanager.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<html data-ng-app="blogAdmin">
<head>
<meta charset="utf-8" />
<link href='http://fonts.googleapis.com/css?family=Roboto:300,400,500' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Roboto:300,400,500' rel='stylesheet' type='text/css'>
@Styles.Render("~/Content/admincss")
<link href="~/admin/themes/standard/css/styles.css" rel="stylesheet" type="text/css" />
<script type="text/javascript">
Expand Down
2 changes: 1 addition & 1 deletion BlogEngine/BlogEngine.NET/admin/themes/standard/layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
<title>@BlogSettings.Instance.Name (@Security.CurrentMembershipUser.UserName)</title>
<link href="http://fonts.googleapis.com/css?family=Roboto:400,500,700" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Roboto:400,500,700" rel="stylesheet">
@Styles.Render("~/Content/admincss")
<link href="~/admin/themes/standard/css/styles.css?ver=4" rel="stylesheet">
<link rel="shortcut icon" href="@Href(Utils.ApplicationRelativeWebRoot + "Content/images/blog/blogengine.ico")" type="image/x-icon" />
Expand Down