Skip to content

Commit b4e5103

Browse files
committed
Standard Theme improved.
1 parent b225a85 commit b4e5103

28 files changed

Lines changed: 1640 additions & 671 deletions

BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj

Lines changed: 7 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -566,12 +566,11 @@
566566
<Content Include="Custom\Themes\Standard\CommentForm.ascx" />
567567
<Content Include="Custom\Themes\Standard\CommentView.ascx" />
568568
<Content Include="Custom\Themes\Standard\newsletter.html" />
569-
<Content Include="Custom\Themes\Standard\PostNavigation.ascx" />
570569
<Content Include="Custom\Themes\Standard\PostView.ascx" />
571-
<Content Include="Custom\Themes\Standard\RelatedPosts.ascx" />
572570
<Content Include="Custom\Themes\Standard\src\css\bootstrap.min.css" />
573571
<Content Include="Custom\Themes\Standard\src\css\styles.css" />
574572
<Content Include="Custom\Themes\Standard\Gruntfile.js" />
573+
<Content Include="Custom\Themes\Standard\src\css\styles.min.css" />
575574
<Content Include="Custom\Themes\Standard\src\img\logo.png" />
576575
<Content Include="Custom\Themes\Standard\src\js\bootstrap.min.js" />
577576
<Content Include="Custom\Themes\Standard\src\js\custom.js" />
@@ -750,49 +749,15 @@
750749
<Content Include="Custom\Themes\Standard-2016\fonts\fontello.woff" />
751750
<Content Include="Custom\Themes\Standard-2016\site.master" />
752751
<Content Include="Custom\Themes\Standard\site.master" />
753-
<Content Include="Custom\Themes\Standard\src\.sass-cache\29cfab1821d857604207ef390331263fb669ccd2\_footer.scssc" />
754-
<Content Include="Custom\Themes\Standard\src\.sass-cache\29cfab1821d857604207ef390331263fb669ccd2\_header.scssc" />
755-
<Content Include="Custom\Themes\Standard\src\.sass-cache\29cfab1821d857604207ef390331263fb669ccd2\_pages.scssc" />
756-
<Content Include="Custom\Themes\Standard\src\.sass-cache\29cfab1821d857604207ef390331263fb669ccd2\_widgets.scssc" />
757-
<Content Include="Custom\Themes\Standard\src\.sass-cache\440357b90b4b05a78451dccca2dfca40441a91a5\_base.scssc" />
758-
<Content Include="Custom\Themes\Standard\src\.sass-cache\440357b90b4b05a78451dccca2dfca40441a91a5\_mixins.scssc" />
759-
<Content Include="Custom\Themes\Standard\src\.sass-cache\440357b90b4b05a78451dccca2dfca40441a91a5\_utilites.scssc" />
760-
<Content Include="Custom\Themes\Standard\src\.sass-cache\440357b90b4b05a78451dccca2dfca40441a91a5\_variables.scssc" />
761-
<Content Include="Custom\Themes\Standard\src\.sass-cache\94f381509e2bb4049f0750f527c39a6cc2137e36\_archive.scssc" />
762-
<Content Include="Custom\Themes\Standard\src\.sass-cache\94f381509e2bb4049f0750f527c39a6cc2137e36\_comments.scssc" />
763-
<Content Include="Custom\Themes\Standard\src\.sass-cache\94f381509e2bb4049f0750f527c39a6cc2137e36\_post.navigation.scssc" />
764-
<Content Include="Custom\Themes\Standard\src\.sass-cache\94f381509e2bb4049f0750f527c39a6cc2137e36\_post.pager.scssc" />
765-
<Content Include="Custom\Themes\Standard\src\.sass-cache\94f381509e2bb4049f0750f527c39a6cc2137e36\_post.related.scssc" />
766-
<Content Include="Custom\Themes\Standard\src\.sass-cache\94f381509e2bb4049f0750f527c39a6cc2137e36\_posts.scssc" />
767-
<Content Include="Custom\Themes\Standard\src\.sass-cache\94f381509e2bb4049f0750f527c39a6cc2137e36\_search.scssc" />
768-
<Content Include="Custom\Themes\Standard\src\.sass-cache\958e908f075a8b61bd811b2dde0fc5a17e505f79\styles.scssc" />
769-
<Content Include="Custom\Themes\Standard\src\.sass-cache\af76f6fee08e0eabc8ffac341c06fcde0f5d0ae3\_authorlist.scssc" />
770-
<Content Include="Custom\Themes\Standard\src\.sass-cache\af76f6fee08e0eabc8ffac341c06fcde0f5d0ae3\_blogroll.scssc" />
771-
<Content Include="Custom\Themes\Standard\src\.sass-cache\af76f6fee08e0eabc8ffac341c06fcde0f5d0ae3\_calendar.scssc" />
772-
<Content Include="Custom\Themes\Standard\src\.sass-cache\af76f6fee08e0eabc8ffac341c06fcde0f5d0ae3\_categorylist.scssc" />
773-
<Content Include="Custom\Themes\Standard\src\.sass-cache\af76f6fee08e0eabc8ffac341c06fcde0f5d0ae3\_monthlist.scssc" />
774-
<Content Include="Custom\Themes\Standard\src\.sass-cache\af76f6fee08e0eabc8ffac341c06fcde0f5d0ae3\_mostcomments.scssc" />
775-
<Content Include="Custom\Themes\Standard\src\.sass-cache\af76f6fee08e0eabc8ffac341c06fcde0f5d0ae3\_newsletter.scssc" />
776-
<Content Include="Custom\Themes\Standard\src\.sass-cache\af76f6fee08e0eabc8ffac341c06fcde0f5d0ae3\_postlist.scssc" />
777-
<Content Include="Custom\Themes\Standard\src\.sass-cache\af76f6fee08e0eabc8ffac341c06fcde0f5d0ae3\_recentcomments.scssc" />
778-
<Content Include="Custom\Themes\Standard\src\.sass-cache\af76f6fee08e0eabc8ffac341c06fcde0f5d0ae3\_recentposts.scssc" />
779-
<Content Include="Custom\Themes\Standard\src\.sass-cache\af76f6fee08e0eabc8ffac341c06fcde0f5d0ae3\_search.scssc" />
780-
<Content Include="Custom\Themes\Standard\src\.sass-cache\af76f6fee08e0eabc8ffac341c06fcde0f5d0ae3\_tagcould.scssc" />
781-
<Content Include="Custom\Themes\Standard\src\.sass-cache\af76f6fee08e0eabc8ffac341c06fcde0f5d0ae3\_textbox.scssc" />
782-
<Content Include="Custom\Themes\Standard\src\.sass-cache\bf57f48770b83de96384fbd1cde8144de7937c6d\_buttons.scssc" />
783-
<Content Include="Custom\Themes\Standard\src\.sass-cache\bf57f48770b83de96384fbd1cde8144de7937c6d\_forms.scssc" />
784-
<Content Include="Custom\Themes\Standard\src\.sass-cache\bf57f48770b83de96384fbd1cde8144de7937c6d\_rating.scssc" />
785-
<Content Include="Custom\Themes\Standard\src\.sass-cache\bf57f48770b83de96384fbd1cde8144de7937c6d\_syntaxhighlighter.scssc" />
786752
<Content Include="Custom\Themes\Standard\src\css\styles.css.map" />
787753
<Content Include="Custom\Themes\Standard\package.json" />
788754
<Content Include="Custom\Themes\Standard\src\scss\base\_base.scss" />
789755
<Content Include="Custom\Themes\Standard\src\scss\base\_mixins.scss" />
790-
<Content Include="Custom\Themes\Standard\src\scss\base\_utilites.scss" />
791756
<Content Include="Custom\Themes\Standard\src\scss\base\_variables.scss" />
792-
<Content Include="Custom\Themes\Standard\src\scss\layout\_footer.scss" />
793-
<Content Include="Custom\Themes\Standard\src\scss\layout\_header.scss" />
794-
<Content Include="Custom\Themes\Standard\src\scss\layout\_pages.scss" />
795-
<Content Include="Custom\Themes\Standard\src\scss\layout\_widgets.scss" />
757+
<Content Include="Custom\Themes\Standard\src\scss\sections\_footer.scss" />
758+
<Content Include="Custom\Themes\Standard\src\scss\sections\_header.scss" />
759+
<Content Include="Custom\Themes\Standard\src\scss\sections\_pages.scss" />
760+
<Content Include="Custom\Themes\Standard\src\scss\sections\_widgets.scss" />
796761
<Content Include="Custom\Themes\Standard\src\scss\modules\_buttons.scss" />
797762
<Content Include="Custom\Themes\Standard\src\scss\modules\_forms.scss" />
798763
<Content Include="Custom\Themes\Standard\src\scss\modules\_rating.scss" />
@@ -817,9 +782,10 @@
817782
<Content Include="Custom\Themes\Standard\src\scss\widgets\_search.scss" />
818783
<Content Include="Custom\Themes\Standard\src\scss\widgets\_tagcould.scss" />
819784
<Content Include="Custom\Themes\Standard\src\scss\widgets\_textbox.scss" />
820-
<Content Include="Custom\Themes\Standard\src\scss\layout\_rtl.scss" />
785+
<Content Include="Custom\Themes\Standard\src\scss\widgets\_rtl.scss" />
821786
<Content Include="admin\themes\standard\README.md" />
822787
<Content Include="admin\themes\standard\scss\rtl\_rtl.widgets.scss" />
788+
<Content Include="Custom\Themes\Standard\src\css\styles.min.css.map" />
823789
<None Include="Scripts\jquery-2.1.4.intellisense.js" />
824790
<Content Include="Scripts\i18n\angular-locale_aa-dj.js" />
825791
<Content Include="Scripts\i18n\angular-locale_aa-er.js" />

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

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,20 @@
11
module.exports = function (grunt) {
22
grunt.initConfig({
33
sass: {
4+
options: {
5+
noCache: true
6+
},
47
dist: {
58
options: {
6-
style: 'compact'
9+
style: 'compressed',
10+
},
11+
files: {
12+
'src/css/styles.min.css': 'src/scss/styles.scss',
13+
}
14+
},
15+
dev: {
16+
options: {
17+
style: 'expanded',
718
},
819
files: {
920
'src/css/styles.css': 'src/scss/styles.scss',
@@ -13,7 +24,7 @@
1324
watch: {
1425
src: {
1526
files: ['src/scss/**/*.scss'],
16-
tasks: ['sass']
27+
tasks: ['sass:dist', 'sass:dev']
1728
}
1829
}
1930
});

BlogEngine/BlogEngine.NET/Custom/Themes/Standard/PostNavigation.ascx

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

BlogEngine/BlogEngine.NET/Custom/Themes/Standard/RelatedPosts.ascx

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
}
2020
%>
2121
<!DOCTYPE html>
22-
<html lang="en">
22+
<html>
2323
<head runat="server">
2424
<meta http-equiv="X-UA-Compatible" content="IE=edge">
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/styles.css" rel="stylesheet" />
28+
<link href="src/css/styles.min.css" rel="stylesheet" />
2929
<link href="~/scripts/syntaxhighlighter/styles/shCore.css" rel="stylesheet" type="text/css" />
3030
<link href="~/scripts/syntaxhighlighter/styles/shThemeDefault.css" rel="stylesheet" type="text/css" />
3131
<script type="text/javascript" src="<%# Utils.ApplicationRelativeWebRoot %>scripts/syntaxhighlighter/scripts/XRegExp.js"></script>

0 commit comments

Comments
 (0)