mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-07 07:34:30 +08:00
#8839 Orchard Layouts Bootstrap 4 columns fix (#8840)
Some checks failed
Compile / Compile .NET solution (push) Has been cancelled
Compile / Compile Client-side Assets (push) Has been cancelled
SpecFlow Tests / Define Strategy Matrix (push) Has been cancelled
SpecFlow Tests / SpecFlow Tests (push) Has been cancelled
Build Crowdin Translation Packages / build-crowdin-translation-packages (push) Has been cancelled
Some checks failed
Compile / Compile .NET solution (push) Has been cancelled
Compile / Compile Client-side Assets (push) Has been cancelled
SpecFlow Tests / Define Strategy Matrix (push) Has been cancelled
SpecFlow Tests / SpecFlow Tests (push) Has been cancelled
Build Crowdin Translation Packages / build-crowdin-translation-packages (push) Has been cancelled
* #8839 update all col-xs-* in Orchard.Layouts module to just col-* to fix columns. col-xs-* was removed in Bootstrap 4. display:flex was also added to Row.less to counteract the display:block on all the divs between .row and the .col-* * Remove unnecessary file update. Didn't mean to include this, it is part of the Bootstrap 3 source which is not used anymore. * OrchardCMS#8839 fixes for the layout editor from the previous work. If multiple elements were in a column, they were displaying horizontally instead of vertically. In order to fix this and manage situations where there are nested rows, the CSS specification had to be high. * Rebuild client-side assets --------- Co-authored-by: Benedek Farkas <benedek.farkas@lombiq.com>
This commit is contained in:
@@ -228,8 +228,8 @@
|
||||
return $(e).height();
|
||||
}));
|
||||
for (i = 1; i <= 12; i++)
|
||||
ui.placeholder.removeClass("col-xs-" + i);
|
||||
ui.placeholder.addClass("col-xs-" + receivedColumn.width);
|
||||
ui.placeholder.removeClass("col-" + i);
|
||||
ui.placeholder.addClass("col-" + receivedColumn.width);
|
||||
if (maxHeight > 0) {
|
||||
ui.placeholder.height(maxHeight);
|
||||
ui.placeholder.css("min-height", 0);
|
||||
@@ -321,8 +321,8 @@
|
||||
result.push("layout-row-full");
|
||||
}
|
||||
if (child.type == "Column") {
|
||||
result.push("col-xs-" + child.width);
|
||||
result.push("col-xs-offset-" + child.offset);
|
||||
result.push("col-" + child.width);
|
||||
result.push("col-offset-" + child.offset);
|
||||
}
|
||||
if (child.type == "Content")
|
||||
result.push("layout-content-" + child.contentTypeClass);
|
||||
|
@@ -17,5 +17,14 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
> div > .layout-children {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
}
|
||||
}
|
||||
|
||||
.layout-column > div > .layout-children {
|
||||
flex-direction: column;
|
||||
}
|
||||
}
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user