Commit 4494b611 authored by Alexandre Delanoë's avatar Alexandre Delanoë

Merge remote-tracking branch 'origin/dev-509-improve-global-theme' into dev

parents 8582d2a0 b6312924
...@@ -6154,6 +6154,10 @@ h3 { ...@@ -6154,6 +6154,10 @@ h3 {
line-height: 1.5; line-height: 1.5;
} }
.table-header-rename .btn .fa::before {
color: #D1CDC7 !important;
}
.b-icon-button { .b-icon-button {
transition: color 0.2s; transition: color 0.2s;
position: relative; position: relative;
...@@ -6277,6 +6281,10 @@ h3 { ...@@ -6277,6 +6281,10 @@ h3 {
color: inherit; color: inherit;
} }
.mainleaf__folder-icon:not(.b-icon-button--enabled)::before {
color: inherit !important;
}
.main-topbar .nav-item > a .fa, .main-topbar .nav-item > a .fa,
.popup-container .card-footer .btn-primary { .popup-container .card-footer .btn-primary {
color: #D1CDC7 !important; color: #D1CDC7 !important;
......
...@@ -5965,6 +5965,10 @@ h3 { ...@@ -5965,6 +5965,10 @@ h3 {
line-height: 1.5; line-height: 1.5;
} }
.table-header-rename .btn .fa::before {
color: #f8f9fa !important;
}
.b-icon-button { .b-icon-button {
transition: color 0.2s; transition: color 0.2s;
position: relative; position: relative;
...@@ -6088,6 +6092,10 @@ h3 { ...@@ -6088,6 +6092,10 @@ h3 {
color: inherit; color: inherit;
} }
.mainleaf__folder-icon:not(.b-icon-button--enabled)::before {
color: inherit !important;
}
.main-topbar .nav-item > a .fa, .main-topbar .nav-item > a .fa,
.popup-container .card-footer .btn-primary { .popup-container .card-footer .btn-primary {
color: #f8f9fa !important; color: #f8f9fa !important;
......
...@@ -5720,6 +5720,10 @@ h3 { ...@@ -5720,6 +5720,10 @@ h3 {
line-height: 1.5; line-height: 1.5;
} }
.table-header-rename .btn .fa::before {
color: #eceeec !important;
}
.b-icon-button { .b-icon-button {
transition: color 0.2s; transition: color 0.2s;
position: relative; position: relative;
...@@ -5843,6 +5847,10 @@ h3 { ...@@ -5843,6 +5847,10 @@ h3 {
color: inherit; color: inherit;
} }
.mainleaf__folder-icon:not(.b-icon-button--enabled)::before {
color: inherit !important;
}
.main-topbar .nav-item > a .fa, .main-topbar .nav-item > a .fa,
.popup-container .card-footer .btn-primary { .popup-container .card-footer .btn-primary {
color: #eceeec !important; color: #eceeec !important;
......
...@@ -5968,6 +5968,10 @@ h3 { ...@@ -5968,6 +5968,10 @@ h3 {
line-height: 1.5; line-height: 1.5;
} }
.table-header-rename .btn .fa::before {
color: #F2F2F0 !important;
}
.b-icon-button { .b-icon-button {
transition: color 0.2s; transition: color 0.2s;
position: relative; position: relative;
...@@ -6091,6 +6095,10 @@ h3 { ...@@ -6091,6 +6095,10 @@ h3 {
color: inherit; color: inherit;
} }
.mainleaf__folder-icon:not(.b-icon-button--enabled)::before {
color: inherit !important;
}
.main-topbar .nav-item > a .fa, .main-topbar .nav-item > a .fa,
.popup-container .card-footer .btn-primary { .popup-container .card-footer .btn-primary {
color: #F2F2F0 !important; color: #F2F2F0 !important;
......
...@@ -5969,6 +5969,10 @@ h3 { ...@@ -5969,6 +5969,10 @@ h3 {
line-height: 1.5; line-height: 1.5;
} }
.table-header-rename .btn .fa::before {
color: #eceeec !important;
}
.b-icon-button { .b-icon-button {
transition: color 0.2s; transition: color 0.2s;
position: relative; position: relative;
...@@ -6092,6 +6096,10 @@ h3 { ...@@ -6092,6 +6096,10 @@ h3 {
color: inherit; color: inherit;
} }
.mainleaf__folder-icon:not(.b-icon-button--enabled)::before {
color: inherit !important;
}
.main-topbar .nav-item > a .fa, .main-topbar .nav-item > a .fa,
.popup-container .card-footer .btn-primary { .popup-container .card-footer .btn-primary {
color: #eceeec !important; color: #eceeec !important;
......
...@@ -123,7 +123,7 @@ dashboardLayoutLoadedCpt = here.component "dashboardLayoutLoaded" cpt ...@@ -123,7 +123,7 @@ dashboardLayoutLoadedCpt = here.component "dashboardLayoutLoaded" cpt
] ]
where where
addNew = H.div { className: "row" } [ addNew = H.div { className: "row mx-0 my-1" } [
H.span { className: "btn btn-primary" H.span { className: "btn btn-primary"
, on: { click: onClickAddChart }} [ H.span { className: "fa fa-plus" } [] ] , on: { click: onClickAddChart }} [ H.span { className: "fa fa-plus" } [] ]
] ]
...@@ -173,7 +173,7 @@ dashboardCodeEditorCpt = here.component "dashboardCodeEditor" cpt ...@@ -173,7 +173,7 @@ dashboardCodeEditorCpt = here.component "dashboardCodeEditor" cpt
T.write_ fieldsWithIndex fieldsS T.write_ fieldsWithIndex fieldsS
pure $ R.fragment pure $ R.fragment
[ H.div { className: "row" } [ H.div { className: "row mx-0 my-1" }
[ H.div { className: "btn btn-primary " <> (saveEnabled fieldsWithIndex fields') [ H.div { className: "btn btn-primary " <> (saveEnabled fieldsWithIndex fields')
, on: { click: onClickSave fields' } , on: { click: onClickSave fields' }
} }
...@@ -187,7 +187,7 @@ dashboardCodeEditorCpt = here.component "dashboardCodeEditor" cpt ...@@ -187,7 +187,7 @@ dashboardCodeEditorCpt = here.component "dashboardCodeEditor" cpt
, session } [] , session } []
] ]
] ]
, H.div { className: "row" } , H.div { className: "row mx-0 my-1" }
[ H.div { className: "btn btn-primary" [ H.div { className: "btn btn-primary"
, on: { click: onClickAddField fieldsS } , on: { click: onClickAddField fieldsS }
} }
...@@ -230,7 +230,7 @@ renderChartCpt = here.component "renderChart" cpt ...@@ -230,7 +230,7 @@ renderChartCpt = here.component "renderChart" cpt
, onChange , onChange
, onRemove , onRemove
, session } _ = do , session } _ = do
pure $ H.div { className: "row chart card" } pure $ H.div { className: "chart card" }
[ H.div { className: "card-header" } [ H.div { className: "card-header" }
[ H.div { className: "row" } [ H.div { className: "row" }
[ H.div { className: "col-2" } [ H.div { className: "col-2" }
......
...@@ -124,6 +124,13 @@ ...@@ -124,6 +124,13 @@
} }
} }
.table-header-rename .btn {
.fa::before {
color: $light !important;
}
}
/// Icon Button /// Icon Button
///----------------------------------------------------------------------------- ///-----------------------------------------------------------------------------
...@@ -249,6 +256,11 @@ ...@@ -249,6 +256,11 @@
} }
} }
} }
.mainleaf__folder-icon:not(.b-icon-button--enabled) {
&::before {
color: inherit !important;
}
}
.main-topbar .nav-item > a .fa, .main-topbar .nav-item > a .fa,
.popup-container .card-footer .btn-primary { .popup-container .card-footer .btn-primary {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment