From f86f0fabdfd05d6dba8d9a8d3d0f0d6680bf71ff Mon Sep 17 00:00:00 2001 From: Stefan Niedermann Date: Thu, 15 Dec 2016 09:14:21 +0100 Subject: [PATCH 1/3] Fix left navigation layout --- css/style.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/css/style.css b/css/style.css index a5567b5..1d61ff3 100644 --- a/css/style.css +++ b/css/style.css @@ -25,6 +25,8 @@ width: 100%; border-top: 1px solid #eee; box-sizing: border-box; + display: flex; + align-items: center; } #app-mailbox-peers li:hover > a, From 9a08cfb5b5db30bf12ac25d519ace5679a36bade Mon Sep 17 00:00:00 2001 From: Stefan Niedermann Date: Thu, 15 Dec 2016 10:41:08 +0100 Subject: [PATCH 2/3] Fix #130 Use loading spinner from core --- css/style.css | 49 +--------------------------------------------- templates/main.php | 4 ++-- 2 files changed, 3 insertions(+), 50 deletions(-) diff --git a/css/style.css b/css/style.css index 1d61ff3..cf4f185 100644 --- a/css/style.css +++ b/css/style.css @@ -216,27 +216,7 @@ label { font-weight: bold; } -.loader, -.loader:before, -.loader:after { - background: #646464; - -webkit-animation: load1 1s infinite ease-in-out; - animation: load1 1s infinite ease-in-out; - width: 1em; - height: 4em; -} -.loader:before, -.loader:after { - position: absolute; - top: 0; - content: ''; -} -.loader:before { - left: -1.5em; - -webkit-animation-delay: -0.32s; - animation-delay: -0.32s; -} -.loader { +.icon-loading { color: #646464; text-indent: -9999em; margin: 88px auto; @@ -248,30 +228,3 @@ label { -webkit-animation-delay: -0.16s; animation-delay: -0.16s; } -.loader:after { - left: 1.5em; -} -@-webkit-keyframes load1 { - 0%, - 80%, - 100% { - box-shadow: 0 0; - height: 4em; - } - 40% { - box-shadow: 0 -2em; - height: 5em; - } -} -@keyframes load1 { - 0%, - 80%, - 100% { - box-shadow: 0 0; - height: 4em; - } - 40% { - box-shadow: 0 -2em; - height: 5em; - } -} diff --git a/templates/main.php b/templates/main.php index 05773a0..9fb4950 100644 --- a/templates/main.php +++ b/templates/main.php @@ -8,7 +8,7 @@ use \OCA\OcSms\Lib\CountryCodes;
-
+
  • @@ -58,7 +58,7 @@ use \OCA\OcSms\Lib\CountryCodes;
-
+
From 07dafcd2aafee88817ef7eb75995c61c0503beb3 Mon Sep 17 00:00:00 2001 From: Stefan Niedermann Date: Thu, 15 Dec 2016 13:38:58 +0100 Subject: [PATCH 3/3] Style messages more modern (#134) --- css/style.css | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/css/style.css b/css/style.css index cf4f185..9f603d6 100644 --- a/css/style.css +++ b/css/style.css @@ -142,26 +142,23 @@ } .msg-sent, .msg-recv { - border-radius: 12px; + border: 1px solid #ccc; + border-left-width: 4px; + border-radius: 2px; margin: 4px; max-width: 50%; padding: 8px; - box-shadow: 1px 1px 1px #CCC; - -moz-box-shadow: 1px 1px 1px #CCC; - -webkit-box-shadow: 1px 1px 1px #CCC; - -ms-box-shadow: 1px 1px 1px #CCC; - -o-box-shadow: 1px 1px 1px #CCC; + box-shadow: 0px 1px 2px 0px #0000004d; } .msg-sent { - border: 1px solid #bbb; - background: #a5fb7a; + border-color: #a0ce89; + background: #e0ffd1; float: right; } .msg-recv { - border: 1px solid #bbb; - background: #e8e8e8; + background: #f5f5f5; float: left; }