изменение стиля, фикс демонстрации иконки
This commit is contained in:
@@ -168,16 +168,3 @@ scheme_R6 <- R6::R6Class(
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
# object.size(schm)
|
|
||||||
# schm$get_key_id("main")
|
|
||||||
# schm$get_forms_ids("main")
|
|
||||||
# schm$get_all_ids("main")
|
|
||||||
|
|
||||||
# schm$get_scheme("main")
|
|
||||||
|
|
||||||
# schm$get_id_type_list("allergo_anamnesis")
|
|
||||||
|
|
||||||
# # active
|
|
||||||
# schm$get_main_key_id
|
|
||||||
# schm$all_tables_names
|
|
||||||
@@ -108,7 +108,11 @@ render_forms = function(
|
|||||||
} else {
|
} else {
|
||||||
shiny::tagList(
|
shiny::tagList(
|
||||||
if (!is.na(form_label)) {
|
if (!is.na(form_label)) {
|
||||||
|
if (form_type == "description_header") {
|
||||||
|
shiny::span(form_label, class = "description-header", style = "color: #444444; font-weight: 550; line-height: 1.4;")
|
||||||
|
} else {
|
||||||
shiny::span(form_label, style = "color: #444444; font-weight: 550; line-height: 1.4;")
|
shiny::span(form_label, style = "color: #444444; font-weight: 550; line-height: 1.4;")
|
||||||
|
}
|
||||||
# если в схеме есть поле с описанием - добавляем его следующей строчкой
|
# если в схеме есть поле с описанием - добавляем его следующей строчкой
|
||||||
},
|
},
|
||||||
if (!is.na(description) && !is.na(form_label)) shiny::br(),
|
if (!is.na(description) && !is.na(form_label)) shiny::br(),
|
||||||
|
|||||||
7
app.R
7
app.R
@@ -42,15 +42,18 @@ if (!rmarkdown::pandoc_available()) warning("Can't find pandoc!")
|
|||||||
|
|
||||||
# web resources ------
|
# web resources ------
|
||||||
shiny::addResourcePath("www", "www")
|
shiny::addResourcePath("www", "www")
|
||||||
|
shiny::resourcePaths()
|
||||||
|
|
||||||
# UI =======================
|
# UI =======================
|
||||||
ui <- page_sidebar(
|
ui <- page_sidebar(
|
||||||
title = config::get("form_name"),
|
title = config::get("form_name"),
|
||||||
theme = bs_theme(version = 5, preset = "bootstrap"),
|
theme = bs_theme(version = 5, preset = "bootstrap"),
|
||||||
header = tags$head(
|
|
||||||
|
tags$head(
|
||||||
|
tags$link(rel = "stylesheet", type = "text/css", href = "www/styles.css"),
|
||||||
tags$link(rel = "icon", href = "www/favicon.ico")
|
tags$link(rel = "icon", href = "www/favicon.ico")
|
||||||
),
|
),
|
||||||
|
|
||||||
sidebar = sidebar(
|
sidebar = sidebar(
|
||||||
actionButton("add_new_main_key_button", "Добавить новую запись", icon("plus", lib = "font-awesome")),
|
actionButton("add_new_main_key_button", "Добавить новую запись", icon("plus", lib = "font-awesome")),
|
||||||
actionButton("save_data_button", "Сохранить данные", icon("floppy-disk", lib = "font-awesome")),
|
actionButton("save_data_button", "Сохранить данные", icon("floppy-disk", lib = "font-awesome")),
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"app_id": "formy",
|
"app_id": "formy",
|
||||||
"app_title": "FORMY",
|
"app_title": "FORMY",
|
||||||
"formy_version": "0.18.3"
|
"formy_version": "0.18.4"
|
||||||
}
|
}
|
||||||
BIN
www/favicon.ico
BIN
www/favicon.ico
Binary file not shown.
|
Before Width: | Height: | Size: 295 KiB After Width: | Height: | Size: 2.1 KiB |
10
www/styles.css
Normal file
10
www/styles.css
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
.description-header {
|
||||||
|
/* 1. Add the border around the whole box */
|
||||||
|
border-bottom: 2px solid #777777;
|
||||||
|
|
||||||
|
/* 2. Forces border inside the total width/height (prevents breaking layouts) */
|
||||||
|
box-sizing: border-box;
|
||||||
|
|
||||||
|
/* 3. Ensures the div encloses any internal floated elements */
|
||||||
|
overflow: auto;
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user