Skip to content

Commit 0e06817

Browse files
farzindevfarzindev
committed
Standard theme IE fixed. FontAwesome added.
1 parent 3c27636 commit 0e06817

20 files changed

+757
-1367
lines changed

‎BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -568,8 +568,8 @@
568568
<Content Include="Custom\Themes\Standard\newsletter.html" />
569569
<Content Include="Custom\Themes\Standard\PostView.ascx" />
570570
<Content Include="Custom\Themes\Standard\src\css\bootstrap.min.css" />
571-
<Content Include="Custom\Themes\Standard\src\css\styles.css" />
572571
<Content Include="Custom\Themes\Standard\Gruntfile.js" />
572+
<Content Include="Custom\Themes\Standard\src\css\font-awesome.min.css" />
573573
<Content Include="Custom\Themes\Standard\src\css\styles.min.css" />
574574
<Content Include="Custom\Themes\Standard\src\img\logo.png" />
575575
<Content Include="Custom\Themes\Standard\src\js\bootstrap.min.js" />
@@ -749,7 +749,6 @@
749749
<Content Include="Custom\Themes\Standard-2016\fonts\fontello.woff" />
750750
<Content Include="Custom\Themes\Standard-2016\site.master" />
751751
<Content Include="Custom\Themes\Standard\site.master" />
752-
<Content Include="Custom\Themes\Standard\src\css\styles.css.map" />
753752
<Content Include="Custom\Themes\Standard\package.json" />
754753
<Content Include="Custom\Themes\Standard\src\scss\base\_base.scss" />
755754
<Content Include="Custom\Themes\Standard\src\scss\base\_mixins.scss" />
@@ -2447,6 +2446,7 @@
24472446
<Folder Include="App_Data\files\" />
24482447
<Folder Include="App_Data\packages\" />
24492448
<Folder Include="bin\" />
2449+
<Folder Include="Custom\Themes\Standard\src\fonts\" />
24502450
</ItemGroup>
24512451
<ItemGroup>
24522452
<Service Include="{4A0DDDB5-7A95-4FBF-97CC-616D07737A77}" />

‎BlogEngine/BlogEngine.NET/Custom/Themes/Standard/Gruntfile.js

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,12 @@
1111
files: {
1212
'src/css/styles.min.css': 'src/scss/styles.scss',
1313
}
14-
},
15-
dev: {
16-
options: {
17-
style: 'expanded',
18-
},
19-
files: {
20-
'src/css/styles.css': 'src/scss/styles.scss',
21-
}
2214
}
2315
},
2416
watch: {
2517
src: {
2618
files: ['src/scss/**/*.scss'],
27-
tasks: ['sass:dist', 'sass:dev']
19+
tasks: ['sass']
2820
}
2921
}
3022
});

‎BlogEngine/BlogEngine.NET/Custom/Themes/Standard/site.master

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<meta name="viewport" content="width=device-width, initial-scale=1">
2626
<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Roboto+Slab:400,700" rel="stylesheet">
2727
<link href="src/css/bootstrap.min.css" rel="stylesheet" />
28+
<link href="src/css/font-awesome.min.css" rel="stylesheet" />
2829
<link href="src/css/styles.min.css" rel="stylesheet" />
2930
<link href="~/scripts/syntaxhighlighter/styles/shCore.css" rel="stylesheet" type="text/css" />
3031
<link href="~/scripts/syntaxhighlighter/styles/shThemeDefault.css" rel="stylesheet" type="text/css" />
@@ -47,9 +48,9 @@
4748
</a>
4849
<nav class="blog-nav">
4950
<ul class="clearfix">
50-
<li><a href="<%=Utils.AbsoluteWebRoot %>" class="item-home" title="<%=Resources.labels.home %>"><span><%=Resources.labels.home %></span></a></li>
51-
<li><a href="<%=Utils.AbsoluteWebRoot %>archive" class="item-archive" title="<%=Resources.labels.archive %>"><span><%=Resources.labels.archive %></span></a></li>
52-
<li><a href="<%=Utils.AbsoluteWebRoot %>contact" class="item-contact" title="<%=Resources.labels.contact %>"><span><%=Resources.labels.contact %></span></a></li>
51+
<li><a href="<%=Utils.AbsoluteWebRoot %>" class="item-home" title="<%=Resources.labels.home %>"><i class="fa fa-home"></i></a></li>
52+
<li><a href="<%=Utils.AbsoluteWebRoot %>archive" class="item-archive" title="<%=Resources.labels.archive %>"><i class="fa fa-align-left"></i></a></li>
53+
<li><a href="<%=Utils.AbsoluteWebRoot %>contact" class="item-contact" title="<%=Resources.labels.contact %>"><i class="fa fa-envelope"></i></a></li>
5354
<li><a runat="server" id="aLogin" class="item-login" title=""><span id="aLoginText" runat="server"></span></a></li>
5455
</ul>
5556
</nav>

‎BlogEngine/BlogEngine.NET/Custom/Themes/Standard/src/css/font-awesome.min.css

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎BlogEngine/BlogEngine.NET/Custom/Themes/Standard/src/css/styles.css

Lines changed: 0 additions & 1303 deletions
This file was deleted.

‎BlogEngine/BlogEngine.NET/Custom/Themes/Standard/src/css/styles.css.map

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎BlogEngine/BlogEngine.NET/Custom/Themes/Standard/src/css/styles.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎BlogEngine/BlogEngine.NET/Custom/Themes/Standard/src/css/styles.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎BlogEngine/BlogEngine.NET/Custom/Themes/Standard/src/fonts/FontAwesome.otf

122 KB
Binary file not shown.

‎BlogEngine/BlogEngine.NET/Custom/Themes/Standard/src/fonts/fontawesome-webfont.eot

74.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)