Skip to content

Commit 692fb5e

Browse files
committed
feat: make some settings global and work for all projects
1 parent b44f490 commit 692fb5e

File tree

3 files changed

+34
-16
lines changed

3 files changed

+34
-16
lines changed

app-src/scripts/constants.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
'currentProject',
1717
'projects',
1818
'keys',
19-
'isShowWelcomeDialog'
19+
'isShowWelcomeDialog',
20+
'config',
21+
'keys'
2022
])
2123
.constant('ON_DEMAND_LS_FIELDS', [
2224
'doneBacklogTasks',
@@ -59,7 +61,7 @@
5961
},
6062
tasks: [],
6163
backlogTasks: [],
62-
doneBacklogTasks:[],
64+
doneBacklogTasks: [],
6365
distractions: [],
6466
projects: [],
6567
globalLinks: [],

app-src/scripts/routes/settings/_settings-c.scss

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
.page-settings {
22
text-align: left;
33

4+
h1 {
5+
// NOTE: this is not working
6+
break-after: avoid;
7+
}
8+
49
@media(min-width: $layout-gt-sm) {
510
column-count: 2;
611
section {
712
display: inline-block;
813
width: 100%;
914
overflow: hidden;
10-
break-inside: avoid-column;
15+
break-inside: avoid;
1116
-webkit-column-break-inside: avoid;
1217
}
1318
}
@@ -16,6 +21,11 @@
1621
column-count: 3;
1722
}
1823

24+
.keep-together {
25+
display: inline-block;
26+
width: 100%;
27+
}
28+
1929
.config-section {
2030
padding: 15px;
2131
margin-bottom: 10px;

app-src/scripts/routes/settings/settings-c.html

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,40 +6,46 @@
66
selected-current-project="vm.selectedCurrentProject"></project-settings>
77
</section>
88

9+
910
<section class="config-section"
1011
md-whiteframe="2">
11-
<theme-settings current-theme="r.theme"
12-
is-current-project-theme="true"></theme-settings>
12+
<backup-settings settings="r.config.automaticBackups"></backup-settings>
1313
</section>
1414

1515

1616
<section class="config-section"
17-
md-whiteframe="2"
18-
ng-if="vm.IS_ELECTRON">
19-
<jira-settings settings="r.jiraSettings"></jira-settings>
17+
md-whiteframe="2">
18+
<keyboard-settings keys="r.keys"></keyboard-settings>
2019
</section>
2120

2221

2322
<section class="config-section"
2423
md-whiteframe="2">
25-
<git-settings settings="r.git"></git-settings>
24+
<misc-settings settings="r.config"></misc-settings>
2625
</section>
2726

28-
<section class="config-section"
29-
md-whiteframe="2">
30-
<backup-settings settings="r.config.automaticBackups"></backup-settings>
31-
</section>
3227

28+
<div class="keep-together">
29+
<h1 class="md-title">Project Specific Settings</h1>
30+
31+
<section class="config-section"
32+
md-whiteframe="2">
33+
<theme-settings current-theme="r.theme"
34+
is-current-project-theme="true"></theme-settings>
35+
</section>
36+
</div>
3337

3438
<section class="config-section"
35-
md-whiteframe="2">
36-
<keyboard-settings keys="r.keys"></keyboard-settings>
39+
md-whiteframe="2"
40+
ng-if="vm.IS_ELECTRON">
41+
<jira-settings settings="r.jiraSettings"></jira-settings>
3742
</section>
3843

3944

4045
<section class="config-section"
4146
md-whiteframe="2">
42-
<misc-settings settings="r.config"></misc-settings>
47+
<git-settings settings="r.git"></git-settings>
4348
</section>
4449

50+
4551
</div>

0 commit comments

Comments
 (0)