Commit d033e6a8 authored by Delaigue Olivier's avatar Delaigue Olivier
Browse files

Merge branch '59-update-icon-names' into 'dev'

Resolve "Update icon names"

Closes #59

See merge request !32
2 merge requests!45Merge branch 'dev' into 'master',!32Resolve "Update icon names"
Pipeline #38072 passed with stage
in 3 minutes and 13 seconds
Showing with 4 additions and 4 deletions
+4 -4
......@@ -176,7 +176,7 @@ shinyServer(function(input, output, session) {
CAL_click$valueButton <- CAL_click$valueButton - 1
CAL_click$valueButton <- ifelse(CAL_click$valueButton < -1, -1, CAL_click$valueButton)
if (CAL_click$valueButton < 0) {
updateActionButton(session, inputId = "CalButton", label = "Run", icon = icon("sync"))
updateActionButton(session, inputId = "CalButton", label = "Run", icon = icon("arrows-rotate"))
if (!getPrep()$isUngauged) {
shinyjs::enable("CalButton")
}
......
......@@ -132,7 +132,7 @@ navbarPage(title = div("airGRteaching",
choices = c("NSE [Q]", "NSE [sqrt(Q)]", "NSE [1/Q]",
"KGE [Q]", "KGE [sqrt(Q)]", "KGE [1/Q]"))),
column(width = 6, actionButton("CalButton", label = "Run", width = "100%",
icon = icon("sync"),
icon = icon("arrows-rotate"),
style = ifelse(.GlobalEnv$.ShinyGR.args$theme != "Cerulean",
"color:#ffffff; background-color:#A4C400; border-color:#A4C400; margin-top:25px; padding:6px;",
"color:#565656; background-color:#ECF0F1; border-color:#DCDCDC; margin-top:25px; padding:6px;")))
......@@ -219,7 +219,7 @@ navbarPage(title = div("airGRteaching",
)
),
tabPanel(title = "Summary sheet",
icon = icon("th"),
icon = icon("table-cells"),
sidebarLayout(position = "left",
sidebarPanel(width = 3,
h4("Choose a dataset:"),
......@@ -230,7 +230,7 @@ navbarPage(title = div("airGRteaching",
)
),
navbarMenu(title = "Help",
icon = icon("question-circle"),
icon = icon("circle-question"),
tabPanel(title = "Get started",
icon = icon("cog", lib = "glyphicon"),
fluidRow(column(width = 12, includeMarkdown("www/tab_fun.md")))
......
Supports Markdown
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