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

Jump to bottom

Add gap between side by side divs on rivalDetails #611

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add gap between side by side divs on rivalDetails #611

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
48 changes: 24 additions & 24 deletions airline-web/app/views/index.scala.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
<link rel="stylesheet" type="text/css" href='@routes.Assets.versioned("stylesheets/mobile.css")'> <!-- this has to be last so it overrides the CSS if mobile-->



<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.4/angular.min.js" defer></script>
<script src="https://code.jquery.com/jquery-2.2.4.min.js"
integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44="
crossorigin="anonymous"></script>

<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.min.js"
integrity="sha256-VazP97ZCwtekAsvgPBSUwPFKdrwD3unUfSGVYrahUqU="
crossorigin="anonymous"></script>
Expand All @@ -57,10 +57,10 @@
<script type="text/javascript" src='@routes.Assets.versioned("fusioncharts/themes/fusioncharts.theme.zune.js")' defer></script>
<script type="text/javascript" src='@routes.Assets.versioned("fusioncharts/fusioncharts-jquery-plugin.js")' defer></script>
<script src='@routes.Assets.versioned("javascripts/plot-fusioncharts.js")' defer></script>

<script type="text/javascript" src='@routes.Assets.versioned("progress-bar/progress-bar.js")' defer></script>
<link rel="stylesheet" href='@routes.Assets.versioned("progress-bar/progress-bar.css")' type="text/css" />

<script type="text/javascript" src='@routes.Assets.versioned("jquery-upload-file/jquery.uploadfile.min.js")' defer></script>
<link rel="stylesheet" href='@routes.Assets.versioned("jquery-upload-file/uploadfile.css")' type="text/css" />
<script src='@routes.Assets.versioned("javascripts/lazysizes/lazysizes.min.js")' async></script>
Expand Down Expand Up @@ -2741,7 +2741,7 @@ <h4>Active Oil Contracts</h4>
</div>

<div id="rivalDetails" class="sidePanel" style="float: left; display: none;">
<div class="section" style="width: 95%; display: flex; flex-wrap: wrap;">
<div class="section" style="width: 95%; display: flex; flex-wrap: wrap; gap: 5px;">
<div style="min-width: 200px; flex: 1;">
<h4><span class="airlineName"></span></h4>

Expand Down Expand Up @@ -2833,7 +2833,7 @@ <h4>Fleet</h4>
</div>
</div>
</div>
<div class="section" style="width: 95%; display: flex; flex-wrap: wrap;">
<div class="section" style="width: 95%; display: flex; flex-wrap: wrap; gap: 5px;">
<div style="min-width: 200px; flex: 1;">
<h4>Airline Headquarters</h4>
<div style="position: relative; height: 150px; width: 100%" class="headquartersMap"></div>
Expand All @@ -2846,7 +2846,7 @@ <h4>Airline Bases</h4>
</div>
</div>

<div class="section" style="width: 95%; display: flex; flex-wrap: wrap;">
<div class="section" style="width: 95%; display: flex; flex-wrap: wrap; gap: 5px;">
<div style="min-width: 200px; flex: 1;">
<h4>National Airline of</h4>
<div class="table data nationalAirlineCountryList" style="width: 100%;">
Expand Down Expand Up @@ -3576,7 +3576,7 @@ <h4>Existing Flights</h4>
</div> <!-- end container for main canvas and the landing blur -->
<div style="clear: both;"></div>
</div>

<!-- popups and overlay buttons below. Hidden by default -->
<div style="display: none; width: 100%; white-space: normal;" id="airportPopup" class="mapPopup">
<input type="hidden" id="airportPopupId">
Expand Down Expand Up @@ -3695,7 +3695,7 @@ <h4>Overall Satisfaction :&nbsp;<span class="satisfactionValue"></span></h4>
</div>
<div id="cityPie" style="height: 70px;"></div>
</div>

<div style="display: none; width: 350px;" id="linkHistoryPopup" class="mapPopup">
<input type="hidden" id="linkHistoryPopupId">
<div class="table" style="width: 100%">
Expand All @@ -3721,7 +3721,7 @@ <h4>Overall Satisfaction :&nbsp;<span class="satisfactionValue"></span></h4>
</div>
</div>
</div>

<div style="display: none; width: 350px;" id="airportLinkPopup" class="mapPopup">
<input type="hidden" id="airportLinkPopupId">
<div class="table" style="width: 100%">
Expand Down Expand Up @@ -3753,7 +3753,7 @@ <h4><div class="airportName"></div></h4>
</div>



<div style="display: none; width: 100%;" id="linkPopup" class="mapPopup">
<input type="hidden" id="airportLinkPopupId">
<div class="table" style="width: 100%">
Expand Down Expand Up @@ -3800,7 +3800,7 @@ <h4><div class="airportName"></div></h4>
</div>
</div>
</div>

<!-- The Annoucement Modal -->
<div id="announcementModal" class="modal">
<div class="modal-content" style="width: 500px;">
Expand Down Expand Up @@ -3839,9 +3839,9 @@ <h3 class="question" style="margin-bottom: 10px;"></h3>
</div>
</div>
</div>

<!-- Logo Modal -->

<div id="logoModal" class="modal">
<div class="modal-content" style="width : 400px;">
<span class="close" onclick="closeModal($('#logoModal'))">&times;</span>
Expand All @@ -3858,12 +3858,12 @@ <h4>Logo Templates</h4>
<h4>Preview</h4>
<div id="logoPreview" style="height: 30px">
</div>

<div class="button confirmationButton" onclick="closeModal($('#logoModal')); setAirlineLogo();">Confirm</div>
<div class="button" onclick="closeModal($('#logoModal'))">Cancel</div>
</div>
</div>

<div id="uploadLogoModal" class="modal">
<div class="modal-content" style="width : 400px;">
<span class="close" onclick="closeModal($('#uploadLogoModal'))">&times;</span>
Expand Down Expand Up @@ -3899,7 +3899,7 @@ <h4>Upload Airline Livery</h4>
</div>
</div>
</div>

<!-- airport facility modal -->
<div id="facilityModal" class="modal facility">
<div class="modal-content" style="width : 400px;">
Expand All @@ -3914,9 +3914,9 @@ <h6 class="facilityDescription"></h6>
</div>
<div class="table-row facitilyNameWarningDiv" style="display: none;">
<div class="warning"></div>

</div>

<div class="table-row">
<div class="label" style="width: 50%"><h5>Level:</h5></div>
<div class="value facilityLevel" style="width: 50%"></div>
Expand Down Expand Up @@ -4060,7 +4060,7 @@ <h4> Please pick your reward as below, you can always come back later to make yo
</div>
</div>
</div>

<!-- airport passenger quality expectation model -->
<div id="expectedQualityModal" class="modal">
<div class="modal-content" style="width : 500px;">
Expand Down Expand Up @@ -4091,10 +4091,10 @@ <h4 style="margin-bottom: 10px;">Flight Quality Expectation</h4>
<li class="label" style="padding: 5px;">- Service level per route</li>
<li class="label" style="padding: 5px;">- Company wide level Service Quality (by Service Funding in Office View)</li>
</ul>

</div>
</div>

<!-- link passenger composition modal -->
<div id="linkCompositionModal" class="modal">
<div class="modal-content" style="width : 800px">
Expand Down Expand Up @@ -5495,7 +5495,7 @@ <h4>Airlines by UUID&nbsp;<span class="uuid"></span></h4>

<!-- Modal for loading -->
<div class="loadingSpinner"><!-- Place at bottom of page --></div>

<audio id="christmasMusic" preload="none" loop>
<!-- <source src='@routes.Assets.versioned("music/silent-night.mp3")' type="audio/mp3" />-->
<source src='@routes.Assets.versioned("music/joy-to-the-world.mp3")' type="audio/mp3" />
Expand All @@ -5510,6 +5510,6 @@ <h4>Airlines by UUID&nbsp;<span class="uuid"></span></h4>
<script src='/assets/firework/stage.js'></script>
<script src='/assets/firework/my-math.js'></script>
<script src="/assets/firework/firework.js"></script>

</body>
</html>