Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix style regressions #697

Merged
merged 1 commit into from
Jan 18, 2018
+62 −10
Merged

Fix style regressions #697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions web/css/jquery-ui-override.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* Default jquery-ui button
*/

a.ui-button.ui-state-default {
color: #eee;
font-weight: 700;
Expand All @@ -11,6 +12,7 @@ a.ui-button.ui-state-default {
background-image: -o-linear-gradient(#555, #666);
font-family: "Segoe UI", "Arial", sans-serif;
}

a.ui-button.ui-state-default.ui-state-hover {
border-color: #eee;
background-color: #eee;
Expand Down
2 changes: 0 additions & 2 deletions web/css/sidebar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@
}

#productsHolder footer .action {
font-family: 'Open Sans', sans-serif;
font-weight: 700;
display: inline-block;
border-color: transparent;
color: #fff;
Expand Down
58 changes: 55 additions & 3 deletions web/css/tour.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,17 @@
background-color: rgb(175, 181, 196);
}

.joyride-tip-guide p,
.joyride-tip-guide ul {
margin: 0 0 14px;
}

.joyride-tip-guide.bordered,
.joyride-bordered {
border: #808080 solid 1px;
}

.joyride-tip-guide.wide,
.joyride-wide {
width: 450px;
}
Expand Down Expand Up @@ -155,7 +162,6 @@ button.skipTour:hover {
.tour ul {
color: rgb(38, 43, 49);
font: 400 13px/16px 'Open Sans', sans-serif;
margin: 0 0 14px;
}

.joyride-content-wrapper {
Expand Down Expand Up @@ -323,6 +329,7 @@ button.done:hover {

.joyride-tip-guide .joyride-next-tip {
float: right;
margin-right: 0;
}

.joyride-tip-guide .joyride-next-tip:hover,
Expand Down Expand Up @@ -431,34 +438,79 @@ p.wv-tour-page-count {
pointer-events: none;
}

.joyride-tip-guide.bordered span.joyride-nub::after {
content: " ";
display: block;
position: absolute;
width: 0;
height: 0;
z-index: -1;
}

.joyride-tip-guide span.joyride-nub.top {
border-color: #afb5c4 !important;
border-top-color: transparent !important;
border-left-color: transparent !important;
border-right-color: transparent !important;
}

.joyride-tip-guide.toolbarTip span.joyride-nub.top {
left: 250px;
}

.joyride-tip-guide.bordered span.joyride-nub.top::after {
top: -16px;
left: -15px;
border: 15px solid #808080;
border-top-color: transparent;
border-left-color: transparent;
border-right-color: transparent;
}

.joyride-tip-guide span.joyride-nub.right {
border-color: #afb5c4 !important;
border-top-color: transparent !important;
border-right-color: transparent !important;
border-bottom-color: transparent !important;
}

.joyride-tip-guide.bordered span.joyride-nub.right::after {
top: -15px;
left: -14px;
border: 15px solid #808080;
border-top-color: transparent;
border-right-color: transparent;
border-bottom-color: transparent;
}

.joyride-tip-guide span.joyride-nub.bottom {
border-color: #afb5c4 !important;
border-bottom-color: transparent !important;
border-left-color: transparent !important;
border-right-color: transparent !important;
}

.joyride-tip-guide.bordered span.joyride-nub.bottom::after {
top: -14px;
left: -15px;
border: 15px solid #808080;
border-bottom-color: transparent;
border-left-color: transparent;
border-right-color: transparent;
}

.joyride-tip-guide span.joyride-nub.left {
border-color: #afb5c4 !important;
border-top-color: transparent !important;
border-left-color: transparent !important;
border-bottom-color: transparent !important;
}

.joyride-tip-guide.toolbarTip span.joyride-nub.top {
left: 250px;
.joyride-tip-guide.bordered span.joyride-nub.left::after {
top: -15px;
left: -16px;
border: 15px solid #808080;
border-top-color: transparent;
border-left-color: transparent;
border-bottom-color: transparent;
}
2 changes: 1 addition & 1 deletion web/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<!-- meta defines -->
<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, minimal-ui">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="keywords" content="nasa, worldview, nasa worldview, eosdis worldview, satellite imagery, remote sensing, natural hazards, natural disasters, near real-time, nrt, lance, wildfire management, air quality, weather forecasting, agriculture, dust storms, smoke plumes, vegetation, severe storms, shipping, fisheries, floods, drought, oil spills">
<meta name="description" content="Interactive interface for browsing full-resolution, global, near real-time satellite imagery. Supports time-critical application areas such as wildfire management, air quality measurements, and weather forecasting. Data is generally available within three hours of observation.">
Expand Down
8 changes: 4 additions & 4 deletions web/pages/tour.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ <h3>Timeline</h3>
</td>
</tr>
</table>
<br/>
<br>
<p>
<span class="tryIt">Try It!</span></p>
<ul>
Expand Down Expand Up @@ -145,7 +145,7 @@ <h3>Timeline - Continued</h3>
</td>
</tr>
</table>
<br/>
<br>
<p>
<span class="tryIt">Try It!</span></p>
<ul>
Expand Down Expand Up @@ -315,12 +315,12 @@ <h3>Toolbar</h3>
You have now completed a tour of @NAME@! If you followed the “Try It” steps, you’re now looking at fires in northern California as they were observed by satellites on August 23, 2012. You can use the tools in any order. We hope you continue
exploring!
</p>
<br/>
<br>
<p class="splashwelcome">
<a class="feedback">Contact us</a>
if you have any questions about @NAME@.
</p>
<br/>
<br>
<table class="tour">
<tr>
<td rowspan="2" colspan="2">
Expand Down