Skip to content

Commit 991ec1b

Browse files
cabal95cabal95
committed
Merge remote-tracking branch 'origin/hotfix-1.16.1' into develop
2 parents d318c53 + 45083d5 commit 991ec1b

4 files changed

Lines changed: 15 additions & 13 deletions

File tree

‎Rock.JavaScript.EditorJs/Rock.JavaScript.EditorJs.njsproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,9 @@
113113
<TypeScriptCompile Include="src\quote.ts" />
114114
</ItemGroup>
115115
<Import Project="$(VSToolsPath)\Node.js Tools\Microsoft.NodejsToolsV2.targets" />
116-
<Target Name="InstallNodePackages" AfterTargets="BeforeCompile;BeforeClean">
117-
<Exec Command="npm install" Condition="'$(EnableTypeScript)' == 'true' And !Exists('$(QualifiedProjectHome)node_modules\.bin\tsc')" />
116+
<Target Name="InstallNodePackages" AfterTargets="BeforeCompile;BeforeClean" Inputs="package.json" Outputs="node_modules/.install-stamp">
117+
<Exec Command="npm ci" />
118+
<Touch Files="node_modules/.install-stamp" AlwaysCreate="true" />
118119
</Target>
119120
<ProjectExtensions>
120121
<VisualStudio>

‎Rock.JavaScript.Obsidian.Blocks/src/Example/controlGallery.ts‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2570,11 +2570,9 @@ const sectionHeaderGallery = defineComponent({
25702570
:description="description"
25712571
:isSeparatorHidden="!showSeparator" >
25722572
<template v-if="showActionBar" #actions>
2573-
<div>
2574-
<a class="btn btn-default btn-xs btn-square"><i class="fa fa-lock"></i></a>
2575-
<a class="btn btn-default btn-xs btn-square"><i class="fa fa-pencil"></i></a>
2576-
<a class="btn btn-danger btn-xs btn-square"><i class="fa fa-trash-alt"></i></a>
2577-
</div>
2573+
<a class="btn btn-default btn-xs btn-square"><i class="fa fa-lock"></i></a>
2574+
<a class="btn btn-default btn-xs btn-square"><i class="fa fa-pencil"></i></a>
2575+
<a class="btn btn-danger btn-xs btn-square"><i class="fa fa-trash-alt"></i></a>
25782576
</template>
25792577
</SectionHeader>
25802578
@@ -2632,11 +2630,9 @@ const sectionContainerGallery = defineComponent({
26322630
v-model="showContent"
26332631
:toggleText="showContentToggle ? 'Show' : ''" >
26342632
<template v-if="showActionBar" #actions>
2635-
<div>
2636-
<a class="btn btn-default btn-xs btn-square"><i class="fa fa-lock"></i></a>
2637-
<a class="btn btn-default btn-xs btn-square"><i class="fa fa-pencil"></i></a>
2638-
<a class="btn btn-danger btn-xs btn-square"><i class="fa fa-trash-alt"></i></a>
2639-
</div>
2633+
<a class="btn btn-default btn-xs btn-square"><i class="fa fa-lock"></i></a>
2634+
<a class="btn btn-default btn-xs btn-square"><i class="fa fa-pencil"></i></a>
2635+
<a class="btn btn-danger btn-xs btn-square"><i class="fa fa-trash-alt"></i></a>
26402636
</template>
26412637
Here's some content to put in here.
26422638
</SectionContainer>

‎Rock.JavaScript.Obsidian.Blocks/src/Finance/FinancialBatchList/types.partial.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export const enum NavigationUrlKey {
2525
export const enum PreferenceKey {
2626
FilterDaysBack = "filter-days-back",
2727

28-
FilterContainsSourceType = "filter-contains-source-type",
28+
FilterContainsSourceType = "filter-contains-source",
2929

3030
FilterContainsTransactionType = "filter-contains-transaction-type",
3131

‎RockWeb/Styles/_blocks-core.less‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,11 @@
6666
margin-top: 16px;
6767
}
6868

69+
.section-header-actions {
70+
display: flex;
71+
gap: 4px;
72+
}
73+
6974
.rock-header {
7075
.title {
7176
margin: 0;

0 commit comments

Comments
 (0)