Skip to content

Commit

Permalink
Fixed most of Xetthecum phase II viz by backporting various pieces of…
Browse files Browse the repository at this point in the history
… CSS drift
  • Loading branch information
amb26 committed Sep 13, 2024
1 parent 5d5d3bb commit cdf9dc6
Show file tree
Hide file tree
Showing 7 changed files with 155 additions and 4 deletions.
1 change: 1 addition & 0 deletions docs/Xetthecum.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css" />
<link rel="stylesheet" type="text/css" href="css/imerss-viz-all.css" />
<link rel="stylesheet" type="text/css" href="css/xetthecum-core.css"/>
<link rel="stylesheet" type="text/css" href="css/xetthecum.css" />
<script src="js/jquery.js"></script>
<script src="https://unpkg.com/[email protected]/dist/leaflet.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion docs/css/xetthecum-core.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/** New-age file for Phase III, referenced from xetthecum-storymap **/
/** File for Phase II and III, referenced externally from from xetthecum-storymap as well as internally **/

.imerss-cultural-values {
display: flex;
Expand Down
76 changes: 75 additions & 1 deletion docs/css/xetthecum.css
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,75 @@ body {
}


.imerss-class-image-shoreline {
background-image: url(../img/Xetthecum/Intertidal.jpg);
}

.imerss-class-image-subtidal {
background-image: url(../img/Xetthecum/Subtidal.jpg);
}

.imerss-class-image-pole-sapling {
background-image: url(../img/Xetthecum/Conifer_Pole_Sapling.jpg);
}

.imerss-class-image-mature-forest {
background-image: url(../img/Xetthecum/Mature_Conifer_Forest.jpg);
}

.imerss-class-image-young-forest {
background-image: url(../img/Xetthecum/Young_Conifer_Forest.jpg);
}

.imerss-class-image-wetland {
background-image: url(../img/Xetthecum/Wetland.jpg);
}

.imerss-class-image-laughlin-lake {
background-image: url(../img/Xetthecum/Laughlin_Lake.jpg);
}

.imerss-class-image-greig-creek {
background-image: url(../img/Xetthecum/Greig_Creek.jpg);
}

.imerss-class-image-riparian {
background-image: url(../img/Xetthecum/Riparian.jpg);
}

.imerss-class-image-coastal-bluff {
background-image: url(../img/Xetthecum/Coastal_Bluffs.jpg);
}

.imerss-class-image-woodland {
background-image: url(../img/Xetthecum/Woodland.jpg);
}

.imerss-class-image-agricultural {
background-image: url(../img/Xetthecum/Agricultural.jpg);
}

.imerss-class-image-developed {
background-image: url(../img/Xetthecum/Developed.jpg);
}

.imerss-class-image-rural {
background-image: url(../img/Xetthecum/Rural.jpg);
}

.imerss-class-image-road {
background-image: url(../img/Xetthecum/Porlier_Pass_Road.jpg);
}

.imerss-class-image-dock {
background-image: url(../img/Xetthecum/Dock.jpg);
}

.imerss-class-image-eelgrass-beds {
background-image: url(../img/Xetthecum/Eelgrass.jpg);
}


.imerss-container {
margin: 1.5rem 0.5rem 0.5rem 0.5rem;
flex-direction: row;
Expand Down Expand Up @@ -229,7 +298,8 @@ body {
font-size: 0.9rem;
width: 8rem;
position: relative;
top: -2px;
top: 3px;
margin-left: 2px;
}

.imerss-map {
Expand Down Expand Up @@ -360,10 +430,14 @@ body {
}
*/

/** These margins eat into the ones for imerss-map-outer-panel - we also have a width: 100% definition in core which we
now need to override
*/
.imerss-map-outer-panel .imerss-photo {
margin-left: -1rem;
margin-right: -1rem;
margin-bottom: 1rem;
width: auto;
}

.imerss-taxonDisplay-wrapper {
Expand Down
1 change: 1 addition & 0 deletions indexWithMapXetthecum.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@

<link rel="stylesheet" type="text/css" href="src/client/css/imerss-core.css"/>
<link rel="stylesheet" type="text/css" href="src/client/css/imerss-viz.css"/>
<link rel="stylesheet" type="text/css" href="src/client/css/xetthecum-core.css"/>
<link rel="stylesheet" type="text/css" href="src/client/css/xetthecum.css"/>

<script src="src/client/js/colour.js"></script>
Expand Down
1 change: 1 addition & 0 deletions src/buildSource/Xetthecum.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css" />
<link rel="stylesheet" type="text/css" href="css/imerss-viz-all.css" />
<link rel="stylesheet" type="text/css" href="css/xetthecum-core.css"/>
<link rel="stylesheet" type="text/css" href="css/xetthecum.css" />
<script src="js/jquery.js"></script>
<script src="https://unpkg.com/[email protected]/dist/leaflet.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion src/client/css/xetthecum-core.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/** New-age file for Phase III, referenced from xetthecum-storymap **/
/** File for Phase II and III, referenced externally from from xetthecum-storymap as well as internally **/

.imerss-cultural-values {
display: flex;
Expand Down
76 changes: 75 additions & 1 deletion src/client/css/xetthecum.css
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,75 @@ body {
}


.imerss-class-image-shoreline {
background-image: url(../img/Xetthecum/Intertidal.jpg);
}

.imerss-class-image-subtidal {
background-image: url(../img/Xetthecum/Subtidal.jpg);
}

.imerss-class-image-pole-sapling {
background-image: url(../img/Xetthecum/Conifer_Pole_Sapling.jpg);
}

.imerss-class-image-mature-forest {
background-image: url(../img/Xetthecum/Mature_Conifer_Forest.jpg);
}

.imerss-class-image-young-forest {
background-image: url(../img/Xetthecum/Young_Conifer_Forest.jpg);
}

.imerss-class-image-wetland {
background-image: url(../img/Xetthecum/Wetland.jpg);
}

.imerss-class-image-laughlin-lake {
background-image: url(../img/Xetthecum/Laughlin_Lake.jpg);
}

.imerss-class-image-greig-creek {
background-image: url(../img/Xetthecum/Greig_Creek.jpg);
}

.imerss-class-image-riparian {
background-image: url(../img/Xetthecum/Riparian.jpg);
}

.imerss-class-image-coastal-bluff {
background-image: url(../img/Xetthecum/Coastal_Bluffs.jpg);
}

.imerss-class-image-woodland {
background-image: url(../img/Xetthecum/Woodland.jpg);
}

.imerss-class-image-agricultural {
background-image: url(../img/Xetthecum/Agricultural.jpg);
}

.imerss-class-image-developed {
background-image: url(../img/Xetthecum/Developed.jpg);
}

.imerss-class-image-rural {
background-image: url(../img/Xetthecum/Rural.jpg);
}

.imerss-class-image-road {
background-image: url(../img/Xetthecum/Porlier_Pass_Road.jpg);
}

.imerss-class-image-dock {
background-image: url(../img/Xetthecum/Dock.jpg);
}

.imerss-class-image-eelgrass-beds {
background-image: url(../img/Xetthecum/Eelgrass.jpg);
}


.imerss-container {
margin: 1.5rem 0.5rem 0.5rem 0.5rem;
flex-direction: row;
Expand Down Expand Up @@ -229,7 +298,8 @@ body {
font-size: 0.9rem;
width: 8rem;
position: relative;
top: -2px;
top: 3px;
margin-left: 2px;
}

.imerss-map {
Expand Down Expand Up @@ -360,10 +430,14 @@ body {
}
*/

/** These margins eat into the ones for imerss-map-outer-panel - we also have a width: 100% definition in core which we
now need to override
*/
.imerss-map-outer-panel .imerss-photo {
margin-left: -1rem;
margin-right: -1rem;
margin-bottom: 1rem;
width: auto;
}

.imerss-taxonDisplay-wrapper {
Expand Down

0 comments on commit cdf9dc6

Please sign in to comment.