Skip to content

Commit

Permalink
Merge pull request #4086 from camptocamp/3_debug_ie
Browse files Browse the repository at this point in the history
Debug ie
  • Loading branch information
ger-benjamin committed Aug 2, 2018
2 parents 76e59f7 + bd379c2 commit f80c570
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 1 deletion.
1 change: 1 addition & 0 deletions contribs/gmf/apps/desktop/index.html.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@
ngeo-resizemap-state="profileChartActive">
</gmf-profile>
</footer>
<script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=es6"></script>
<script src="https://maps.googleapis.com/maps/api/js?v=3&key=AIzaSyCYnqxEQA5sz13sWSgMr97ejzvUeGP8gz4"></script>
<% for (var chunk in htmlWebpackPlugin.files.chunks) { %>
<script src="<%= htmlWebpackPlugin.files.chunks[chunk].entry %>"></script>
Expand Down
1 change: 1 addition & 0 deletions contribs/gmf/apps/desktop_alt/index.html.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,7 @@
ngeo-resizemap-state="queryGridActive">
</gmf-displayquerygrid>
</footer>
<script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=es6"></script>
<script src="https://maps.googleapis.com/maps/api/js?v=3&key=AIzaSyCYnqxEQA5sz13sWSgMr97ejzvUeGP8gz4"></script>
<% for (var chunk in htmlWebpackPlugin.files.chunks) { %>
<script src="<%= htmlWebpackPlugin.files.chunks[chunk].entry %>"></script>
Expand Down
1 change: 1 addition & 0 deletions contribs/gmf/apps/mobile/index.html.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@
</gmf-authentication>
</div>
</ngeo-modal>
<script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=es6"></script>
<% for (var chunk in htmlWebpackPlugin.files.chunks) { %>
<script src="<%= htmlWebpackPlugin.files.chunks[chunk].entry %>"></script>
<% } %>
Expand Down
1 change: 1 addition & 0 deletions contribs/gmf/apps/mobile_alt/index.html.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@
gmf-mobile-nav-back="authCtrl.gmfUser.username !== null">
</gmf-authentication>
</nav>
<script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=es6"></script>
<% for (var chunk in htmlWebpackPlugin.files.chunks) { %>
<script src="<%= htmlWebpackPlugin.files.chunks[chunk].entry %>"></script>
<% } %>
Expand Down
1 change: 1 addition & 0 deletions contribs/gmf/apps/oeedit/index.html.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@
ngeo-resizemap-state="profileChartActive">
</gmf-profile>
</footer>
<script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=es6"></script>
<% for (var chunk in htmlWebpackPlugin.files.chunks) { %>
<script src="<%= htmlWebpackPlugin.files.chunks[chunk].entry %>"></script>
<% } %>
Expand Down
1 change: 1 addition & 0 deletions contribs/gmf/src/query/grid.less
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
background-color: white;
height: @grid-height;
position: fixed;
width: 100%;

.ngeo-grid-table-container {
height: @table-height;
Expand Down
4 changes: 3 additions & 1 deletion contribs/gmf/src/search/search.less
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@ gmf-search {
z-index: @content-index;

& > * {
display: inline-block;
display: block;
float: left;
vertical-align: top;
}

.gmf-search {
margin-right: @half-app-margin;
background-color: @map-tools-bg-color;
height: @map-tools-size;
position: relative;
Expand Down

0 comments on commit f80c570

Please sign in to comment.