Skip to content

Commit

Permalink
Merge pull request #14 from midas-isg/legend-color
Browse files Browse the repository at this point in the history
Legend color
  • Loading branch information
TerenceSperringerJr authored Jul 25, 2018
2 parents 5161878 + 5eb6935 commit 2a3f36e
Show file tree
Hide file tree
Showing 6 changed files with 174 additions and 45 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>edu.pitt.isg</groupId>
<artifactId>spewmap</artifactId>
<version>0.4.7</version>
<version>0.4.8</version>
<packaging>jar</packaging>

<name>spewmap</name>
Expand Down
58 changes: 36 additions & 22 deletions src/main/resources/static/css/tile.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
:root {
--dark-background: rgba(0, 0, 0, 0.75);
--light-background: whitesmoke;
--light-font: whitesmoke;
--warning-color: #f25934;
}


.mapboxgl-ctrl-group > button {
width: 36px;
Expand All @@ -11,13 +18,14 @@
}

.mapboxgl-popup-content {
background-color: #000000c0;
background-color: var(--dark-background);
color: inherit;
border-radius: inherit;
padding-top: 2px;
padding-right: 0px;
padding-left: 0px;
padding-bottom: 1px;
width: 100%;
}

.mapboxgl-popup-anchor-bottom .mapboxgl-popup-tip,
Expand All @@ -26,19 +34,19 @@
.mapboxgl-popup-anchor-top-right .mapboxgl-popup-tip,
.mapboxgl-popup-anchor-bottom-left .mapboxgl-popup-tip,
.mapboxgl-popup-anchor-bottom-right .mapboxgl-popup-tip {
border-top-color: #000000c0;
border-bottom-color: #000000c0;
border-top-color: var(--dark-background);
border-bottom-color: var(--dark-background);
}

.mapboxgl-popup-anchor-left .mapboxgl-popup-tip,
.mapboxgl-popup-anchor-right .mapboxgl-popup-tip {
border-left-color: #000000c0;
border-right-color: #000000c0;
border-left-color: var(--dark-background);
border-right-color: var(--dark-background);
}

.mapboxgl-popup-close-button,
.mapboxgl-popup-close-button:hover {
background-color: #f25934;
background-color: var(--warning-color);
color: inherit;
width: 23px;
height: 23px;
Expand All @@ -48,23 +56,23 @@ body {
margin:0;
padding:0;
font-family: 'Open Sans', sans-serif;
color: whitesmoke;
background-color: #000000c0;
color: var(--light-font);
background-color: var(--dark-background);
border-radius: 5px;
}

.active-tab-button {
font-weight: bold;
color: black;
background-color: whitesmoke;
background-color: var(--light-background);
}

.active-tab-button,
.tab-button {
border-top-left-radius: 5px;
border-top-right-radius: 5px;
border-style: solid;
border-color: whitesmoke;
border-color: var(--light-font);
display: inline-block;
padding-left: 2px;
padding-right: 2px;
Expand Down Expand Up @@ -101,7 +109,9 @@ body {

.legend {
border-radius: inherit;
padding: 0px;
padding-top: 2px;
padding-left: 2px;
padding-right: 2px;
transform: translate(0%, 0%);
}

Expand All @@ -114,8 +124,12 @@ body {
min-width: 20px;
}

.legend-title {
/**/
}

.zoom-note {
background-color: #f25934;
background-color: var(--warning-color);
color: inherit;
border-radius: 15px;
position: absolute;
Expand All @@ -124,12 +138,12 @@ body {
}

.zoom-note-button-active {
background-color: whitesmoke;
background-color: var(--light-background);
}

.zoom-note-button-inactive {
border-color: #f25934;
color: #f25934;
border-color: var(--warning-color);
color: var(--warning-color);
background-color: #ffffff;
}

Expand All @@ -156,7 +170,7 @@ body {
#features-close-button {
border-radius: inherit;
color: inherit;
background-color: #f25934;
background-color: var(--warning-color);
border-style: solid;
width: 36px;
height: 36px;
Expand Down Expand Up @@ -223,19 +237,19 @@ body {
}

#menu a:hover {
background-color: #00000060;
color: whitesmoke;
background-color: rgba(0, 0, 0, 0.38);
color: var(--light-font);
}

#menu a.active:hover,
#menu a.active {
background-color: #000000c0;
color: whitesmoke;
background-color: var(--dark-background);
color: var(--light-font);
}

#menu-button {
border-radius: inherit;
background-color: whitesmoke;
background-color: var(--light-background);
border-style: solid;
width: 36px;
height: 36px;
Expand All @@ -244,7 +258,7 @@ body {
}

#menu-panel {
background-color: whitesmoke;
background-color: var(--light-background);
color: black;
border-radius: inherit;
display: inline-block;
Expand Down
54 changes: 54 additions & 0 deletions src/main/resources/static/js/site-analytics.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
//globals
var GOOGLE_ANALYTICS_TRACKING_ID = 'UA-122846038-1',
ANALYTICS_TRACKER = 'SPEWMap',
ga;

(function(){
/* --Google Site Tag-- */
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());

gtag('config', GOOGLE_ANALYTICS_TRACKING_ID);
/* --Google Site Tag-- */

/* -- Google Analytics -- */
ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
ga('create', GOOGLE_ANALYTICS_TRACKING_ID, 'auto', ANALYTICS_TRACKER);

//This is called when tracker is created, so it's redundant to include
//ga(ANALYTICS_TRACKER + '.send', 'pageview');

/*
//typical send 'hit' usage
//Note: values specified in ...fields and fieldsObject are sent with the current hit,
//but they are not stored on the tracker object. Use the set method to update a tracker.
ga('[trackerName.]send', [hitType], [...fields], [fieldsObject]);
[hitType] {...fields}
pageview {page}
event {eventCategory, eventAction, eventLabel, eventValue}
social {socialNetwork, socialAction, socialTarget}
timing {timingCategory, timingVar, timingValue, timingLabel}
//Sends a pageview hit.
ga('send', 'pageview');
//Sends an event hit for the tracker named "myTracker" with the following category,
//action, and label, and sets the nonInteraction field value to true.
ga('send', 'event', 'link', 'click', 'http://example.com', {
nonInteraction: true
});
//typical set field usage
// Sets a single field and value.
ga('[trackerName.]set', fieldName, fieldValue);
// Sets a group of field/value pairs.
ga('[trackerName.]set', fieldsObject);
*/

/* -- Google Analytics -- */

return;
})();
2 changes: 1 addition & 1 deletion src/main/resources/static/js/spew-format.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ var SPEW_FORMAT = {
"ages": "AGE",
"puma": "puma_id",
"year": "YEAR",
"races": "RACID",
"races": "RAC1P",
"sexes": "SEX",
"grades": "SCHG",
"hid": "SYNTHETIC_HID",
Expand Down
Loading

0 comments on commit 2a3f36e

Please sign in to comment.