mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-14 19:04:51 +08:00
[Fixes #5728] Adding default grid system to TheThemeMachine
Breaking change: Existing themes relying on Layout and TheThemeMachine will need to add a reference to this css.
This commit is contained in:
@@ -26,6 +26,9 @@
|
||||
Style.Include("LayoutEditor.css", "LayoutEditor.min.css");
|
||||
Script.Include("LayoutDesignerHost.js");
|
||||
|
||||
// The grid system
|
||||
Style.Include("default-grid.css");
|
||||
|
||||
using (Script.Foot()) {
|
||||
<script>
|
||||
angular
|
||||
|
@@ -1,6 +1,3 @@
|
||||
@{
|
||||
Style.Include("default-grid.css");
|
||||
}
|
||||
<div class="orchard-layouts-root">
|
||||
<div class="orchard-layouts-root">
|
||||
@Display(Model.LayoutRoot)
|
||||
</div>
|
304
src/Orchard.Web/Themes/TheThemeMachine/Styles/default-grid.css
Normal file
304
src/Orchard.Web/Themes/TheThemeMachine/Styles/default-grid.css
Normal file
@@ -0,0 +1,304 @@
|
||||
.table, .row, .cell {
|
||||
-webkit-box-sizing: border-box;
|
||||
-moz-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.table > .row {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.table.fixed > .row {
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
}
|
||||
|
||||
.row {
|
||||
display: block;
|
||||
margin: 0 0 20px 0;
|
||||
}
|
||||
|
||||
.row:after {
|
||||
content: "";
|
||||
display: table;
|
||||
clear: both;
|
||||
}
|
||||
|
||||
.cell {
|
||||
display: block;
|
||||
float: left;
|
||||
padding-right: 10px;
|
||||
padding-left: 10px;
|
||||
min-height: 1px;
|
||||
}
|
||||
|
||||
.row > .cell:last-of-type {
|
||||
padding-right: 0;
|
||||
}
|
||||
|
||||
.row > .cell:first-of-type {
|
||||
padding-left: 0;
|
||||
}
|
||||
|
||||
/* Opt-in outside padding */
|
||||
.row-pad {
|
||||
padding: 20px 0 20px 20px;
|
||||
}
|
||||
|
||||
.row-pad .cell:last-of-type {
|
||||
padding-right: 20px;
|
||||
}
|
||||
|
||||
.span-1-1 {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.span-1-2 {
|
||||
width: 50%;
|
||||
}
|
||||
|
||||
.span-1-3 {
|
||||
width: 33.33%;
|
||||
}
|
||||
|
||||
.span-1-4 {
|
||||
width: 25%;
|
||||
}
|
||||
|
||||
.span-1-5 {
|
||||
width: 20%;
|
||||
}
|
||||
|
||||
.span-1-6 {
|
||||
width: 16.66%;
|
||||
}
|
||||
|
||||
.span-1-7 {
|
||||
width: 14.28%;
|
||||
}
|
||||
|
||||
.span-1-8 {
|
||||
width: 12.5%;
|
||||
}
|
||||
|
||||
.span-1-9 {
|
||||
width: 11.11%;
|
||||
}
|
||||
|
||||
.span-1-10 {
|
||||
width: 10%;
|
||||
}
|
||||
|
||||
.span-1-11 {
|
||||
width: 9.09%;
|
||||
}
|
||||
|
||||
.span-1-12 {
|
||||
width: 8.33%;
|
||||
}
|
||||
|
||||
.span-2-3 {
|
||||
width: 66.66%;
|
||||
}
|
||||
|
||||
.span-2-4 {
|
||||
width: 50%;
|
||||
}
|
||||
|
||||
.span-2-5 {
|
||||
width: 40%;
|
||||
}
|
||||
|
||||
.span-2-6 {
|
||||
width: 33.33%;
|
||||
}
|
||||
|
||||
.span-2-8 {
|
||||
width: 25%;
|
||||
}
|
||||
|
||||
.span-2-10 {
|
||||
width: 20%;
|
||||
}
|
||||
|
||||
.span-2-12 {
|
||||
width: 16.66%;
|
||||
}
|
||||
|
||||
.span-3-4 {
|
||||
width: 75%;
|
||||
}
|
||||
|
||||
.span-3-5 {
|
||||
width: 60%;
|
||||
}
|
||||
|
||||
.span-3-6 {
|
||||
width: 50%;
|
||||
}
|
||||
|
||||
.span-3-8 {
|
||||
width: 37.5%;
|
||||
}
|
||||
|
||||
.span-3-10 {
|
||||
width: 33.33%;
|
||||
}
|
||||
|
||||
.span-3-12 {
|
||||
width: 25%;
|
||||
}
|
||||
|
||||
.span-4-5 {
|
||||
width: 80%;
|
||||
}
|
||||
|
||||
.span-4-6 {
|
||||
width: 66.66%;
|
||||
}
|
||||
|
||||
.span-4-8 {
|
||||
width: 50%;
|
||||
}
|
||||
|
||||
.span-4-10 {
|
||||
width: 40%;
|
||||
}
|
||||
|
||||
.span-4-12 {
|
||||
width: 33.33%;
|
||||
}
|
||||
|
||||
.span-5-6 {
|
||||
width: 83.33%;
|
||||
}
|
||||
|
||||
.span-5-8 {
|
||||
width: 75%;
|
||||
}
|
||||
|
||||
.span-5-10 {
|
||||
width: 50%;
|
||||
}
|
||||
|
||||
.span-5-12 {
|
||||
width: 41.66%;
|
||||
}
|
||||
|
||||
.span-6-8 {
|
||||
width: 75%;
|
||||
}
|
||||
|
||||
.span-6-10 {
|
||||
width: 60%;
|
||||
}
|
||||
|
||||
.span-6-12 {
|
||||
width: 50%;
|
||||
}
|
||||
|
||||
.span-7-8 {
|
||||
width: 87.5%;
|
||||
}
|
||||
|
||||
.span-7-10 {
|
||||
width: 70%;
|
||||
}
|
||||
|
||||
.span-7-12 {
|
||||
width: 58.33%;
|
||||
}
|
||||
|
||||
.span-8-10 {
|
||||
width: 80%;
|
||||
}
|
||||
|
||||
.span-8-12 {
|
||||
width: 66.66%;
|
||||
}
|
||||
|
||||
.span-9-10 {
|
||||
width: 90%;
|
||||
}
|
||||
|
||||
.span-9-12 {
|
||||
width: 75%;
|
||||
}
|
||||
|
||||
.span-10-12 {
|
||||
width: 83.33%;
|
||||
}
|
||||
|
||||
.span-11-12 {
|
||||
width: 91.66%;
|
||||
}
|
||||
|
||||
.layout-content-image, .layout-content-vector {
|
||||
display: block;
|
||||
max-width: 100%;
|
||||
height: auto;
|
||||
}
|
||||
|
||||
/* Bootstrap compatible spans */
|
||||
.span-1 { width: 8.33%; }
|
||||
.span-2 { width: 16.66%; }
|
||||
.span-3 { width: 25%; }
|
||||
.span-4 { width: 33.33%; }
|
||||
.span-5 { width: 41.66%; }
|
||||
.span-6 { width: 50%; }
|
||||
.span-7 { width: 58.33%; }
|
||||
.span-8 { width: 66.66%; }
|
||||
.span-9 { width: 75%; }
|
||||
.span-10 { width: 83.33%; }
|
||||
.span-11 { width: 91.66%; }
|
||||
.span-12 { width: 100%; }
|
||||
|
||||
.offset-1 { margin-left: 8.33%; }
|
||||
.offset-2 { margin-left: 16.66%; }
|
||||
.offset-3 { margin-left: 25%; }
|
||||
.offset-4 { margin-left: 33.33%; }
|
||||
.offset-5 { margin-left: 41.66%; }
|
||||
.offset-6 { margin-left: 50%; }
|
||||
.offset-7 { margin-left: 58.33%; }
|
||||
.offset-8 { margin-left: 66.66%; }
|
||||
.offset-9 { margin-left: 75%; }
|
||||
.offset-10 { margin-left: 83.33%; }
|
||||
.offset-11 { margin-left: 91.66%; }
|
||||
.offset-12 { margin-left: 100%; }
|
||||
|
||||
/* RESPONSIVENESS */
|
||||
|
||||
/* Large desktop */
|
||||
@media (min-width: 1200px) {
|
||||
.table.fixed > .row {
|
||||
width: 1170px;
|
||||
}
|
||||
}
|
||||
|
||||
/* Default */
|
||||
@media (min-width: 980px) and (max-width: 1199px) {
|
||||
.table.fixed > .row {
|
||||
width: 960px;
|
||||
}
|
||||
}
|
||||
|
||||
/* Portrait tablet to landscape and desktop */
|
||||
@media (min-width: 768px) and (max-width: 979px) {
|
||||
.table.fixed > .row {
|
||||
width: 724px;
|
||||
}
|
||||
}
|
||||
|
||||
/* Landscape phone to portrait tablet */
|
||||
@media (max-width: 767px) {
|
||||
.table.fixed > .row {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
/* Landscape phones and down */
|
||||
@media (max-width: 480px) {
|
||||
.table.fixed > .row {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
@@ -12,6 +12,7 @@
|
||||
|
||||
SetMeta(httpEquiv: "X-UA-Compatible", content: "IE=edge,chrome=1");
|
||||
Style.Include("//fonts.googleapis.com/css?family=Lobster&subset=latin");
|
||||
Style.Include("default-grid.css");
|
||||
Style.Include("site.css");
|
||||
|
||||
/* Some useful shortcuts or settings
|
||||
|
@@ -86,6 +86,7 @@
|
||||
<Content Include="TheAdmin\Styles\images\menuOpenHover.gif" />
|
||||
<Content Include="TheAdmin\Styles\images\vinesBackgroundBottom.gif" />
|
||||
<Content Include="TheAdmin\Styles\images\menu-filter.png" />
|
||||
<Content Include="TheThemeMachine\Styles\default-grid.css" />
|
||||
<Content Include="TheThemeMachine\Styles\Site.css" />
|
||||
<Content Include="TheThemeMachine\Theme.png" />
|
||||
<Content Include="TheThemeMachine\Theme.txt" />
|
||||
|
@@ -42,6 +42,7 @@
|
||||
<PropertyValue name="Indent_FlushLabelsLeft">0</PropertyValue>
|
||||
<PropertyValue name="Indent_UnindentLabels">1</PropertyValue>
|
||||
<PropertyValue name="NewLines_AnonymousTypeInitializer_EachMember">1</PropertyValue>
|
||||
<PropertyValue name="NewLines_Braces_Accessor">1</PropertyValue>
|
||||
<PropertyValue name="NewLines_Braces_AnonymousMethod">0</PropertyValue>
|
||||
<PropertyValue name="NewLines_Braces_AnonymousTypeInitializer">0</PropertyValue>
|
||||
<PropertyValue name="NewLines_Braces_ArrayInitializer">0</PropertyValue>
|
||||
@@ -50,6 +51,7 @@
|
||||
<PropertyValue name="NewLines_Braces_LambdaExpressionBody">0</PropertyValue>
|
||||
<PropertyValue name="NewLines_Braces_Method">0</PropertyValue>
|
||||
<PropertyValue name="NewLines_Braces_ObjectInitializer">0</PropertyValue>
|
||||
<PropertyValue name="NewLines_Braces_Property">1</PropertyValue>
|
||||
<PropertyValue name="NewLines_Braces_Type">0</PropertyValue>
|
||||
<PropertyValue name="NewLines_Keywords_Catch">1</PropertyValue>
|
||||
<PropertyValue name="NewLines_Keywords_Else">1</PropertyValue>
|
||||
@@ -130,10 +132,16 @@
|
||||
<PropertyValue name="DisableBrowsingUpToDateCheck">true</PropertyValue>
|
||||
<PropertyValue name="DisableErrorReporting">false</PropertyValue>
|
||||
<PropertyValue name="DisableIntelliSenseErrorsInErrorList">false</PropertyValue>
|
||||
<PropertyValue name="EnableChangeSignature">false</PropertyValue>
|
||||
<PropertyValue name="EnableExpandPrecedence">false</PropertyValue>
|
||||
<PropertyValue name="EnableExpandScopes">false</PropertyValue>
|
||||
<PropertyValue name="EnableExtractFunction">false</PropertyValue>
|
||||
<PropertyValue name="EnableSQLiteStoreEngine">false</PropertyValue>
|
||||
<PropertyValue name="EnableSingleFileISense">true</PropertyValue>
|
||||
<PropertyValue name="EnableSingleFileISenseSquiggles">false</PropertyValue>
|
||||
<PropertyValue name="EnumerateCommentTasks">false</PropertyValue>
|
||||
<PropertyValue name="GroupBrackets">true</PropertyValue>
|
||||
<PropertyValue name="HideExperimentalAd">true</PropertyValue>
|
||||
<PropertyValue name="HighlightMatchingTokens">true</PropertyValue>
|
||||
<PropertyValue name="IndentAccessSpecifiers">false</PropertyValue>
|
||||
<PropertyValue name="IndentBlockContents">true</PropertyValue>
|
||||
@@ -145,6 +153,7 @@
|
||||
<PropertyValue name="IndentNamespaceContents">true</PropertyValue>
|
||||
<PropertyValue name="IndentPreprocessor">2</PropertyValue>
|
||||
<PropertyValue name="IndentationReference">2</PropertyValue>
|
||||
<PropertyValue name="MemberListDotToArrow">false</PropertyValue>
|
||||
<PropertyValue name="NewlineControlBlockBrace">0</PropertyValue>
|
||||
<PropertyValue name="NewlineEmptyFunctionCloseBrace">true</PropertyValue>
|
||||
<PropertyValue name="NewlineEmptyTypeCloseBrace">true</PropertyValue>
|
||||
@@ -200,6 +209,7 @@
|
||||
<PropertyValue name="SpaceWithinFunctionParentheses">false</PropertyValue>
|
||||
<PropertyValue name="SpaceWithinInitListBraces">true</PropertyValue>
|
||||
<PropertyValue name="SpaceWithinLambdaBrackets">false</PropertyValue>
|
||||
<PropertyValue name="SuspendNewSingleFileISenseDuringDebugging">false</PropertyValue>
|
||||
<PropertyValue name="TrimSpaceAroundScope">true</PropertyValue>
|
||||
<PropertyValue name="TrimSpaceUnaryOperator">true</PropertyValue>
|
||||
</ToolsOptionsSubCategory>
|
||||
@@ -225,6 +235,8 @@
|
||||
<PropertyValue name="ShowVirtualProjectsInSolutionExplorerWhenSolutionOpen">false</PropertyValue>
|
||||
<PropertyValue name="UseAMDCodeGenerationForModulesThatAreNotPartOfAProject">false</PropertyValue>
|
||||
<PropertyValue name="UseCommonJSCodeGenerationForModulesThatAreNotPartOfAProject">false</PropertyValue>
|
||||
<PropertyValue name="UseJsxPreserveForFilesThatAreNotPartOfAProject">false</PropertyValue>
|
||||
<PropertyValue name="UseJsxReactForFilesThatAreNotPartOfAProject">false</PropertyValue>
|
||||
<PropertyValue name="UseSystemCodeGenerationForModulesThatAreNotPartOfAProject">false</PropertyValue>
|
||||
<PropertyValue name="UseUMDCodeGenerationForModulesThatAreNotPartOfAProject">false</PropertyValue>
|
||||
</ToolsOptionsSubCategory>
|
||||
@@ -235,6 +247,7 @@
|
||||
<PropertyValue name="FormatOnPaste">true</PropertyValue>
|
||||
<PropertyValue name="InsertAttributeValueQuotes">true</PropertyValue>
|
||||
<PropertyValue name="InsertClosingTag">true</PropertyValue>
|
||||
<PropertyValue name="SuggestHelpfulExtensions">false</PropertyValue>
|
||||
<PropertyValue name="XHtmlCodingStyle">true</PropertyValue>
|
||||
</ToolsOptionsSubCategory>
|
||||
</ToolsOptionsCategory>
|
||||
|
Reference in New Issue
Block a user