-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #150 from DNNCommunity/develop
Merge `develop` into `main` for `2.0.1` release
- Loading branch information
Showing
10 changed files
with
277 additions
and
58 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| <picture> | ||
| <img title="[post:localizedtitle]" | ||
| src="[settings:imagehandlerpath]?TabId=[module:tabid]&ModuleId=[module:moduleid]&Blog=[Post:blogid]&Post=[Post:contentitemid]&w=270&h=152&c=0&key=[Post:image]" | ||
| <img title="[post:localizedtitle]" alt="[post:localizedtitle]" | ||
| src="[settings:imagehandlerpath]?TabId=[module:tabid]&ModuleId=[module:moduleid]&Blog=[Post:blogid]&Post=[Post:contentitemid]&w=500&h=500&c=0&key=[Post:image]" | ||
| class="img-fluid dnnc-blog-img" /> | ||
| </picture> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| <figure> | ||
| <picture> | ||
| <img title="[post:localizedtitle]" | ||
| src="[settings:imagehandlerpath]?TabId=[module:tabid]&ModuleId=[module:moduleid]&Blog=[Post:blogid]&Post=[Post:contentitemid]&w=1140&h=400&c=0&key=[Post:image]" | ||
| src="[settings:imagehandlerpath]?TabId=[module:tabid]&ModuleId=[module:moduleid]&Blog=[Post:blogid]&Post=[Post:contentitemid]&w=1140&h=600&c=0&key=[Post:image]" | ||
| class="img-fluid" /> | ||
| </picture> | ||
| </figure> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,58 +1,83 @@ | ||
| .blog-latest{ | ||
| &-item{ | ||
| // border: solid 1px $col1-700; | ||
| padding: 0.8em 0.9em; | ||
| background: lighten($gray-100, 5%); | ||
| position:relative; | ||
|
|
||
| h3{ | ||
| font-size: 1.1em; | ||
| margin: 0.5em 0; | ||
| color: $col1-800 !important | ||
| } | ||
|
|
||
| height: 100%; | ||
| min-height: 100%; | ||
|
|
||
|
|
||
| } | ||
| .ModBlogC { | ||
|
|
||
| .blog-latest { | ||
| &-item { | ||
| // border: solid 1px $col1-700; | ||
| padding: 0.8em 0.9em; | ||
| background: lighten($gray-100, 5%); | ||
| position: relative; | ||
|
|
||
| h3 { | ||
| font-size: 1.1em; | ||
| margin: 0.5em 0; | ||
| color: $col1-800 !important | ||
| } | ||
|
|
||
| height: 100%; | ||
| min-height: 100%; | ||
|
|
||
|
|
||
| } | ||
|
|
||
| &-link { | ||
| display: flex; | ||
| flex-direction: column; | ||
| position: relative; | ||
| min-height: 100%; | ||
|
|
||
| &:hover { | ||
| color: $red; | ||
| } | ||
|
|
||
| &-link{ | ||
| display:flex; | ||
| flex-direction: column ; | ||
| position:relative; | ||
| min-height: 100%; | ||
| &:hover{ | ||
| color: $red; | ||
| &:visited { | ||
| color: $gray-500; | ||
| } | ||
| } | ||
|
|
||
| &:visited{ | ||
| color: $gray-500; | ||
| &-text-wrap { | ||
|
|
||
| flex-grow: 1; | ||
| } | ||
| } | ||
|
|
||
| &-text-wrap{ | ||
| &-text { | ||
| text-overflow: ellipsis; | ||
| overflow: hidden; | ||
| max-height: 4.5em; | ||
| margin-bottom: 1em; | ||
|
|
||
| } | ||
|
|
||
| &-details { | ||
| font-size: 0.9em; | ||
| color: $gray-600; | ||
| border-top: solid 1px $gray-200; | ||
| padding-top: 0.3em; | ||
| } | ||
|
|
||
|
|
||
| .col-12 { | ||
| padding-bottom: 1.8em; | ||
| } | ||
|
|
||
| flex-grow: 1; | ||
| } | ||
| &-text{ | ||
| text-overflow: ellipsis; | ||
| overflow:hidden; | ||
| max-height: 4.5em; | ||
| margin-bottom: 1em; | ||
|
|
||
| } | ||
|
|
||
| &-details{ | ||
| font-size: 0.9em; | ||
| color: $gray-600; | ||
| border-top: solid 1px $gray-200; | ||
| padding-top: 0.3em; | ||
| // Details side bar heading margin | ||
| .dnnc-blog-metadata { | ||
| h5 { | ||
| margin-top: 0; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Make sure blog details are full width (see https://github.com/DNNCommunity/DNNCommunityTheme/issues/141) | ||
| // Depends on the class injected by Style Helper | ||
|
|
||
| .col-12{ | ||
| padding-bottom: 1.8em; | ||
| } | ||
|
|
||
| } | ||
| .blogs-detail { | ||
| .panes { | ||
| .main-blog-module{ | ||
|
|
||
| width: 100% !important; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| <%@ Control Language="c#" AutoEventWireup="false" | ||
| Explicit="True" Inherits="DotNetNuke.UI.Skins.Skin" %> | ||
| <%@ Register TagPrefix="dnn" TagName="LOGIN" Src="~/Admin/Skins/Login.ascx" %> | ||
| <%@ Register TagPrefix="dnn" TagName="LOGO" Src="~/Admin/Skins/Logo.ascx" %> | ||
| <%@ Register TagPrefix="dnn" TagName="TERMS" Src="~/Admin/Skins/Terms.ascx" %> | ||
| <%@ Register TagPrefix="dnn" TagName="COPYRIGHT" Src="~/Admin/Skins/CopyRight.ascx" %> | ||
| <%@ Register TagPrefix="dnn" TagName="PRIVACY" Src="~/Admin/Skins/Privacy.ascx" %> | ||
| <%@ Register TagPrefix="dnn" TagName="BREADCRUMB" Src="~/Admin/Skins/BreadCrumb.ascx" %> | ||
| <%@ Register TagPrefix="dnn" TagName="MENU" src="~/DesktopModules/DDRMenu/Menu.ascx" %> | ||
| <%@ Register TagPrefix="dnn" TagName="LANGUAGE" Src="~/Admin/Skins/Language.ascx" %> | ||
| <%@ Register TagPrefix="dnn" TagName="SEARCH" Src="~/Admin/Skins/Search.ascx" %> | ||
| <%@ Register TagPrefix="dnn" TagName="USER" Src="~/Admin/Skins/User.ascx" %> | ||
| <%@ Register TagPrefix="dnn" TagName="CURRENTDATE" Src="~/Admin/Skins/CurrentDate.ascx" %> | ||
|
|
||
|
|
||
| <%@ Register TagPrefix="dnn" Namespace="DotNetNuke.Web.Client.ClientResourceManagement" Assembly="DotNetNuke.Web.Client" %> | ||
| <%@ Register TagPrefix="fortyfingers" TagName="STYLEHELPER" Src="~/DesktopModules/40Fingers/SkinObjects/StyleHelper/StyleHelper.ascx" %> | ||
|
|
||
|
|
||
| <!-- #include file="Includes/font-awesome.ascx" --> | ||
|
|
||
|
|
||
|
|
||
| <fortyfingers:STYLEHELPER id="FFSH1" | ||
| AddToHead="<meta http-equiv='X-UA-Compatible' content='IE=edge'> | ||
| <meta name='viewport' content='width=device-width, initial-scale=1, shrink-to-fit=no' />" | ||
| AddAtEnd="false" | ||
| RemoveFromHead="content=text/javascript" | ||
| AddBodyClass="True" | ||
| ForceSkinCssOrder="true" | ||
| doctype="html 5" | ||
| runat="server" /> | ||
|
|
||
|
|
||
| <fortyfingers:STYLEHELPER id="FFSH2" | ||
| IfUrl="/blogs/Post/" | ||
| AddToBodyClass="blogs-detail" | ||
| runat="server" /> | ||
|
|
||
|
|
||
|
|
||
| <div class="wrap-skin"> | ||
|
|
||
| <!-- Page content wrapper--> | ||
| <div class="page-content-wrapper"> | ||
| <div class="sticky-top"> | ||
| <!-- #include file="Includes/top-bar-login-search.ascx" --> | ||
| <header class="skin-header"> | ||
| <div class="header-top"> | ||
| </div> | ||
| <div class="container"> | ||
| <div class="row"> | ||
| <div class="logo col col-6 col-lg-3 flex-vert-align"> | ||
| <!-- #include file="Includes/logo.ascx" --> | ||
| </div> | ||
| <div class="col d-lg-none text-end d-flex justify-content-end align-items-center"> | ||
| <button id="navbar-toggler" class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"><i class="fa fa-bars"></i></button> | ||
| </div> | ||
| <!-- Top navigation--> | ||
| <div class="col-12 col-lg"> | ||
| <nav class="navbar navbar-expand-lg"> | ||
| <div class="collapse navbar-collapse" id="navbarSupportedContent"> | ||
| <dnn:MENU MenuStyle="assets/menus/topmenu" runat="server" ExcludeNodes="Admin,Host"></dnn:MENU> | ||
| </div> | ||
| </nav> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </header> | ||
| </div> | ||
| <!-- #include file="Includes/panes-blog.ascx" --> | ||
| <footer class="skin-footer bg-blue-super-dark skew-top"> | ||
| <div class="container py-5"> | ||
| <div class="row gx-5"> | ||
| <div class="col"> | ||
| <div class="pane footer_pane_1 col" id="footer_pane_1" runat="server"> | ||
| </div> | ||
| </div> | ||
| <div class="col"> | ||
| <div class="pane footer_pane_2 col" id="footer_pane_2" runat="server"> | ||
| </div> | ||
| </div> | ||
| <div class="col"> | ||
| <div class="pane footer_pane_3 col" id="footer_pane_3" runat="server"> | ||
| </div> | ||
| </div> | ||
| <div class="col"> | ||
| <div class="pane footer_pane_4 col" id="footer_pane_4" runat="server"> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="pane footer_pane_full_width pb-0" id="footer_pane_full_width" runat="server"> | ||
| </div> | ||
| <div class="footer-bottom"> | ||
| <div class="container pt-2"> | ||
| <div class="row"> | ||
| <!-- #include file="Includes/footer-bottom.ascx" --> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </footer> | ||
| </div> | ||
|
|
||
| <!-- Bootstrap core JS--> | ||
| <dnn:DnnJsInclude runat="server" ForceProvider="DnnFormBottomProvider" FilePath="vendors/bootstrap/js/bootstrap.bundle.min.js" PathNameAlias="SkinPath" /> | ||
|
|
||
|
|
||
| <!-- Core theme JS--> | ||
| <dnn:DnnJsInclude runat="server" ForceProvider="DnnFormBottomProvider" FilePath="vendors/theme/js/scripts.js" PathNameAlias="SkinPath" /> | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| <!-- Page content--> | ||
| <main class="skin-main content-wrap"> | ||
| <div class="pane pane-top py-0" id="top_pane_full_width" ContainerSrc="DNN-Community-2024/NoTitle.ascx" runat="server" /> | ||
| <div class="bg-blue skew-bottom panes mt-0"> | ||
| <div class="container"> | ||
| <div class="row gx-5"> | ||
| <div class="col-12"> | ||
| <div class="pane pane-blue text-white" id="top_pane" runat="server" /> | ||
| </div> | ||
| <div class="col-12 col-md-6"> | ||
| <div class="pane pane-blue text-white" id="top_pane_left" runat="server" /> | ||
| </div> | ||
| <div class="col-12 col-md-6"> | ||
| <div class="pane pane-blue text-white" id="top_pane_right" runat="server" /> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="bg-grey skew-top skew-bottom panes"> | ||
| <div class="container"> | ||
| <div class="row gx-5"> | ||
| <div class="col col-12"> | ||
| <div class="pane pane-grey" id="pane_grey_100" runat="server" /> | ||
| </div> | ||
| <div class="col col-md-6"> | ||
| <div class="pane pane-grey" id="pane_grey_50_left" runat="server" /> | ||
| </div> | ||
| <div class="col col-md-6"> | ||
| <div class="pane pane-grey" id="pane_grey_50_right" runat="server" /> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="skew-top skew-bottom panes"> | ||
| <div class="container"> | ||
| <div class="row"> | ||
| <div class="col col-12"> | ||
| <div class="pane content-pane" id="contentpane" runat="server" /> | ||
| </div> | ||
| </div> | ||
| <div class="row gx-5"> | ||
| <div class="col col-12 col-md-8 main-blog-module"> | ||
| <div class="pane content-pane-66" id="blog_pane_left" runat="server" /> | ||
| </div> | ||
| <div class="col col-12 col-md-4"> | ||
| <div class="pane content-pane-33" id="blog_pane_right" runat="server" /> | ||
| </div> | ||
| </div> | ||
| <div class="row"> | ||
| <div class="col col-12"> | ||
| <div class="pane blog-bottom-pane" id="blog_pane_bottom" runat="server" /> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </main> | ||
| <div class="bg-grey skew-top skew-bottom panes"> | ||
| <div class="container"> | ||
| <div class="row gx-5"> | ||
| <div class="col col-12"> | ||
| <div class="pane pane-grey" id="pane_grey_100_bottom" runat="server" /> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> |
Oops, something went wrong.