Skip to content

Commit c1f819f

Browse files
committed
Merge remote-tracking branch 'origin/hotfix-19.1' into develop
# Conflicts: # RockWeb/Styles/styles-v2/core.css
2 parents 10e4648 + fe833b3 commit c1f819f

306 files changed

Lines changed: 4937 additions & 73116 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Rock.Frontend.Styles/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/dist
2+
/node_modules
3+
/obj

Rock.Frontend.Styles/README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Overview
2+
3+
This project contains all the styles and themes used by the Rock Website.
4+
5+
# Package Overrides
6+
7+
The following overrides were specified in `packages.json`. They can be removed once the reason for them has been resolved.
8+
9+
* sass @ 1.77.6 - This is to silence deprecation warnings until our SASS files have been updated. The initial goal of this project is to generate the exact same file content we have currently.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<Project Sdk="Microsoft.VisualStudio.JavaScript.Sdk/1.0.586930">
2+
<PropertyGroup>
3+
<BuildCommand>npm run build</BuildCommand>
4+
<CleanCommand>npm run clean</CleanCommand>
5+
<NpmInstallCheck>$(PackageJsonDirectory)\node_modules\.install.stamp</NpmInstallCheck>
6+
</PropertyGroup>
7+
8+
<Target Name="TriggerNpmInstallOnNextBuild" AfterTargets="CoreClean">
9+
<Touch Files="$(PackageJsonDirectory)\package.json" />
10+
</Target>
11+
</Project>
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
[
2+
{
3+
"source": "src/styles",
4+
"destination": "../RockWeb/Styles",
5+
"copy": true
6+
},
7+
{
8+
"source": "src/themes",
9+
"destination": "../RockWeb/Themes",
10+
"copy": true,
11+
"staticFiles": {
12+
"includeExtensions": [
13+
"aspx",
14+
"cs",
15+
"Master",
16+
"json",
17+
"system",
18+
"mp3",
19+
"js"
20+
]
21+
}
22+
}
23+
]

0 commit comments

Comments
 (0)