Compare commits

...

9 Commits

5 changed files with 102 additions and 8 deletions

View File

@@ -1,6 +1,6 @@
Package: AVSDevR.MarineNoiseRegistry Package: AVSDevR.MarineNoiseRegistry
Title: Marine Noise Registry Common Code Package Title: Marine Noise Registry Common Code Package
Version: 0.1.1 Version: 1.0.1
Authors@R: Authors@R:
person("Craig", "Williams", , "craig@avsdev.uk", role = c("aut", "cre")) person("Craig", "Williams", , "craig@avsdev.uk", role = c("aut", "cre"))
Description: Comon code and assets for all of the Marine Noise Registry Description: Comon code and assets for all of the Marine Noise Registry

View File

@@ -181,6 +181,10 @@ MNR.GeoPlot <- R6::R6Class(
private$addJNCCLayers(with_jncc_layers) %>% private$addJNCCLayers(with_jncc_layers) %>%
private$addConservationAreas(with_conservation_areas) %>% private$addConservationAreas(with_conservation_areas) %>%
plotly::layout( plotly::layout(
font = list(
family = "Roboto, \"Helvetica Neue\", Helvetica, Arial, sans-serif",
size = 15
),
mapbox = list(style = "carto-positron"), mapbox = list(style = "carto-positron"),
legend = list( legend = list(
groupclick = "toggleitem", groupclick = "toggleitem",

View File

@@ -17,7 +17,7 @@ use_mnr_ui <- function() {
), ),
htmltools::singleton( htmltools::singleton(
htmltools::HTML(paste0( htmltools::HTML(paste0(
"<script src='", resourcePrefix(), "js/frameHeight.js'></script>" "<script src='", resourcePrefix(), "/js/frameHeight.js'></script>"
)) ))
) )
) )

View File

@@ -9,4 +9,75 @@ input[type="text"], input[type="password"], input[type="number"] {
.selectize-input input[type="text"] { .selectize-input input[type="text"] {
height: 27px !important; height: 27px !important;
} }
.selectize-control .selectize-input.disabled {
cursor: not-allowed !important;
opacity: 1;
background-color: #eee;
}
.selectize-input.disabled, .selectize-input.disabled * {
cursor: not-allowed !important;
}
.table.dataTable tbody tr td.actions-col, .table.dataTable thead tr th.actions-col {
min-width: 140px;
}
.row-header {
padding-bottom: 0;
margin-bottom: 0;
margin-top: 30px;
text-decoration: underline;
}
.form-group.has-success div div.selectize-control div.selectize-input {
border-color: #00a65a;
box-shadow: none;
}
.tab-content {
border-left: 1px solid #ddd;
padding: 8px;
padding-left: 15px;
}
.noise-parameter {
display: inline-block;
width: 32%;
padding: 0px 20px 0px 0px;
}
dl.parameters {
display: grid;
grid-template-columns: max-content auto;
}
dl.parameters dt {
grid-column-start: 1;
}
dl.parameters dt::after {
content: ":";
margin-right: 10px;
}
dl.parameters dd {
grid-column-start: 2;
}
tr.deleted-row {
text-decoration: line-through;
color: #BBB;
}
hr {
color: #BBB;
}
.vr {
color: #BBB;
opacity: 1.0;
width: 2px;
}

View File

@@ -87,17 +87,20 @@ h6 {
.table.dataTable > tbody > td.active, .table.dataTable > tbody > td.active,
.table.dataTable > tbody > tr.active td { .table.dataTable > tbody > tr.active td {
background-color: #3f9c35 !important; color: #000000 !important;
background-color: #6bc961 !important;
} }
table.dataTable > tbody > tr.selected > * { table.dataTable > tbody > tr.selected > * {
box-shadow: inset 0 0 0 9999px #3f9c35 !important; color: #000000 !important;
box-shadow: inset 0 0 0 9999px #6bc961 !important;
} }
table.dataTable.hover > tbody > tr.even.selected:hover > *, table.dataTable.hover > tbody > tr.even.selected:hover > *,
table.dataTable.display > tbody > tr.even.selected:hover > *, table.dataTable.display > tbody > tr.even.selected:hover > *,
table.dataTable.hover > tbody > tr.odd.selected:hover > *, table.dataTable.hover > tbody > tr.odd.selected:hover > *,
table.dataTable.display > tbody > tr.odd.selected:hover > * { table.dataTable.display > tbody > tr.odd.selected:hover > * {
color: #FFFFFF !important;
box-shadow: inset 0 0 0 9999px #44a939 !important; box-shadow: inset 0 0 0 9999px #44a939 !important;
} }
@@ -438,6 +441,17 @@ a:focus {
text-decoration: underline; text-decoration: underline;
} }
.form-control {
font-size: 12pt;
}
.form-group.has-success label {
color: #008549;
}
.form-group.has-error label {
color: #DA3A25;
}
.btn { .btn {
font-size: 14pt; font-size: 14pt;
/* /*
@@ -480,9 +494,14 @@ input[type="text"], input[type="password"], input[type="number"] {
overflow: hidden; overflow: hidden;
} }
.content-jump-link:focus { .content-jump-link:focus {
position: static; position: absolute;
width: auto; width: auto;
height: auto; height: auto;
z-index: 1500;
background-color: #ecf0f5;
padding: 5px 10px;
left: 0;
color: #2D6B8F;
} }
.box-header > i { .box-header > i {
@@ -547,7 +566,7 @@ input[type="text"], input[type="password"], input[type="number"] {
text-decoration: none; text-decoration: none;
} }
.skin-green .sidebar-menu > li.header { .sidebar-menu > li.header {
color: #70979E; color: #70979E;
font-weight: bolder; font-weight: bolder;
} }
@@ -566,4 +585,4 @@ input[type="text"], input[type="password"], input[type="number"] {
.badge { .badge {
padding: 6px 9px 3px 9px; padding: 6px 9px 3px 9px;
} }