Skip to content

Commit c23dc96

Browse files
new css variables
1 parent a651d9e commit c23dc96

File tree

5 files changed

+19
-23
lines changed

5 files changed

+19
-23
lines changed

Diff for: app/helpers/additionals_js_heads_helper.rb

-12
This file was deleted.

Diff for: app/views/additionals/_html_head.html.slim

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
- additionals_top_menu_setup
22
= additionals_library_load :font_awesome
3-
= stylesheet_link_tag 'additionals', plugin: 'additionals'
3+
= stylesheet_link_tag 'variables', 'additionals', plugin: 'additionals'
44
= javascript_include_tag 'additionals', plugin: 'additionals'

Diff for: assets/stylesheets/additionals.css

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88

99
.query-description,
1010
.dashboard-description {
11-
color: var(--darkfontcolor);
11+
color: var(--a-color-dark);
1212
margin-bottom: 15px;
1313
font-size: 95%;
1414
}
1515

1616
span.dashboard-locked {
17-
stroke: var(--darkfontcolor);
17+
stroke: var(--a-color-dark);
1818
}
1919

2020
fieldset.hide-attachments {
@@ -105,7 +105,7 @@ svg {
105105
}
106106

107107
&.dashboard-system-default.global {
108-
stroke: var(--alertfontcolor);
108+
stroke: var(--a-color-alert);
109109
}
110110
}
111111

@@ -118,7 +118,7 @@ svg {
118118
text-decoration: none;
119119
}
120120

121-
.sudo-admin { color: var(--alertfontcolor); }
121+
.sudo-admin { color: var(--a-color-alert); }
122122

123123
.nodata.nodata-left { text-align: left; }
124124

@@ -184,7 +184,7 @@ img.additionals-avatar { margin-right: 0.25em; }
184184

185185
.dashboard-block h3 svg,
186186
#page-title svg {
187-
stroke: var(--darkfontcolor);
187+
stroke: var(--a-color-dark);
188188
stroke-width: 2;
189189
}
190190

@@ -242,7 +242,7 @@ div.macro-desc {
242242

243243
#top-menu .menu-children li a {
244244
display: block;
245-
color: var(--darkfontcolor);
245+
color: var(--a-color-dark);
246246
padding: 5px 10px;
247247
background-color: #fff;
248248
font-weight: normal;
@@ -360,7 +360,7 @@ div.drdn-items a.disabled,
360360
div.drdn-items a.disabled:hover { color: #aaa; }
361361

362362
table.entity-list td.block_column {
363-
color: #777;
363+
color: var(--a-color-info);
364364
font-size: 90%;
365365
padding: 4px 4px 4px 2px;
366366
text-align: left;

Diff for: assets/stylesheets/variables.css

+11-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
:root {
2-
--darkfontcolor: #666;
3-
--alertfontcolor: #d80000;
2+
--a-color-dark: #555;
3+
--a-color-black: #000;
4+
--a-color-white: #fff;
5+
--a-color-default: #169;
6+
--a-color-even: #f6f7f8;
7+
--a-color-odd: #fff;
8+
--a-color-list-border: #d0d7de;
9+
--a-color-input-border: #ccc;
10+
--a-color-info: #777;
11+
--a-color-warning: #c45736;
12+
--a-color-alert: #d80000;
413
}

Diff for: lib/additionals/patches/application_controller_patch.rb

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ module ApplicationControllerPatch
88
included do
99
include InstanceMethods
1010
before_action :enable_smileys
11-
helper :additionals_js_heads
1211
end
1312

1413
module InstanceMethods

0 commit comments

Comments
 (0)