Skip to content

Commit

Permalink
Use consistent color for tooltip icons
Browse files Browse the repository at this point in the history
The previously used .black class was not specified anywhere,
instead other targeting was used for the coloring of the icons,
which was not consistently applied everywhere.

By adding a utility class of .black-74 and using that, we
ensure that all tooltip info icons have the same color.
  • Loading branch information
rajadain committed May 18, 2020
1 parent 2996cee commit 4330e28
Show file tree
Hide file tree
Showing 14 changed files with 25 additions and 21 deletions.
2 changes: 1 addition & 1 deletion src/mmw/js/src/analyze/templates/analyzeDescription.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
data-template="<div class='popover'><div class='pull-right'
id='popover-close-button'><i class='fa fa-times' /></div><div
class='popover-content'></div><div class='arrow'></div></div>">
<i class="fa fa-info-circle black"></i>
<i class="fa fa-info-circle black-74"></i>
</a>
{% endif %}
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion src/mmw/js/src/analyze/templates/streamLengthPopover.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
data-template="<div class='popover'><div class='pull-right'
id='popover-close-button'><i class='fa fa-times' /></div><div
class='popover-content'></div><div class='arrow'></div></div>">
<i class="fa fa-info-circle black"></i>
<i class="fa fa-info-circle black-74"></i>
</a>
2 changes: 1 addition & 1 deletion src/mmw/js/src/analyze/templates/streamTableRow.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
data-template="<div class='popover'><div class='pull-right'
id='popover-close-button'><i class='fa fa-times' /></div><div
class='popover-content'></div><div class='arrow'></div></div>">
<i class="fa fa-info-circle black"></i>
<i class="fa fa-info-circle black-74"></i>
</a>
{% endif %}
</td>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ <h2>
data-html="true" data-container="body" role="button"
data-content="The Community Inventory of EarthCube Resources for Geosciences Interoperability (CINERGI) Data Portal is a catalog of databases, services and data portals developed by numerous organizations representing a diversity of geoscience domains. Explore CINERGI at <a href='http://cinergi.sdsc.edu/' target='_blank' rel='noreferrer noopener'>http://cinergi.sdsc.edu/</a>"
data-template="<div class='popover'><div class='pull-right' id='popover-close-button' onclick='closePopover()'><i class='fa fa-times' /></div><div class='popover-content'></div><div class='arrow'></div></div>">
<i class="fa fa-info-circle black"></i>
<i class="fa fa-info-circle black-74"></i>
</a>
</td>
</tr>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ <h2>
data-html="true" data-container="body" role="button"
data-content="{{ description }}"
data-template="<div class='popover'><div class='pull-right' id='popover-close-button' onclick='closePopover()'><i class='fa fa-times' /></div><div class='popover-content'></div><div class='arrow'></div></div>">
<i class="fa fa-info-circle black"></i>
<i class="fa fa-info-circle black-74"></i>
</a>
</td>
</tr>
Expand Down Expand Up @@ -50,7 +50,7 @@ <h2>
data-html="true" data-container="body" role="button"
data-content="The Consortium of Universities for the Advancement of Hydrologic Science, Inc. (CUAHSI) Water Data Center (WDC) provides tools for data access, analysis and collaboration, including a Catalog of hydrological time series data available as Water One Flow (WOF) and WaterML web services. See <a href='https://www.cuahsi.org/data-models/discovery-and-analysis/' target='_blank' rel='noreferrer noopener'>https://www.cuahsi.org/data-models/discovery-and-analysis/</a>"
data-template="<div class='popover'><div class='pull-right' id='popover-close-button' onclick='closePopover()'><i class='fa fa-times' /></div><div class='popover-content'></div><div class='arrow'></div></div>">
<i class="fa fa-info-circle black"></i>
<i class="fa fa-info-circle black-74"></i>
</a>
</td>
</tr>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<p><strong>Speciation:</strong> {{ speciation }}</p>
{% endif %}
<p><strong>Medium:</strong> {{ sample_medium }}</p>">
<i class="fa fa-info-circle black"></i>
<i class="fa fa-info-circle black-74"></i>
</a>
{% endif %}
{% if error %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ <h2>
data-html="true" data-container="body" role="button"
data-content="The fundamental unit of digital content in HydroShare is a <strong>Resource</strong>. For more information see <a href='https://help.hydroshare.org/hydroshare-resource-types/' target='_blank' rel='noreferrer noopener'>https://help.hydroshare.org/hydroshare-resource-types/</a>"
data-template="<div class='popover'><div class='pull-right' id='popover-close-button' onclick='closePopover()'><i class='fa fa-times' /></div><div class='popover-content'></div><div class='arrow'></div></div>">
<i class="fa fa-info-circle black"></i>
<i class="fa fa-info-circle black-74"></i>
</a>
</td>
</tr>
Expand All @@ -51,7 +51,7 @@ <h2>
data-html="true" data-container="body" role="button"
data-content="HydroShare is an online collaborative environment for sharing hydrologic data and models. Its goal is to facilitate creation, collaboration around, discovery and access to data and model resources shared by members of the Hydrology community. See <a href='https://www.hydroshare.org/' target='_blank' rel='noreferrer noopener'>https://www.hydroshare.org/</a>"
data-template="<div class='popover'><div class='pull-right' id='popover-close-button' onclick='closePopover()'><i class='fa fa-times' /></div><div class='popover-content'></div><div class='arrow'></div></div>">
<i class="fa fa-info-circle black"></i>
<i class="fa fa-info-circle black-74"></i>
</a>
</td>
</tr>
Expand Down
10 changes: 5 additions & 5 deletions src/mmw/js/src/data_catalog/templates/resultDetailsUSGSWQP.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h2>
data-html="true" data-container="body" role="button"
data-content="<a href='https://www.waterqualitydata.us/provider/{{ provider_name }}/{{ service_org }}/' target='_blank'>{{ service_orgname }} ({{ service_org }})</a>"
data-template="<div class='popover'><div class='pull-right' id='popover-close-button' onclick='closePopover()'><i class='fa fa-times' /></div><div class='popover-content'></div><div class='arrow'></div></div>">
<i class="fa fa-info-circle black"></i>
<i class="fa fa-info-circle black-74"></i>
</a>
</td>
</tr>
Expand All @@ -41,7 +41,7 @@ <h2>
{# data-html="true" data-container="body" role="button"#}
{# data-content="{{ description }}"#}
{# data-template="<div class='popover'><div class='pull-right' id='popover-close-button' onclick='closePopover()'><i class='fa fa-times' /></div><div class='popover-content'></div><div class='arrow'></div></div>">#}
{# <i class="fa fa-info-circle black"></i>#}
{# <i class="fa fa-info-circle black-74"></i>#}
{# </a>#}
{# </td>#}
{# </tr>#}
Expand Down Expand Up @@ -79,7 +79,7 @@ <h2>
data-html="true" data-container="body" role="button"
data-content="<a href='https://www.waterqualitydata.us/provider/{{ provider_name }}/' target='_blank'>{{ provider_name }}</a>"
data-template="<div class='popover'><div class='pull-right' id='popover-close-button' onclick='closePopover()'><i class='fa fa-times' /></div><div class='popover-content'></div><div class='arrow'></div></div>">
<i class="fa fa-info-circle black"></i>
<i class="fa fa-info-circle black-74"></i>
</a>
</td>
</tr>
Expand All @@ -94,7 +94,7 @@ <h2>
and the National Water Quality Monitoring Council (NWQMC).
It serves data collected by over 400 state, federal, tribal, and local agencies."
data-template="<div class='popover'><div class='pull-right' id='popover-close-button' onclick='closePopover()'><i class='fa fa-times' /></div><div class='popover-content'></div><div class='arrow'></div></div>">
<i class="fa fa-info-circle black"></i>
<i class="fa fa-info-circle black-74"></i>
</a>
</td>
</tr>
Expand All @@ -120,4 +120,4 @@ <h2>
{# <hr />#}
<h3>Citation</h3>
<p>{{ service_citation }}</p>
</div>
</div>
6 changes: 3 additions & 3 deletions src/mmw/js/src/draw/templates/splash.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ <h2>
data-html="true" data-container="body" role="button"
data-content="The Community Inventory of EarthCube Resources for Geosciences Interoperability (CINERGI) Data Portal is a catalog of databases, services and data portals developed by numerous organizations representing a diversity of geoscience domains. Explore CINERGI at <a href='http://cinergi.sdsc.edu/' target='_blank' rel='noreferrer noopener'>http://cinergi.sdsc.edu/</a>"
data-template="<div class='popover'><div class='pull-right' id='popover-close-button' onclick='closePopover()'><i class='fa fa-times' /></div><div class='popover-content'></div><div class='arrow'></div></div>">
<i class="fa fa-info-circle black"></i>
<i class="fa fa-info-circle black-74"></i>
</a>
</li>
<li>
Expand All @@ -46,7 +46,7 @@ <h2>
data-html="true" data-container="body" role="button"
data-content="HydroShare is an online collaborative environment for sharing hydrologic data and models. Its goal is to facilitate creation, collaboration around, discovery and access to data and model resources shared by members of the Hydrology community. See <a href='https://www.hydroshare.org/' target='_blank' rel='noreferrer noopener'>https://www.hydroshare.org/</a>"
data-template="<div class='popover'><div class='pull-right' id='popover-close-button' onclick='closePopover()'><i class='fa fa-times' /></div><div class='popover-content'></div><div class='arrow'></div></div>">
<i class="fa fa-info-circle black"></i>
<i class="fa fa-info-circle black-74"></i>
</a>
</li>
<li>
Expand All @@ -55,7 +55,7 @@ <h2>
data-html="true" data-container="body" role="button"
data-content="The Consortium of Universities for the Advancement of Hydrologic Science, Inc. (CUAHSI) Water Data Center (WDC) provides tools for data access, analysis and collaboration, including a Catalog of hydrological time series data available as Water One Flow (WOF) and WaterML web services. See <a href='https://www.hydroshare.org/' target='_blank' rel='noreferrer noopener'>https://www.cuahsi.org/data-models/discovery-and-analysis/</a>"
data-template="<div class='popover'><div class='pull-right' id='popover-close-button' onclick='closePopover()'><i class='fa fa-times' /></div><div class='popover-content'></div><div class='arrow'></div></div>">
<i class="fa fa-info-circle black"></i>
<i class="fa fa-info-circle black-74"></i>
</a>
</li>
</ol>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
data-container="body" role="button"
data-content="Stream lengths presented here are for NHDplus v2 medium resolution flow lines. To make GWLF-E bank erosion calculations similar to those of the high resolution flow lines available for PA, and soon to be available nationwide with the NHDplus HR release, we used a sediment erosion adjustment factor of 1.4."
data-template="<div class='popover'><div class='popover-content'></div><div class='arrow'></div></div>">
<i class="fa fa-info-circle black"></i>
<i class="fa fa-info-circle black-74"></i>
</a>
</p>
{% if showSubbasinModelingButton %}
Expand Down
2 changes: 1 addition & 1 deletion src/mmw/js/src/modeling/gwlfe/runoff/templates/result.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
data-container="body" role="button"
data-content="Stream lengths presented here are for NHDplus v2 medium resolution flow lines. To make GWLF-E bank erosion calculations similar to those of the high resolution flow lines available for PA, and soon to be available nationwide with the NHDplus HR release, we used a sediment erosion adjustment factor of 1.4."
data-template="<div class='popover'><div class='popover-content'></div><div class='arrow'></div></div>">
<i class="fa fa-info-circle black"></i>
<i class="fa fa-info-circle black-74"></i>
</a>
</p>
<div class="runoff-selector-region"></div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
data-template="<div class='popover'><div class='pull-right'
id='popover-close-button'><i class='fa fa-times' /></div><div
class='popover-content'></div><div class='arrow'></div></div>">
<i class="fa fa-info-circle black"></i>
<i class="fa fa-info-circle black-74"></i>
</a>
</div>
{% endif %}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ <h3>{{modelPackage.display_name}}
data-template="<div class='popover'><div class='pull-right'
id='popover-close-button'><i class='fa fa-times' /></div><div
class='popover-content'></div><div class='arrow'></div></div>">
<i class="fa fa-info-circle black"></i>
<i class="fa fa-info-circle black-74"></i>
</a>
</h3>
</div>
4 changes: 4 additions & 0 deletions src/mmw/sass/utils/_quick-classes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,7 @@
.ui-danger {
color: $ui-danger;
}

.black-74 {
color: $black-74;
}

0 comments on commit 4330e28

Please sign in to comment.