From fe523e6f5333db5e613d994ac3739dae854a90d1 Mon Sep 17 00:00:00 2001 From: Florian Knoch Date: Thu, 7 Dec 2017 10:45:30 +0000 Subject: [PATCH 1/6] Update sound button color and typography --- static/main.css | 54 +++++++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/static/main.css b/static/main.css index c24adad..c068865 100644 --- a/static/main.css +++ b/static/main.css @@ -170,37 +170,41 @@ nav .extra > a { } .sound a { - background-color: #ff4136; - border: 1px solid #000; - border-radius: 50px; - box-shadow: inset -5px -5px 5px rgba(0, 0, 0, 0.6); - color: #eee; - display: inline-block; - font-size: 0.6em; - height: 100px; - line-height: 100px; - margin: 10px; - overflow: hidden; - text-align: center; - text-shadow: -1px 0 black, 0 1px black, 1px 0 black, 0 -1px black; + display: flex; + align-items: center; + justify-content: center; + height: 100px; width: 100px; + margin: 10px; + padding: .5rem; + background-color: #b02222; + border: 1px solid #000; + border-radius: 50%; + box-shadow: inset -5px -5px 5px rgba(0, 0, 0, .5), inset 5px 5px 5px rgba(255,255,255,.3); + transition: all .1s ease-in-out; + overflow: hidden; + + font-weight: bold; + font-size: 14px; + text-shadow: none; + text-align: center; + word-break: break-all; + line-height: 1.5; + color: #eee; + } -.sound a:hover { - background-color: #ff4136; +.sound a:hover, +.sound a:active { + background-color: #790d0d; + transform: scale(.98); box-shadow: inset 5px 5px 5px rgba(0, 0, 0, 0.6); cursor: pointer; } -.sound a:active { - background-color: #ff4136; - box-shadow: inset 5px 5px 5px rgba(0, 0, 0, 0.6); - cursor: pointer; -} - .sound-pressed { - background-color: #ff4136 !important; - box-shadow: inset 5px 5px 5px rgba(0, 0, 0, 0.6) !important; + background-color: #ff4136 !important; + box-shadow: inset 5px 5px 5px rgba(0, 0, 0, 0.6) !important; } .edit { @@ -210,7 +214,9 @@ nav .extra > a { } .sound.edit a:hover { - box-shadow: inset -5px -5px 5px rgba(0, 0, 0, 0.6); + box-shadow: inset -5px -5px 5px rgba(0, 0, 0, 0.6), inset 5px 5px 5px rgba(255,255,255,.3); + transform: scale(1); + background-color: #b02222; } .unselectable { From ec1a4e560d58988f18f26e548d7dbfa805931d7d Mon Sep 17 00:00:00 2001 From: Florian Knoch Date: Thu, 7 Dec 2017 10:46:41 +0000 Subject: [PATCH 2/6] Revert "Update sound button color and typography" This reverts commit fe523e6f5333db5e613d994ac3739dae854a90d1 --- static/main.css | 52 ++++++++++++++++++++++--------------------------- 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/static/main.css b/static/main.css index c068865..c24adad 100644 --- a/static/main.css +++ b/static/main.css @@ -170,41 +170,37 @@ nav .extra > a { } .sound a { - display: flex; - align-items: center; - justify-content: center; - height: 100px; - width: 100px; - margin: 10px; - padding: .5rem; - background-color: #b02222; + background-color: #ff4136; border: 1px solid #000; - border-radius: 50%; - box-shadow: inset -5px -5px 5px rgba(0, 0, 0, .5), inset 5px 5px 5px rgba(255,255,255,.3); - transition: all .1s ease-in-out; - overflow: hidden; - - font-weight: bold; - font-size: 14px; - text-shadow: none; - text-align: center; - word-break: break-all; - line-height: 1.5; + border-radius: 50px; + box-shadow: inset -5px -5px 5px rgba(0, 0, 0, 0.6); color: #eee; - + display: inline-block; + font-size: 0.6em; + height: 100px; + line-height: 100px; + margin: 10px; + overflow: hidden; + text-align: center; + text-shadow: -1px 0 black, 0 1px black, 1px 0 black, 0 -1px black; + width: 100px; } -.sound a:hover, -.sound a:active { - background-color: #790d0d; - transform: scale(.98); +.sound a:hover { + background-color: #ff4136; box-shadow: inset 5px 5px 5px rgba(0, 0, 0, 0.6); cursor: pointer; } +.sound a:active { + background-color: #ff4136; + box-shadow: inset 5px 5px 5px rgba(0, 0, 0, 0.6); + cursor: pointer; +} + .sound-pressed { - background-color: #ff4136 !important; - box-shadow: inset 5px 5px 5px rgba(0, 0, 0, 0.6) !important; + background-color: #ff4136 !important; + box-shadow: inset 5px 5px 5px rgba(0, 0, 0, 0.6) !important; } .edit { @@ -214,9 +210,7 @@ nav .extra > a { } .sound.edit a:hover { - box-shadow: inset -5px -5px 5px rgba(0, 0, 0, 0.6), inset 5px 5px 5px rgba(255,255,255,.3); - transform: scale(1); - background-color: #b02222; + box-shadow: inset -5px -5px 5px rgba(0, 0, 0, 0.6); } .unselectable { From f5f1f66b23dfe996f9e8c5e3a6627ace65954b50 Mon Sep 17 00:00:00 2001 From: Florian Knoch Date: Thu, 7 Dec 2017 10:49:49 +0000 Subject: [PATCH 3/6] Change sound button color and text --- static/main.css | 62 +++++++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 28 deletions(-) diff --git a/static/main.css b/static/main.css index c24adad..dd5663d 100644 --- a/static/main.css +++ b/static/main.css @@ -38,13 +38,13 @@ button { } button:hover { - background-color: #999; - border: 1px solid #666; + background-color: #999; + border: 1px solid #666; } button:active { - background-color: #999; - border: 1px solid #666; + background-color: #999; + border: 1px solid #666; color: #000; } @@ -170,37 +170,41 @@ nav .extra > a { } .sound a { - background-color: #ff4136; - border: 1px solid #000; - border-radius: 50px; - box-shadow: inset -5px -5px 5px rgba(0, 0, 0, 0.6); - color: #eee; - display: inline-block; - font-size: 0.6em; - height: 100px; - line-height: 100px; - margin: 10px; - overflow: hidden; - text-align: center; - text-shadow: -1px 0 black, 0 1px black, 1px 0 black, 0 -1px black; + display: flex; + align-items: center; + justify-content: center; + height: 100px; width: 100px; + margin: 10px; + padding: .5rem; + background-color: #b02222; + border: 1px solid #000; + border-radius: 50%; + box-shadow: inset -5px -5px 5px rgba(0, 0, 0, .5), inset 5px 5px 5px rgba(255,255,255,.3); + transition: all .1s ease-in-out; + overflow: hidden; + + font-weight: bold; + font-size: 14px; + text-shadow: none; + text-align: center; + word-break: break-all; + line-height: 1.5; + color: #eee; + } -.sound a:hover { - background-color: #ff4136; +.sound a:hover, +.sound a:active { + background-color: #790d0d; + transform: scale(.98); box-shadow: inset 5px 5px 5px rgba(0, 0, 0, 0.6); cursor: pointer; } -.sound a:active { - background-color: #ff4136; - box-shadow: inset 5px 5px 5px rgba(0, 0, 0, 0.6); - cursor: pointer; -} - .sound-pressed { - background-color: #ff4136 !important; - box-shadow: inset 5px 5px 5px rgba(0, 0, 0, 0.6) !important; + background-color: #ff4136 !important; + box-shadow: inset 5px 5px 5px rgba(0, 0, 0, 0.6) !important; } .edit { @@ -210,7 +214,9 @@ nav .extra > a { } .sound.edit a:hover { - box-shadow: inset -5px -5px 5px rgba(0, 0, 0, 0.6); + box-shadow: inset -5px -5px 5px rgba(0, 0, 0, 0.6), inset 5px 5px 5px rgba(255,255,255,.3); + transform: scale(1); + background-color: #b02222; } .unselectable { From 61493f130a9d10181e77b8ad6bd9901d3b3e1704 Mon Sep 17 00:00:00 2001 From: Florian Knoch Date: Thu, 7 Dec 2017 11:15:17 +0000 Subject: [PATCH 4/6] Correct indentation --- static/main.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/static/main.css b/static/main.css index dd5663d..d1497b8 100644 --- a/static/main.css +++ b/static/main.css @@ -190,8 +190,7 @@ nav .extra > a { text-align: center; word-break: break-all; line-height: 1.5; - color: #eee; - + color: #eee; } .sound a:hover, From f40e2ca2f7b6c8f677c3b85ba640a2d382ca5f4c Mon Sep 17 00:00:00 2001 From: Florian Knoch Date: Thu, 7 Dec 2017 11:16:09 +0000 Subject: [PATCH 5/6] Revert "Correct indentation" This reverts commit 61493f130a9d10181e77b8ad6bd9901d3b3e1704 --- static/main.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/static/main.css b/static/main.css index d1497b8..dd5663d 100644 --- a/static/main.css +++ b/static/main.css @@ -190,7 +190,8 @@ nav .extra > a { text-align: center; word-break: break-all; line-height: 1.5; - color: #eee; + color: #eee; + } .sound a:hover, From 366bbd52bc2635037785f1f2eed94f4537437c36 Mon Sep 17 00:00:00 2001 From: Florian Date: Thu, 7 Dec 2017 18:19:23 +0100 Subject: [PATCH 6/6] Fix indentation --- static/main.css | 72 ++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/static/main.css b/static/main.css index dd5663d..b574ea4 100644 --- a/static/main.css +++ b/static/main.css @@ -1,4 +1,5 @@ -html, body { +html, +body { margin: 0; } @@ -23,7 +24,8 @@ form { padding: 5px; } -input, button { +input, +button { background-color: #666; border: 1px solid #999; border-radius: 5px; @@ -38,13 +40,13 @@ button { } button:hover { - background-color: #999; - border: 1px solid #666; + background-color: #999; + border: 1px solid #666; } button:active { - background-color: #999; - border: 1px solid #666; + background-color: #999; + border: 1px solid #666; color: #000; } @@ -154,7 +156,7 @@ nav .extra { right: 1em; } -nav .extra > a { +nav .extra>a { background-color: #2ecc40; border: 1px solid #000; border-radius: 5px; @@ -170,41 +172,39 @@ nav .extra > a { } .sound a { - display: flex; - align-items: center; - justify-content: center; - height: 100px; + display: flex; + align-items: center; + justify-content: center; + height: 100px; width: 100px; margin: 10px; - padding: .5rem; - background-color: #b02222; + padding: .5rem; + background-color: #b02222; border: 1px solid #000; - border-radius: 50%; - box-shadow: inset -5px -5px 5px rgba(0, 0, 0, .5), inset 5px 5px 5px rgba(255,255,255,.3); - transition: all .1s ease-in-out; + border-radius: 50%; + box-shadow: inset -5px -5px 5px rgba(0, 0, 0, .5), inset 5px 5px 5px rgba(255, 255, 255, .3); + transition: all .1s ease-in-out; overflow: hidden; - - font-weight: bold; - font-size: 14px; - text-shadow: none; + font-weight: bold; + font-size: 14px; + text-shadow: none; text-align: center; - word-break: break-all; - line-height: 1.5; + word-break: break-all; + line-height: 1.5; color: #eee; - } .sound a:hover, .sound a:active { background-color: #790d0d; - transform: scale(.98); + transform: scale(.98); box-shadow: inset 5px 5px 5px rgba(0, 0, 0, 0.6); cursor: pointer; } .sound-pressed { - background-color: #ff4136 !important; - box-shadow: inset 5px 5px 5px rgba(0, 0, 0, 0.6) !important; + background-color: #ff4136 !important; + box-shadow: inset 5px 5px 5px rgba(0, 0, 0, 0.6) !important; } .edit { @@ -214,20 +214,20 @@ nav .extra > a { } .sound.edit a:hover { - box-shadow: inset -5px -5px 5px rgba(0, 0, 0, 0.6), inset 5px 5px 5px rgba(255,255,255,.3); - transform: scale(1); - background-color: #b02222; + box-shadow: inset -5px -5px 5px rgba(0, 0, 0, 0.6), inset 5px 5px 5px rgba(255, 255, 255, .3); + transform: scale(1); + background-color: #b02222; } .unselectable { - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } #local-mode-button .local { color: red; -} +} \ No newline at end of file