Skip to content

Commit 6271838

Browse files
committed
Link up Less properties to predefined variables
1 parent 0b18c11 commit 6271838

39 files changed

Lines changed: 124 additions & 122 deletions

frontend/src/core/less/app.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ html {
66

77
body {
88
background-color:@ui-content-color;
9-
color:@sidebar-color;
9+
color: @tertiary-color;
1010
}
1111

1212
#app {
@@ -65,7 +65,7 @@ span.error {
6565
> div {
6666
width: @loading-icon-size;
6767
height: @loading-icon-size;
68-
background-color: #263944;
68+
background-color: @tertiary-color;
6969
margin: 0 @loading-icon-size/3 0 @loading-icon-size/3;
7070

7171
border-radius: 100%;

frontend/src/core/less/colours.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
@sidebar-color: @tertiary-color;
4949
@sidebar-text-color: @primary-color;
5050
@sidebar-item-hover-color: lighten(@tertiary-color, 10%);
51-
@sidebar-item-hover-text-color: white;
51+
@sidebar-item-hover-text-color: @white;
5252
@sidebar-input-text-color: @white;
5353
@sidebar-input-placeholder-color: #9fa8ad;
5454
@sidebar-input-color: #627178;

frontend/src/core/less/sharedStyles.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
max-width: 800px;
5151
margin: 20px;
5252
border: 1px solid #d6f2f9;
53-
background-color: #fff;
53+
background-color: @white;
5454
> .inner {
5555
padding: 30px;
5656
form .form-group {

frontend/src/core/less/tables.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
.tb-title {
44
background-color: #9cabc4;
5-
color:#fff;
5+
color: @white;
66
text-align: center;
77
border-bottom: 1px gray solid;
88
padding: 24px 30px!important;

frontend/src/core/less/tags.less

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
div.tagsinput {
44
border:1px solid #CCC;
5-
background: #FFF;
5+
background: @white;
66
padding:5px;
77
overflow-y: auto;
88
border-radius: @button-radius;
@@ -61,7 +61,7 @@ div.tagsinput {
6161
padding: 4px 0 4px 0;
6262
margin: 2px 0 0 0;
6363
list-style: none;
64-
background-color: #ffffff;
64+
background-color: @white;
6565
border-color: #ccc;
6666
border-color: rgba(0, 0, 0, 0.2);
6767
border-style: solid;
@@ -189,6 +189,6 @@ div.tagsinput {
189189
.ui-widget-content .ui-state-focus,
190190
.ui-widget-header .ui-state-focus {
191191
background: #15a4fa;
192-
font-weight: bold;
193-
color: #fff;
192+
font-weight: @font-weight-bold;
193+
color: @white;
194194
}

frontend/src/modules/assetManagement/less/asset.less

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
right: 0;
3737
overflow-x:hidden;
3838
text-align:center;
39-
background-color:#fff;
39+
background-color: @white;
4040

4141
&-inner {
4242
padding: 30px 15px;
@@ -74,7 +74,7 @@
7474
margin-bottom:30px;
7575
float:left;
7676
cursor:pointer;
77-
background-color:#fff;
77+
background-color: @white;
7878
border: 1px solid #d6f2f9;
7979
border-radius:3px;
8080
transition: all 0.3s;
@@ -100,7 +100,7 @@
100100
background-position:center;
101101
background-size:cover;
102102
background-repeat: no-repeat;
103-
background-color: white;
103+
background-color: @white;
104104
text-align:center;
105105
border: 1px solid #d6f2f9;
106106
border-left: none;
@@ -159,7 +159,7 @@
159159

160160
span.tag-value {
161161
margin: 5px;
162-
color:#fff;
162+
color: @white;
163163
padding: 3px;
164164
background-color:@primary-color;
165165
}
@@ -191,14 +191,14 @@
191191
border: none;
192192
border-radius: 3px;
193193
background: #627178;
194-
color: #fff;
194+
color: @white;
195195
}
196196
.modal & button {
197197
margin-left:-4px;
198198
color:#9cabc4;
199199
transition:color 0.3s;
200200
&:hover {
201-
color:#fff;
201+
color: @white;
202202
}
203203
}
204204
}
@@ -214,7 +214,7 @@
214214
top:40px;
215215
left:0px;
216216
z-index:5;
217-
background-color:#fff;
217+
background-color: @white;
218218
box-shadow:1px 2px 4px 0px #666;
219219
&-inner {
220220
padding:30px;
@@ -225,7 +225,8 @@
225225
position: absolute;
226226
top: 0px;
227227
right: 0;
228+
color: @primary-color;
228229
&:hover {
229-
color:#15a4fa;
230+
color: darken(@primary-color, 5%);
230231
}
231232
}

frontend/src/modules/assetManagement/less/assetManagementNew.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
visibility:hidden;
1010
width:76px;
1111
height:10px;
12-
background-color: white;
12+
background-color: @white;
1313
border:1px solid black;
1414
overflow: hidden;
1515
border-radius: 8px;

frontend/src/modules/colorLabel/less/colorLabels.less

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
transform: translate(-50%,-50%);
88
max-width: 640px;
99

10-
background: @adapt-white;
10+
background: @white;
1111
border: solid 1px @popup-border-color;
1212
box-shadow: 0 0 4px @popup-border-color;
1313

@@ -17,7 +17,7 @@
1717
.colorlabel-header {
1818
.title {
1919
font-size: 17px;
20-
font-weight: 700;
20+
font-weight: @font-weight-bold;
2121
line-height: 20px;
2222
padding: 0 4px;
2323
}
@@ -36,7 +36,7 @@
3636

3737
.color-item {
3838
font-size: 0;
39-
border: solid 4px @adapt-white;
39+
border: solid 4px @white;
4040
width: 30px;
4141
height: 30px;
4242
border-radius: 4px;
@@ -85,7 +85,7 @@
8585
}
8686

8787
&.selected {
88-
border-color: darken(@adapt-white, 50%);
88+
border-color: darken(@white, 50%);
8989
border-radius: 8px;
9090
}
9191
}

frontend/src/modules/contextMenu/less/contextMenu.less

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// Context Menu styling
22
// ==============
3-
@context-menu-color:#34bee0;
4-
@context-menu-text-color:#fff;
3+
@context-menu-color: @primary-color;
4+
@context-menu-text-color: @white;
55

6-
@context-menu-icon-color:#fff;
6+
@context-menu-icon-color: @white;
77

88
@context-menu-item-color:@context-menu-color;
9-
@context-menu-item-hover-color:darken(@context-menu-item-color,10%);
9+
@context-menu-item-hover-color: lighten(@context-menu-item-color, 10%);
1010

11-
@context-menu-item-text-color:white;
11+
@context-menu-item-text-color: @white;
1212
@context-menu-item-text-hover-color:@context-menu-item-text-color;
1313

1414
@contect-menu-item-border:1px solid #3e4a5f;
@@ -39,11 +39,11 @@
3939
padding:12px;
4040
text-decoration: none;
4141
color: @context-menu-item-text-color;
42-
border-top: 1px solid #60cce7;
42+
border-top: 1px solid @context-menu-item-hover-color;
4343
transition:all 0.3s;
4444
&:hover {
4545
color:@context-menu-item-text-hover-color;
46-
background-color:lighten(@context-menu-color, 15%);
46+
background-color: @context-menu-item-hover-color;
4747
}
4848
}
4949
}

frontend/src/modules/editor/contentObject/less/editing-overlay-component-list.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
border-right:1px solid #ccc;
4949
padding:0px 10px;
5050
float:left;
51-
background-color:#fff;
51+
background-color: @white;
5252
color:#3e4960;
5353
transition:background-color 0.2s;
5454
&:hover {

0 commit comments

Comments
 (0)