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.

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 mobile CSS #1531

Merged
merged 9 commits into from
Jul 30, 2018
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion web/src/store.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const redux = require('redux');
const reduxLogger = require('redux-logger').logger;
const reducer = require('./reducers');

const isProduction = window.location.href.indexOf('electricitymap') !== -1;
const isProduction = window.location.href.indexOf('electricitymap') !== -1;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed space


const store = isProduction ?
redux.createStore(
Expand Down
8 changes: 1 addition & 7 deletions web/src/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,6 @@ body {
flex-direction: row;
align-items: stretch;
position: relative;
overflow-y: auto;
flex: 1 1 auto;
}

Expand Down Expand Up @@ -430,10 +429,7 @@ body {
}

.mobile-info-tab, .left-panel-zone-details {
display: flex;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

required for mobile "about" tab to show correctly. Not sure why there was a column flex there.

line-height: 1.2rem;
flex-direction: column;
flex: 1;
overflow: hidden;
}

Expand Down Expand Up @@ -1173,8 +1169,7 @@ div.highscore-button:hover {
padding-top: 8px;
font-family: "Open Sans", sans-serif;
}
#tab.nomap #tab-content .list-item.map-button,
{
#tab.nomap #tab-content .list-item.map-button {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note: there was an extra comma that needed removal -_-

display: none;
}
#tab #tab-content .list-item.active {
Expand Down Expand Up @@ -1746,7 +1741,6 @@ div.highscore-button:hover {
}
.left-panel {
position: relative;
height: auto;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

core of the bugfix 2/2

}
.left-panel, #map-container {
width: 100%;
Expand Down
47 changes: 23 additions & 24 deletions web/views/pages/index.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ co2Sub = function(str) {
</a>
</span>
</p>
</div>
</div>
</div>


Expand All @@ -211,7 +211,7 @@ co2Sub = function(str) {
</div>
</div>
<div class="info-text">
<%- __('panel-initial-text.thisproject') %> <a href="https://github.com/tmrowco/electricitymap-contrib" target="_blank"><%- __('panel-initial-text.opensource') %></a> (<%- __('panel-initial-text.see') %> <a href="https://github.com/tmrowco/electricitymap-contrib#data-sources" target="_blank"><%- __('panel-initial-text.datasources') %></a>). <%- __('panel-initial-text.contribute', 'https://github.com/tmrowco/electricitymap#adding-a-new-country') %>.
<%- __('panel-initial-text.thisproject') %> <a href="https://github.com/tmrowco/electricitymap-contrib" target="_blank"><%- __('panel-initial-text.opensource') %></a> (<%- __('panel-initial-text.see') %> <a href="https://github.com/tmrowco/electricitymap-contrib#data-sources" target="_blank"><%- __('panel-initial-text.datasources') %></a>). <%- __('panel-initial-text.contribute', 'https://github.com/tmrowco/electricitymap#adding-a-new-country') %>.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

re-indented

<p>
<%- __('footer.foundbugs') %> <a href="https://github.com/tmrowco/electricitymap-contrib/issues/new" target="_blank"><%- __('footer.here') %></a>.<br />
</p>
Expand All @@ -224,33 +224,32 @@ co2Sub = function(str) {
</p>
</div>
<div class="social-buttons large-screen-hidden">
<p>
<!-- Facebook share -->
<div class="fb-share-button"
data-href="https://www.electricitymap.org/"
data-layout="button_count">
</div>
<!-- Twitter share -->
<a class="twitter-share-button"
data-url="https://www.electricitymap.org"
data-via="electricitymap"
data-lang="<%= locale %>">
<p>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just reindent

<!-- Facebook share -->
<div class="fb-share-button"
data-href="https://www.electricitymap.org/"
data-layout="button_count">
</div>
<!-- Twitter share -->
<a class="twitter-share-button"
data-url="https://www.electricitymap.org"
data-via="electricitymap"
data-lang="<%= locale %>">
</a>
<!-- Slack -->
<span class="slack-button">
<a href="https://slack.tmrow.co" target="_blank" class="slack-btn">
<span class="slack-ico"></span>
<span class="slack-text">Slack</span>
</a>
<!-- Slack -->
<span class="slack-button">
<a href="https://slack.tmrow.co" target="_blank" class="slack-btn">
<span class="slack-ico"></span>
<span class="slack-text">Slack</span>
</a>
</span>
</p>
</span>
</p>
</div>

<div class="mobile-faq-header">
<%- __('misc.faq') %>
</div>
<div class="mobile-faq">
<%- __('misc.faq') %>
</div>
<div class="mobile-faq"></div>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moved closing brace to upper line

</div>
<div class="left-panel-zone-details">

Expand Down