Skip to content

Commit

Permalink
simplified css media queries; improved alarm display in portrait mode
Browse files Browse the repository at this point in the history
  • Loading branch information
jasoncalabrese committed Feb 7, 2015
1 parent 1a4e531 commit e442ecf
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 21 deletions.
20 changes: 1 addition & 19 deletions static/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ body {
cursor: default;
font-size: 75%;
margin-top: 15px;
margin-right: 37px;
width: auto;

user-select: none;
Expand Down Expand Up @@ -246,9 +245,6 @@ div.tooltip {
width: 50%;
}

#bgButton {
font-size: 120%;
}
.dropdown-menu {
font-size: 60% !important;
}
Expand All @@ -258,9 +254,6 @@ div.tooltip {
}

@media (max-width: 750px) {
#bgButton {
font-size: 120%;
}
.dropdown-menu {
font-size: 60% !important;
}
Expand All @@ -284,10 +277,6 @@ div.tooltip {
font-size: 70%;
}

#notification {
margin-top: 148px;
}

.status {
text-align: center;
margin-bottom: 0;
Expand All @@ -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;
Expand Down Expand Up @@ -365,10 +351,6 @@ div.tooltip {
padding-bottom: 20px;
}

#bgButton {
font-size: 70% !important;
}

#currentTime {
font-size: 85%;
}
Expand Down
4 changes: 2 additions & 2 deletions static/js/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)');
}
}

Expand Down

0 comments on commit e442ecf

Please sign in to comment.