Skip to content

Commit

Permalink
Godmode things
Browse files Browse the repository at this point in the history
  • Loading branch information
Jackson Kearl committed Aug 29, 2016
1 parent 2f182c6 commit 55fa8e4
Show file tree
Hide file tree
Showing 5 changed files with 453 additions and 432 deletions.
1 change: 1 addition & 0 deletions config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<allow-navigation href="*" />
<preference name="orientation" value="portrait" />
<preference name="KeepRunning" value="true" />
<preference name="DisallowOverscroll" value="true" />
<access origin="*" />
<allow-intent href="http://*/*" />
<allow-intent href="https://*/*" />
Expand Down
16 changes: 15 additions & 1 deletion www/css/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,11 @@ footer {
bottom:0;
left:0;
right:0;
z-index: 1000;
}

.featherlight-content

.event {
border-radius:4px;
-webkit-border-radius:4px;
Expand Down Expand Up @@ -294,6 +297,17 @@ footer {
color:#999 !important;
}

html, body {
margin: 0;
padding: 0;
height: 100%;
overflow: hidden;
}

.featherlight-content ul {
margin-top: 50px;
}

.debug-charts {
width:100%;
padding-top:20px;
Expand All @@ -315,7 +329,7 @@ footer {


.ion-person-add {

}

#pause_info {
Expand Down
24 changes: 13 additions & 11 deletions www/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
<head>
<meta charset="utf-8" />
<meta name="format-detection" content="telephone=no" />
<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, target-densitydpi=device-dpi" />
<!-- <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, target-densitydpi=device-dpi" /> -->
<meta name="viewport" content="user-scalable=no, initial-scale=1, minimum-scale=1, width=device-width" />

<meta http-equiv="Content-Security-Policy"
content="default-src *;
script-src 'self' 'unsafe-inline' 'unsafe-eval'
Expand Down Expand Up @@ -64,7 +66,7 @@ <h1 class="title">RoundTable</h1>
<button class="button button-positive standard free startMeetingButton">Create New Meeting</button>
<button class="button button-positive explore hidden startMeetingButton">Inspect Badges</button>
</div>

</footer>
</div>
<div id="settings" class="page">
Expand Down Expand Up @@ -148,21 +150,21 @@ <h1 class="title">Meeting</h1>
<div class="clock-title">Meeting Duration</div>
<div class="clock" id="clock"></div>
</div>

<div id="pause_info" class="hidden show-when-paused">
<div id="meeting-pause-title">Meeting Paused</div>

<div id="break-countdown">
<span class="minutes"></span>:<span class="seconds"></span>
</div>

<button class="button button-block button-calm" id="add-5-button">+5:00</button>
<button class="button button-block button-calm" id="add-15-button">+15:00</button>

<button id="resume-bar" class="button button-energized hidden show-when-paused resume-button">Resume Meeting</button>

</div>

<div id="visualization" class="visualization-wrapper standard free hide-when-paused">
<div id="meeting-mediator" class="meeting-mediator"></div>
</div>
Expand All @@ -176,14 +178,14 @@ <h1 class="title">Meeting</h1>
-->
<div style="height:500px">
</div>

<ul id="devicelist-add-rem" class="devicelist"></ul>


<div class="standard free">
<div id="debug-charts" class="debug-charts"></div>
</div>

<div class="explore hidden">
<div id="debug-charts" class="debug-charts explore-chart-container" style="overflow:scroll;"></div>
</div>
Expand Down
Loading

2 comments on commit 55fa8e4

@JacksonKearl
Copy link
Contributor

Choose a reason for hiding this comment

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

sorry about the version control

@maddalihanumateja
Copy link

@maddalihanumateja maddalihanumateja commented on 55fa8e4 Aug 29, 2016 via email

Choose a reason for hiding this comment

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

Please sign in to comment.