Standard Theme improved.

ittech25 · Sep 1, 2016 · b4e5103 · b4e5103
1 parent b225a85
commit b4e5103
Show file tree

Hide file tree

Showing 28 changed files with 1,640 additions and 671 deletions.
diff --git a/BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj b/BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj
@@ -566,12 +566,11 @@
     <Content Include="Custom\Themes\Standard\CommentForm.ascx" />
     <Content Include="Custom\Themes\Standard\CommentView.ascx" />
     <Content Include="Custom\Themes\Standard\newsletter.html" />
-    <Content Include="Custom\Themes\Standard\PostNavigation.ascx" />
     <Content Include="Custom\Themes\Standard\PostView.ascx" />
-    <Content Include="Custom\Themes\Standard\RelatedPosts.ascx" />
     <Content Include="Custom\Themes\Standard\src\css\bootstrap.min.css" />
     <Content Include="Custom\Themes\Standard\src\css\styles.css" />
     <Content Include="Custom\Themes\Standard\Gruntfile.js" />
+    <Content Include="Custom\Themes\Standard\src\css\styles.min.css" />
     <Content Include="Custom\Themes\Standard\src\img\logo.png" />
     <Content Include="Custom\Themes\Standard\src\js\bootstrap.min.js" />
     <Content Include="Custom\Themes\Standard\src\js\custom.js" />
@@ -750,49 +749,15 @@
     <Content Include="Custom\Themes\Standard-2016\fonts\fontello.woff" />
     <Content Include="Custom\Themes\Standard-2016\site.master" />
     <Content Include="Custom\Themes\Standard\site.master" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\29cfab1821d857604207ef390331263fb669ccd2\_footer.scssc" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\29cfab1821d857604207ef390331263fb669ccd2\_header.scssc" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\29cfab1821d857604207ef390331263fb669ccd2\_pages.scssc" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\29cfab1821d857604207ef390331263fb669ccd2\_widgets.scssc" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\440357b90b4b05a78451dccca2dfca40441a91a5\_base.scssc" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\440357b90b4b05a78451dccca2dfca40441a91a5\_mixins.scssc" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\440357b90b4b05a78451dccca2dfca40441a91a5\_utilites.scssc" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\440357b90b4b05a78451dccca2dfca40441a91a5\_variables.scssc" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\94f381509e2bb4049f0750f527c39a6cc2137e36\_archive.scssc" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\94f381509e2bb4049f0750f527c39a6cc2137e36\_comments.scssc" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\94f381509e2bb4049f0750f527c39a6cc2137e36\_post.navigation.scssc" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\94f381509e2bb4049f0750f527c39a6cc2137e36\_post.pager.scssc" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\94f381509e2bb4049f0750f527c39a6cc2137e36\_post.related.scssc" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\94f381509e2bb4049f0750f527c39a6cc2137e36\_posts.scssc" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\94f381509e2bb4049f0750f527c39a6cc2137e36\_search.scssc" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\958e908f075a8b61bd811b2dde0fc5a17e505f79\styles.scssc" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\af76f6fee08e0eabc8ffac341c06fcde0f5d0ae3\_authorlist.scssc" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\af76f6fee08e0eabc8ffac341c06fcde0f5d0ae3\_blogroll.scssc" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\af76f6fee08e0eabc8ffac341c06fcde0f5d0ae3\_calendar.scssc" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\af76f6fee08e0eabc8ffac341c06fcde0f5d0ae3\_categorylist.scssc" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\af76f6fee08e0eabc8ffac341c06fcde0f5d0ae3\_monthlist.scssc" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\af76f6fee08e0eabc8ffac341c06fcde0f5d0ae3\_mostcomments.scssc" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\af76f6fee08e0eabc8ffac341c06fcde0f5d0ae3\_newsletter.scssc" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\af76f6fee08e0eabc8ffac341c06fcde0f5d0ae3\_postlist.scssc" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\af76f6fee08e0eabc8ffac341c06fcde0f5d0ae3\_recentcomments.scssc" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\af76f6fee08e0eabc8ffac341c06fcde0f5d0ae3\_recentposts.scssc" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\af76f6fee08e0eabc8ffac341c06fcde0f5d0ae3\_search.scssc" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\af76f6fee08e0eabc8ffac341c06fcde0f5d0ae3\_tagcould.scssc" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\af76f6fee08e0eabc8ffac341c06fcde0f5d0ae3\_textbox.scssc" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\bf57f48770b83de96384fbd1cde8144de7937c6d\_buttons.scssc" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\bf57f48770b83de96384fbd1cde8144de7937c6d\_forms.scssc" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\bf57f48770b83de96384fbd1cde8144de7937c6d\_rating.scssc" />
-    <Content Include="Custom\Themes\Standard\src\.sass-cache\bf57f48770b83de96384fbd1cde8144de7937c6d\_syntaxhighlighter.scssc" />
     <Content Include="Custom\Themes\Standard\src\css\styles.css.map" />
     <Content Include="Custom\Themes\Standard\package.json" />
     <Content Include="Custom\Themes\Standard\src\scss\base\_base.scss" />
     <Content Include="Custom\Themes\Standard\src\scss\base\_mixins.scss" />
-    <Content Include="Custom\Themes\Standard\src\scss\base\_utilites.scss" />
     <Content Include="Custom\Themes\Standard\src\scss\base\_variables.scss" />
-    <Content Include="Custom\Themes\Standard\src\scss\layout\_footer.scss" />
-    <Content Include="Custom\Themes\Standard\src\scss\layout\_header.scss" />
-    <Content Include="Custom\Themes\Standard\src\scss\layout\_pages.scss" />
-    <Content Include="Custom\Themes\Standard\src\scss\layout\_widgets.scss" />
+    <Content Include="Custom\Themes\Standard\src\scss\sections\_footer.scss" />
+    <Content Include="Custom\Themes\Standard\src\scss\sections\_header.scss" />
+    <Content Include="Custom\Themes\Standard\src\scss\sections\_pages.scss" />
+    <Content Include="Custom\Themes\Standard\src\scss\sections\_widgets.scss" />
     <Content Include="Custom\Themes\Standard\src\scss\modules\_buttons.scss" />
     <Content Include="Custom\Themes\Standard\src\scss\modules\_forms.scss" />
     <Content Include="Custom\Themes\Standard\src\scss\modules\_rating.scss" />
@@ -817,9 +782,10 @@
     <Content Include="Custom\Themes\Standard\src\scss\widgets\_search.scss" />
     <Content Include="Custom\Themes\Standard\src\scss\widgets\_tagcould.scss" />
     <Content Include="Custom\Themes\Standard\src\scss\widgets\_textbox.scss" />
-    <Content Include="Custom\Themes\Standard\src\scss\layout\_rtl.scss" />
+    <Content Include="Custom\Themes\Standard\src\scss\widgets\_rtl.scss" />
     <Content Include="admin\themes\standard\README.md" />
     <Content Include="admin\themes\standard\scss\rtl\_rtl.widgets.scss" />
+    <Content Include="Custom\Themes\Standard\src\css\styles.min.css.map" />
     <None Include="Scripts\jquery-2.1.4.intellisense.js" />
     <Content Include="Scripts\i18n\angular-locale_aa-dj.js" />
     <Content Include="Scripts\i18n\angular-locale_aa-er.js" />

diff --git a/BlogEngine/BlogEngine.NET/Custom/Themes/Standard/Gruntfile.js b/BlogEngine/BlogEngine.NET/Custom/Themes/Standard/Gruntfile.js
@@ -1,9 +1,20 @@
 module.exports = function (grunt) {
     grunt.initConfig({
         sass: {
+            options: {
+                noCache: true
+            },
             dist: {
                 options: {
-                    style: 'compact'
+                    style: 'compressed',
+                },
+                files: {
+                    'src/css/styles.min.css': 'src/scss/styles.scss',
+                }
+            },
+            dev: {
+                options: {
+                    style: 'expanded',
                 },
                 files: {
                     'src/css/styles.css': 'src/scss/styles.scss',
@@ -13,7 +24,7 @@
         watch: {
             src: {
                 files: ['src/scss/**/*.scss'],
-                tasks: ['sass']
+                tasks: ['sass:dist', 'sass:dev']
             }
         }
     });

diff --git a/BlogEngine/BlogEngine.NET/Custom/Themes/Standard/PostNavigation.ascx b/BlogEngine/BlogEngine.NET/Custom/Themes/Standard/PostNavigation.ascx
diff --git a/BlogEngine/BlogEngine.NET/Custom/Themes/Standard/RelatedPosts.ascx b/BlogEngine/BlogEngine.NET/Custom/Themes/Standard/RelatedPosts.ascx
diff --git a/BlogEngine/BlogEngine.NET/Custom/Themes/Standard/site.master b/BlogEngine/BlogEngine.NET/Custom/Themes/Standard/site.master
@@ -19,13 +19,13 @@
     }
 %>
 <!DOCTYPE html>
-<html lang="en">
+<html>
 <head runat="server">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Roboto+Slab:400,700" rel="stylesheet">
     <link href="src/css/bootstrap.min.css" rel="stylesheet" />
-    <link href="src/css/styles.css" rel="stylesheet" />
+    <link href="src/css/styles.min.css" rel="stylesheet" />
     <link href="~/scripts/syntaxhighlighter/styles/shCore.css" rel="stylesheet" type="text/css" />
     <link href="~/scripts/syntaxhighlighter/styles/shThemeDefault.css" rel="stylesheet" type="text/css" />
     <script type="text/javascript" src="<%# Utils.ApplicationRelativeWebRoot %>scripts/syntaxhighlighter/scripts/XRegExp.js"></script>