[gnome-clocks/bilelmoussaoui/redesign-timer: 8/9] Rebase on master
- From: Bilal Elmoussaoui <bilelmoussaoui src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-clocks/bilelmoussaoui/redesign-timer: 8/9] Rebase on master
- Date: Fri, 31 Jan 2020 16:26:04 +0000 (UTC)
commit 92cf4ec2618567ed5bba51d660fbfdf88d037ae6
Merge: a60f271 d9208e0
Author: Bilal Elmoussaoui <bil elmoussaoui gmail com>
Date: Fri Jan 31 17:05:39 2020 +0100
Rebase on master
build-aux/flatpak/org.gnome.clocks.json | 28 ++-
data/css/gnome-clocks.css | 48 ++++-
data/ui/stopwatch.ui | 311 ++++++++++++++++++++++----------
data/ui/stopwatchlapsrow.ui | 117 ++++++------
po/mjw.po | 185 +++++++++++--------
po/pt_BR.po | 31 ++--
src/stopwatch.vala | 287 +++++++++++++++--------------
7 files changed, 616 insertions(+), 391 deletions(-)
---
diff --cc data/css/gnome-clocks.css
index 3cbaaa5,8e1c707..66e7baa
--- a/data/css/gnome-clocks.css
+++ b/data/css/gnome-clocks.css
@@@ -229,18 -228,50 +228,65 @@@ spinbutton.clocks-timer-label button
animation-duration: 1s;
}
+.round-button {
+ border-radius: 9999px;
+}
+.large-button {
+ padding: 12px 18px;
+}
+.timer-countdown {
+ font-size: 40pt;
+}
+.timer-countdown.timer-paused {
+ color: #9E9DA1;
+}
+.timer-countdown.timer-running {
+ color: #428be5;
+}
+ /* Stopwatch */
+ .large-button {
+ padding: 6px 32px;
+ }
+ .lap-time {
+ font-weight: bold;
+ }
+
+ .negative-lap {
+ color: #ED333B;
+ }
+ .positive-lap {
+ color: #428be5;
+ }
+ .stopped-stopwatch label,
+ .running-stopwatch label,
+ .paused-stopwatch label {
+ font-size: 70px;
+ color: grey;
+ font-weight: 200;
+ }
+
+ .stopped-stopwatch .seconds-label {
+ font-weight: 300;
+ }
+
+ .running-stopwatch .seconds-label,
+ .running-stopwatch .miliseconds-label {
+ color: #428be5;
+ }
+ .stopped-stopwatch .miliseconds-label,
+ .running-stopwatch .miliseconds-label,
+ .paused-stopwatch .miliseconds-label {
+ font-size: 50px;
+ }
+ .running-stopwatch .seconds-label,
+ .paused-stopwatch .seconds-label {
+ font-weight: 500;
+ }
+
+ .stopped-stopwatch .seconds-label,
+ .stopped-stopwatch .miliseconds-label,
+ .paused-stopwatch .seconds-label,
+ .paused-stopwatch .miliseconds-label {
+ color: black;
+ }
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]