Merge pull request #334 from nightscout/wip/iphone6-portrait

adjust breakpoint to better support display on iphone6+ in portrait mode
nightscout · Feb 7, 2015 · 9637bdf · 9637bdf
2 parents f3cb0f0 + e442ecf
commit 9637bdf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 22 deletions.
diff --git a/static/css/main.css b/static/css/main.css
@@ -161,7 +161,6 @@ body {
     cursor: default;
     font-size: 75%;
     margin-top: 15px;
-    margin-right: 37px;
     width: auto;
 
     user-select: none;
@@ -246,9 +245,6 @@ div.tooltip {
     width: 50%;
   }
 
-  #bgButton {
-    font-size: 120%;
-  }
   .dropdown-menu {
     font-size: 60% !important;
   }
@@ -257,10 +253,7 @@ div.tooltip {
   }
 }
 
-@media (max-width: 700px) {
-  #bgButton {
-    font-size: 120%;
-  }
+@media (max-width: 750px) {
   .dropdown-menu {
     font-size: 60% !important;
   }
@@ -284,10 +277,6 @@ div.tooltip {
         font-size: 70%;
     }
 
-    #notification {
-        margin-top: 148px;
-    }
-
     .status {
         text-align: center;
         margin-bottom: 0;
@@ -307,10 +296,7 @@ div.tooltip {
         width: 100vw;
     }
     #bgButton {
-        font-size: 120%;
-        height: 142px;
-        margin-top: 1vw;
-        width: 98vw;
+        font-size: 100%;
     }
     .dropdown-menu {
         font-size: 60% !important;
@@ -365,10 +351,6 @@ div.tooltip {
         padding-bottom: 20px;
     }
 
-    #bgButton {
-        font-size: 70% !important;
-    }
-
     #currentTime {
         font-size: 85%;
     }

diff --git a/static/js/client.js b/static/js/client.js
@@ -17,7 +17,7 @@ var app = {}, browserSettings = {}, browserStorage = $.localStorage;
         , FORMAT_TIME_12 = '%I:%M'
         , FORMAT_TIME_24 = '%H:%M%'
         , FORMAT_TIME_SCALE = '%I %p'
-        , WIDTH_TIME_HIDDEN = 500
+        , WIDTH_TIME_HIDDEN = 400
         , WIDTH_SMALL_DOTS = WIDTH_TIME_HIDDEN
         , WIDTH_BIG_DOTS = 800
         , MINUTES_SINCE_LAST_UPDATE_WARN = 10
@@ -982,7 +982,7 @@ var app = {}, browserSettings = {}, browserStorage = $.localStorage;
         if (querystring.mute != 'true') {
             audio.play();
         } else {
-            showNotification('Alarm is muted per your request. (?mute=true)');
+            showNotification('Alarm was muted (?mute=true)');
         }
     }