diff --git a/smdb/smdb/static/css/map_compilation_filter.css b/smdb/smdb/static/css/map_compilation_filter.css index d595abed..982a4dc4 100644 --- a/smdb/smdb/static/css/map_compilation_filter.css +++ b/smdb/smdb/static/css/map_compilation_filter.css @@ -1,12 +1,20 @@ +/* body { + margin-left: 20px; + margin-right: 20px; +} */ html, #map_compilation_filter { width: 100%; height: 85%; + margin-left: 3rem; } th, td { padding: 0 15px; } +.table { + margin: 0 10px 0 10px; +} .label-mission-name { font-size: 1.3em; text-align: left; diff --git a/smdb/smdb/static/css/map_expedition_filter.css b/smdb/smdb/static/css/map_expedition_filter.css index ad06f4a5..3a9ac724 100644 --- a/smdb/smdb/static/css/map_expedition_filter.css +++ b/smdb/smdb/static/css/map_expedition_filter.css @@ -1,3 +1,7 @@ +/* body { + margin-left: 20px; + margin-right: 20px; +} */ html, #map_expedition_filter { width: 100%; @@ -7,6 +11,10 @@ th, td { padding: 0 15px; } +.tab div { + margin-left: 3rem; + margin-right: 3rem; +} .label-mission-name { font-size: 1.3em; text-align: left; diff --git a/smdb/smdb/static/css/map_mission_filter.css b/smdb/smdb/static/css/map_mission_filter.css index 4c5ff358..f9e908d9 100644 --- a/smdb/smdb/static/css/map_mission_filter.css +++ b/smdb/smdb/static/css/map_mission_filter.css @@ -7,6 +7,10 @@ th, td { padding: 0 15px; } +.tab div { + margin-left: 3rem; + margin-right: 3rem; +} .label-mission-name { font-size: 1.3em; text-align: left; diff --git a/smdb/smdb/static/css/project.css b/smdb/smdb/static/css/project.css index b221b8a6..64632076 100644 --- a/smdb/smdb/static/css/project.css +++ b/smdb/smdb/static/css/project.css @@ -12,10 +12,57 @@ color: #b94a48; } +#separator.row { + margin-left: 0; +} + +#number-missions { + margin-left: 0; + margin-right: 0; +} + +div.row { + margin-left: 2rem; + margin-right: 1rem; +} +div.row +div.col { + text-align: center; +} +#comp_detail { + margin-left: 2rem; + margin-right: 1rem; + text-align: left; +} + +div.table-container { + margin-left: 2rem; + margin-right: 2rem; +} + a { font-size: 16px !important; } +h2 { + margin-left: 3rem; + margin-bottom: 1rem; +} + +form { + margin-left: 3rem; + margin-right: 3rem; +} +form.d-flex { + margin-left: 1rem; + margin-right: 1rem; +} +p { + margin-left: 3rem; + margin-right: 3rem; + margin-bottom: 1rem; +} + #coordinates { margin-top: 10px; } @@ -89,6 +136,11 @@ a { box-shadow: inset 0 0 0 2em var(--hover); } +#filters { + margin-left: 0; + margin-right: 0; +} + #filter-left { background-color: white; float: left; @@ -103,6 +155,7 @@ a { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; left: 0; + margin-left: 0 } #filter-center { @@ -135,6 +188,10 @@ a { margin: 5px; } +div#navBar { + padding-top: 4px; +} + div#borderDiv { bottom: 0; @@ -171,6 +228,7 @@ div.width_fixed { height: 1px; right: 0; left: 0; + margin-right: 0rem; } #searchbar { @@ -203,8 +261,8 @@ div.width_fixed { #searchbtn { font-size: 14px !important; vertical-align: center; - margin-left: 5px; - margin-right: 20px; + margin-left: 0px; + margin-right: 0px; } #split { @@ -352,6 +410,11 @@ div.width_fixed { color: black; } +.leaflet-control-layers-selector, +span { + color:black +} + .leaflet-control-layers-selector, span:hover { color: white; @@ -561,11 +624,11 @@ span:hover { border: 3px solid black; } */ -.leaflet-bar a, -.leaflet-bar { +/* .leaflet-bar a, +.leaflet-bar { */ /* a:hover { */ /* border: 2px solid black; */ -} +/* } */ .leaflet-control, .leaflet-popup-pane { @@ -728,6 +791,26 @@ div>#bounds { vertical-align: middle; } +#id_name:hover { + border-color: cornflowerblue; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px cornflowerblue; +} + +#id_expedition__name:hover { + border-color: cornflowerblue; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px cornflowerblue; +} + +#id_has_thumbnail:hover { + border-color: cornflowerblue; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px cornflowerblue; +} + +#id_has_missions:hover { + border-color: cornflowerblue; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px cornflowerblue; +} + /* #map { } */ #map-bounds { diff --git a/smdb/smdb/templates/pages/about.html b/smdb/smdb/templates/pages/about.html index 2ecbd2fa..275b5213 100644 --- a/smdb/smdb/templates/pages/about.html +++ b/smdb/smdb/templates/pages/about.html @@ -16,7 +16,7 @@


Seafloor Mapping Database -

+


About the database

@@ -40,15 +40,14 @@

About the database If you have suggestions for the SMDB, please contact one of the developers.

- Developers -

-

+ Developers: +
Mike McCann, Karen Salamy, - Jennifer Paduan, + Jennifer Paduan, David Caress -

-

GitHub repository
+

+ GitHub repository

>> Schema and Use Cases on file at GitHub (still evolving)

@@ -170,7 +169,7 @@

About the database

Seafloor Mapping Lab
Ocean Imaging Project
Geological Changes Group
- Submarine Volcanism Project



+ Submarine Volcanism Project



diff --git a/smdb/smdb/templates/pages/home.html b/smdb/smdb/templates/pages/home.html index 5c5b08b4..c4368218 100644 --- a/smdb/smdb/templates/pages/home.html +++ b/smdb/smdb/templates/pages/home.html @@ -112,7 +112,7 @@ {% block content %} {# Number of Missions and Load Log Output #} -
+
Viewing {{ num_missions }} Missions diff --git a/smdb/smdb/templates/smdb/compilation_detail.html b/smdb/smdb/templates/smdb/compilation_detail.html index 597aa324..23362f82 100644 --- a/smdb/smdb/templates/smdb/compilation_detail.html +++ b/smdb/smdb/templates/smdb/compilation_detail.html @@ -28,12 +28,12 @@

Missions making up this Compilation:

- -
- View full resolution image: +
+
+ View full resolution image: {{ thumbnail_fullrez_url }}
-
+
Thumbnail filename: {{ compilation.thumbnail_filename }}
diff --git a/smdb/smdb/templates/smdb/compilation_filter.html b/smdb/smdb/templates/smdb/compilation_filter.html index 9700d87e..573e159f 100644 --- a/smdb/smdb/templates/smdb/compilation_filter.html +++ b/smdb/smdb/templates/smdb/compilation_filter.html @@ -32,10 +32,10 @@

Compilations

{{ filter.form.as_table }} -
+
{% endif %} {{ missions|json_script:"missions-data" }} -
+
{% if table %} {% render_table table "smdb_tables2_bootstrap4.html" %} diff --git a/smdb/smdb/templates/smdb/expedition_detail.html b/smdb/smdb/templates/smdb/expedition_detail.html index ec2343e2..f07570ca 100644 --- a/smdb/smdb/templates/smdb/expedition_detail.html +++ b/smdb/smdb/templates/smdb/expedition_detail.html @@ -14,10 +14,14 @@ {% block content %} -

{{ expedition.name }}

-

Missions:

-
- {% render_table table %} -
> +
+
+

{{ expedition.name }}

+

Missions:

+
+ {% render_table table %} +
+
+
{% endblock %} \ No newline at end of file diff --git a/smdb/smdb/templates/smdb/expedition_filter.html b/smdb/smdb/templates/smdb/expedition_filter.html index 27534f82..00eca69d 100644 --- a/smdb/smdb/templates/smdb/expedition_filter.html +++ b/smdb/smdb/templates/smdb/expedition_filter.html @@ -32,7 +32,7 @@

Expeditions

{{ filter.form.as_table }} -
+
{% endif %} {{ missions|json_script:"missions-data" }}
diff --git a/smdb/smdb/templates/smdb/mission_detail.html b/smdb/smdb/templates/smdb/mission_detail.html index 92eae8e5..a72b2d61 100644 --- a/smdb/smdb/templates/smdb/mission_detail.html +++ b/smdb/smdb/templates/smdb/mission_detail.html @@ -44,6 +44,7 @@

Used in Compilations:

+

Notes:

{{ mission.notes_text }}
diff --git a/smdb/smdb/templates/smdb/mission_filter.html b/smdb/smdb/templates/smdb/mission_filter.html index e61990b3..6304000b 100644 --- a/smdb/smdb/templates/smdb/mission_filter.html +++ b/smdb/smdb/templates/smdb/mission_filter.html @@ -32,7 +32,7 @@

Missions

{{ filter.form.as_table }} -
+
{% endif %} {{ missions|json_script:"missions-data" }}