Remove main.less

hikalkan · hikalkan · commit 696f13cb56f8 · 2017-06-05T08:17:23.000+03:00
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj
@@ -40,6 +40,7 @@
     <Content Include="wwwroot\images\user.png" />
     <Content Include="wwwroot\view-resources\Views\Account\_Layout.less" />
     <Content Include="wwwroot\view-resources\Views\Home\Index.js" />
+    <Content Include="wwwroot\view-resources\Views\Shared\_Layout.less" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Account/_Layout.cshtml b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Account/_Layout.cshtml
@@ -2,7 +2,6 @@
 @using Abp.Web.Security.AntiForgery
 @using Abp.Configuration.Startup
 @using AbpCompanyName.AbpProjectName
-@using AbpCompanyName.AbpProjectName.SignalR
 @using AbpCompanyName.AbpProjectName.Web.Resources
 @inject AbpCompanyName.AbpProjectName.Timing.AppTimes AppTimes
 @inject IAbpAntiForgeryManager AbpAntiForgeryManager
@@ -42,7 +41,6 @@
         <link rel="stylesheet" href="~/plugins/animate-css/animate.css" asp-append-version="true" />
         <link href="~/css/style.css" rel="stylesheet">
 
-        <link rel="stylesheet" href="~/css/main.css" asp-append-version="true" />
         <link href="~/view-resources/Views/Account/_Layout.css" rel="stylesheet" asp-append-version="true" />
     </environment>
 
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/_Layout.cshtml b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/_Layout.cshtml
@@ -37,16 +37,16 @@
         <link href="~/fonts/material-icons/materialicons.css" rel="stylesheet" asp-append-version="true" />
 
         <!-- ~/Bundles/vendor/css TODO: Update bundle! -->
-        <link rel="stylesheet" href="~/plugins/bootstrap/css/bootstrap.css" asp-append-version="true" />
-        <link href="~/plugins/node-waves/waves.css" rel="stylesheet" />
-        <link href="~/plugins/animate-css/animate.css" rel="stylesheet" />
-        <link href="~/css/style.css" rel="stylesheet">
-        <link href="~/css/themes/all-themes.css" rel="stylesheet" />
+        <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" asp-append-version="true" />
+        <link href="~/css/style.css" rel="stylesheet" asp-append-version="true">
+        <link href="~/css/themes/all-themes.css" rel="stylesheet" asp-append-version="true" />
         <link rel="stylesheet" href="~/lib/toastr/toastr.css" asp-append-version="true" />
         <link rel="stylesheet" href="~/lib/sweetalert/dist/sweetalert.css" asp-append-version="true" />
         <link rel="stylesheet" href="~/lib/famfamfam-flags/dist/sprite/famfamfam-flags.css" asp-append-version="true" />
         <link rel="stylesheet" href="~/lib/font-awesome/css/font-awesome.css" asp-append-version="true" />
-        <link rel="stylesheet" href="~/css/main.css" asp-append-version="true" />
+        <link href="~/plugins/node-waves/waves.css" rel="stylesheet" asp-append-version="true" />
+        <link href="~/plugins/animate-css/animate.css" rel="stylesheet" asp-append-version="true" />
+        <link href="~/view-resources/Views/Shared/_Layout.css" rel="stylesheet" asp-append-version="true" />
     </environment>
 
     <environment names="Staging,Production">
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/compilerconfig.json b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/compilerconfig.json
@@ -10,5 +10,9 @@
   {
     "outputFile": "wwwroot/view-resources/Views/Account/_Layout.css",
     "inputFile": "wwwroot/view-resources/Views/Account/_Layout.less"
+  },
+  {
+    "outputFile": "wwwroot/view-resources/Views/Shared/_Layout.css",
+    "inputFile": "wwwroot/view-resources/Views/Shared/_Layout.less"
   }
 ]
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/css/main.css b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/css/main.css
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/css/main.less b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/css/main.less
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/css/main.min.css b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/css/main.min.css
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Account/_Layout.css b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Account/_Layout.css
@@ -1,4 +1,7 @@
 ﻿.language-switch-area {
   text-align: center;
   padding: 10px;
+}
+.famfamfam-flags {
+  display: inline-block;
 }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Account/_Layout.less b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Account/_Layout.less
@@ -2,3 +2,7 @@
     text-align: center;
     padding: 10px;
 }
+
+.famfamfam-flags {
+    display: inline-block;
+}
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Account/_Layout.min.css b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Account/_Layout.min.css
@@ -1 +1 @@
-﻿.language-switch-area{text-align:center;padding:10px;}
+﻿.language-switch-area{text-align:center;padding:10px;}.famfamfam-flags{display:inline-block;}
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Shared/_Layout.css b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Shared/_Layout.css
@@ -0,0 +1,3 @@
+﻿.famfamfam-flags {
+  display: inline-block;
+}
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Shared/_Layout.less b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Shared/_Layout.less
@@ -0,0 +1,3 @@
+﻿.famfamfam-flags {
+    display: inline-block;
+}
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Shared/_Layout.min.css b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Shared/_Layout.min.css
@@ -0,0 +1 @@
+﻿.famfamfam-flags{display:inline-block;}
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/_Bundles/layout-libs.min.css b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/_Bundles/layout-libs.min.css

Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,9 @@`
`10`	`10`	`{`
`11`	`11`	`"outputFile": "wwwroot/view-resources/Views/Account/_Layout.css",`
`12`	`12`	`"inputFile": "wwwroot/view-resources/Views/Account/_Layout.less"`
	`13`	`+ },`
	`14`	`+ {`
	`15`	`+ "outputFile": "wwwroot/view-resources/Views/Shared/_Layout.css",`
	`16`	`+ "inputFile": "wwwroot/view-resources/Views/Shared/_Layout.less"`
`13`	`17`	`}`
`14`	`18`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,7 @@`
`1`	`1`	`.language-switch-area {`
`2`	`2`	`text-align: center;`
`3`	`3`	`padding: 10px;`
	`4`	`+}`
	`5`	`+.famfamfam-flags {`
	`6`	`+ display: inline-block;`
`4`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,3 +2,7 @@`
`2`	`2`	`text-align: center;`
`3`	`3`	`padding: 10px;`
`4`	`4`	`}`
	`5`	`+`
	`6`	`+.famfamfam-flags {`
	`7`	`+ display: inline-block;`
	`8`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-.language-switch-area{text-align:center;padding:10px;}`
	`1`	`+.language-switch-area{text-align:center;padding:10px;}.famfamfam-flags{display:inline-block;}`