Skip to content

Commit

Permalink
Update TheComingSoonTheme with latest version of StartBootstrap (#4435)
Browse files Browse the repository at this point in the history
  • Loading branch information
agriffard authored and sebastienros committed Oct 10, 2019
1 parent 85f2b58 commit 7b5198e
Show file tree
Hide file tree
Showing 70 changed files with 34,708 additions and 9,428 deletions.
62 changes: 62 additions & 0 deletions src/OrchardCore.Themes/TheComingSoonTheme/ResourceManifest.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
using OrchardCore.ResourceManagement;

namespace OrchardCore.Themes.TheComingSoonTheme
{
public class ResourceManifest : IResourceManifestProvider
{
public void BuildManifests(IResourceManifestBuilder builder)
{
var manifest = builder.Add();

manifest
.DefineScript("vendor-jQuery")
.SetUrl("~/TheComingSoonTheme/vendor/jquery/jquery.min.js", "~/TheComingSoonTheme/vendor/jquery/jquery.js")
.SetCdn("https://code.jquery.com/jquery-3.4.1.min.js", "https://code.jquery.com/jquery-3.4.1.js")
.SetCdnIntegrity("sha384-vk5WoKIaW/vJyUAd9n/wmopsmNhiy+L2Z+SBxGYnUkunIxVxAv/UtMOhba/xskxh", "sha384-mlceH9HlqLp7GMKHrj5Ara1+LvdTZVMx4S1U43/NxCvAkzIo8WJ0FE7duLel3wVo")
.SetVersion("3.4.1");

manifest
.DefineScript("vendor-jQuery.slim")
.SetUrl("~/TheComingSoonTheme/vendor/jquery/jquery.slim.min.js", "~/TheComingSoonTheme/vendor/jquery/jquery.slim.js")
.SetCdn("https://code.jquery.com/jquery-3.4.1.slim.min.js", "https://code.jquery.com/jquery-3.4.1.slim.js")
.SetCdnIntegrity("sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n", "sha384-teRaFq/YbXOM/9FZ1qTavgUgTagWUPsk6xapwcjkrkBHoWvKdZZuAeV8hhaykl+G")
.SetVersion("3.4.1");

manifest
.DefineScript("vendor-bootstrap")
.SetDependencies("vendor-jQuery")
.SetUrl("~/TheComingSoonTheme/vendor/bootstrap/js/bootstrap.min.js", "~/TheComingSoonTheme/vendor/bootstrap/js/bootstrap.js")
.SetCdn("https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js", "https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.js")
.SetCdnIntegrity("sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM", "sha384-rkSGcquOAzh5YMplX4tcXMuXXwmdF/9eRLkw/gNZG+1zYutPej7fxyVLiOgfoDgi")
.SetVersion("4.3.1");

manifest
.DefineScript("vendor-bootstrap-bundle")
.SetDependencies("vendor-jQuery")
.SetUrl("~/TheComingSoonTheme/vendor/bootstrap/js/bootstrap.bundle.min.js", "~/TheComingSoonTheme/vendor/bootstrap/js/bootstrap.bundle.js")
.SetCdn("https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.bundle.min.js", "https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.bundle.js")
.SetCdnIntegrity("sha384-xrRywqdh3PHs8keKZN+8zzc5TX0GRTLCcmivcbNJWm2rs5C8PRhcEn3czEjhAO9o", "sha384-szbKYgPl66wivXHlSpJF+CKDAVckMVnlGrP25Sndhe+PwOBcXV9LlFh4MUpRhjIB")
.SetVersion("4.3.1");

manifest
.DefineStyle("vendor-bootstrap")
.SetUrl("~/TheComingSoonTheme/vendor/bootstrap/css/bootstrap.min.css", "~/TheComingSoonTheme/vendor/bootstrap/css/bootstrap.css")
.SetCdn("https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css", "https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.css")
.SetCdnIntegrity("sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T", "sha384-t4IGnnWtvYimgcRMiXD2ZD04g28Is9vYsVaHo5LcWWJkoQGmMwGg+QS0mYlhbVv3")
.SetVersion("4.3.1");

manifest
.DefineStyle("vendor-font-awesome")
.SetUrl("~/TheComingSoonTheme/vendor/fontawesome-free/css/all.min.css", "~/TheComingSoonTheme/vendor/fontawesome-free/css/all.css")
.SetCdn("https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.10.2/css/all.min.css", "https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.10.2/css/all.css")
.SetCdnIntegrity("sha384-rtJEYb85SiYWgfpCr0jn174XgJTn4rptSOQsMroFBPQSGLdOC5IbubP6lJ35qoM9", "sha384-Ex0vLvgbKZTFlqEetkjk2iUgM+H5udpQKFKjBoGFwPaHRGhiWyVI6jLz/3fBm5ht")
.SetVersion("5.10.2");

manifest
.DefineScript("vendor-font-awesome")
.SetCdn("https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.10.2/js/all.min.js", "https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.10.2/js/all.js")
.SetCdnIntegrity("sha384-QMu+Y+eu45Nfr9fmFOlw8EqjiUreChmoQ7k7C1pFNO8hEbGv9yzsszTmz+RzwyCh", "sha384-7/I8Wc+TVwiZpEjE4qTV6M27LYR5Dus6yPGzQZowRtgh+0gDW9BNR9GmII1/YwmG")
.SetVersion("5.10.2");
}
}
}
14 changes: 14 additions & 0 deletions src/OrchardCore.Themes/TheComingSoonTheme/Startup.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
using Microsoft.Extensions.DependencyInjection;
using OrchardCore.Modules;
using OrchardCore.ResourceManagement;

namespace OrchardCore.Themes.TheComingSoonTheme
{
public class Startup : StartupBase
{
public override void ConfigureServices(IServiceCollection serviceCollection)
{
serviceCollection.AddScoped<IResourceManifestProvider, ResourceManifest>();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<ItemGroup>
<ProjectReference Include="..\..\OrchardCore\OrchardCore.Theme.Targets\OrchardCore.Theme.Targets.csproj" />
<ProjectReference Include="..\..\OrchardCore\OrchardCore.DisplayManagement\OrchardCore.DisplayManagement.csproj" />
<ProjectReference Include="..\..\OrchardCore\OrchardCore.ResourceManagement.Abstractions\OrchardCore.ResourceManagement.Abstractions.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
11 changes: 5 additions & 6 deletions src/OrchardCore.Themes/TheComingSoonTheme/Views/layout.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,12 @@
<title>{% page_title Site.SiteName %}</title>

<!-- Bootstrap core CSS -->
<link href="{{ "~/TheComingSoonTheme/vendor/bootstrap/css/bootstrap.min.css" | href }}" rel="stylesheet">
{% style name:"vendor-bootstrap", version:"4" %}

<!-- Custom fonts for this template -->
<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:200,200i,300,300i,400,400i,600,600i,700,700i,900,900i" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Merriweather:300,300i,400,400i,700,700i,900,900i" rel="stylesheet">
{% comment %}<link href="{{ "~/TheComingSoonTheme/vendor/fontawesome-free/css/all.min.css" | href }}" rel="stylesheet">{% endcomment %}
{% style name:"font-awesome", version:"5" %}
{% style name:"vendor-font-awesome", version:"5" %}

<!-- Custom styles for this template -->
<link href="{{ "~/TheComingSoonTheme/css/coming-soon.min.css" | href }}" rel="stylesheet">
Expand All @@ -40,9 +39,9 @@
{% render_section "Content" %}
{% render_section "Footer", required: false %}

<!-- Bootstrap core JavaScript -->
<script src="{{ "~/TheComingSoonTheme/vendor/jquery/jquery.min.js" | href }}"></script>
<script src="{{ "~/TheComingSoonTheme/vendor/bootstrap/js/bootstrap.bundle.min.js" | href }}"></script>
<!-- Bootstrap core JavaScript -->
{% script name:"vendor-jquery", at:"Foot" %}
{% script name:"vendor-bootstrap-bundle", at:"Foot" %}

<!-- Custom scripts for this template -->
<script src="{{ "~/TheComingSoonTheme/js/coming-soon.min.js" | href }}"></script>
Expand Down
13 changes: 13 additions & 0 deletions src/OrchardCore.Themes/TheComingSoonTheme/wwwroot/.browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# https://github.com/browserslist/browserslist#readme

>= 1%
last 1 major version
not dead
Chrome >= 60
Firefox >= 60
Edge >= 15.15063
Explorer 11
iOS >= 10
Safari >= 10
Android >= 6
not ExplorerMobile <= 11
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
sudo: false
language: node_js
git:
depth: 3
node_js:
- "node"
install: npm install
Expand All @@ -9,3 +10,5 @@ script:
cache:
directories:
- node_modules
notifications:
email: false
2 changes: 1 addition & 1 deletion src/OrchardCore.Themes/TheComingSoonTheme/wwwroot/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2013-2018 Blackrock Digital LLC
Copyright (c) 2013-2019 Blackrock Digital LLC

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
16 changes: 5 additions & 11 deletions src/OrchardCore.Themes/TheComingSoonTheme/wwwroot/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

## Preview

[![Coming Soon Preview](https://startbootstrap.com/assets/img/templates/coming-soon.jpg)](https://blackrockdigital.github.io/startbootstrap-coming-soon/)
[![Coming Soon Preview](https://startbootstrap.com/assets/img/screenshots/themes/coming-soon.png)](https://blackrockdigital.github.io/startbootstrap-coming-soon/)

**[View Live Preview](https://blackrockdigital.github.io/startbootstrap-coming-soon/)**

Expand Down Expand Up @@ -32,23 +32,17 @@ After downloading, simply edit the HTML and CSS files included with the template

### Advanced Usage

After installation, run `npm install` and then run `gulp dev` which will open up a preview of the template in your default browser, watch for changes to core template files, and live reload the browser when changes are saved. You can view the `gulpfile.js` to see which tasks are included with the dev environment.
After installation, run `npm install` and then run `npm start` which will open up a preview of the template in your default browser, watch for changes to core template files, and live reload the browser when changes are saved. You can view the `gulpfile.js` to see which tasks are included with the dev environment.

#### Gulp Tasks

- `gulp` the default task that builds everything
- `gulp dev` browserSync opens the project in your default browser and live reloads when changes are made
- `gulp watch` browserSync opens the project in your default browser and live reloads when changes are made
- `gulp css` compiles SCSS files into CSS and minifies the compiled CSS
- `gulp js` minifies the themes JS file
- `gulp vendor` copies dependencies from node_modules to the vendor directory

You must have npm and Gulp installed globally on your machine in order to use these features.

## Troubleshooting and Help

Start Bootstrap has a public Slack channel which is a great place to ask questions about this template and all things related to Start Bootstrap.

**[Click here to join the Slack channel!](https://startbootstrap-slack.herokuapp.com/)**
You must have npm installed globally in order to use this build environment.

## Bugs and Issues

Expand All @@ -71,4 +65,4 @@ Start Bootstrap is based on the [Bootstrap](http://getbootstrap.com/) framework

## Copyright and License

Copyright 2013-2018 Blackrock Digital LLC. Code released under the [MIT](https://github.com/BlackrockDigital/startbootstrap-coming-soon/blob/gh-pages/LICENSE) license.
Copyright 2013-2019 Blackrock Digital LLC. Code released under the [MIT](https://github.com/BlackrockDigital/startbootstrap-coming-soon/blob/gh-pages/LICENSE) license.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* Start Bootstrap - Coming Soon v5.0.0 (https://startbootstrap.com/template-overviews/coming-soon)
* Copyright 2013-2018 Start Bootstrap
* Start Bootstrap - Coming Soon v5.0.7 (https://startbootstrap.com/template-overviews/coming-soon)
* Copyright 2013-2019 Start Bootstrap
* Licensed under MIT (https://github.com/BlackrockDigital/startbootstrap-coming-soon/blob/master/LICENSE)
*/

Expand Down Expand Up @@ -34,7 +34,6 @@ video {
min-height: 100%;
width: auto;
height: auto;
-webkit-transform: translateX(-50%) translateY(-50%);
transform: translateX(-50%) translateY(-50%);
z-index: 0;
}
Expand Down Expand Up @@ -77,9 +76,7 @@ video {
min-height: 35rem;
height: 100%;
background-color: rgba(0, 46, 102, 0.8);
-webkit-transform: skewY(4deg);
transform: skewY(4deg);
-webkit-transform-origin: bottom right;
transform-origin: bottom right;
}

Expand Down Expand Up @@ -118,9 +115,7 @@ video {
}
.masthead .masthead-bg {
min-height: 0;
-webkit-transform: skewX(-8deg);
transform: skewX(-8deg);
-webkit-transform-origin: top right;
transform-origin: top right;
}
.masthead .masthead-content {
Expand Down Expand Up @@ -187,7 +182,6 @@ video {
margin-bottom: 0;
}
.social-icons ul > li > a {
-webkit-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out;
font-size: 2rem;
line-height: 4rem;
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 7b5198e

Please sign in to comment.