summaryrefslogtreecommitdiff
path: root/talermerchantdemos/static
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-09-06 22:15:24 +0200
committerChristian Grothoff <christian@grothoff.org>2020-09-06 22:15:24 +0200
commit61edc480faa9da24cd2c9a221aedbaf6829700f5 (patch)
treea1f6f7918aa8e40bbae5453e89d0ed5d5765d2e4 /talermerchantdemos/static
parent728c4bf11e13dc7a83d88e737b117cbbd4b97cf3 (diff)
parent2f4403fde23ef59ff051deb33ad7ba0a5c9e33e5 (diff)
downloadtaler-merchant-demos-61edc480faa9da24cd2c9a221aedbaf6829700f5.tar.gz
taler-merchant-demos-61edc480faa9da24cd2c9a221aedbaf6829700f5.tar.bz2
taler-merchant-demos-61edc480faa9da24cd2c9a221aedbaf6829700f5.zip
Merge branch 'torsten-redesign' of git+ssh://git.taler.net/taler-merchant-demos into torsten-redesign
Diffstat (limited to 'talermerchantdemos/static')
-rw-r--r--talermerchantdemos/static/demo.scss (renamed from talermerchantdemos/static/demo.css)0
-rw-r--r--talermerchantdemos/static/pure.scss (renamed from talermerchantdemos/static/pure.css)2
-rw-r--r--talermerchantdemos/static/taler-fallback.scss (renamed from talermerchantdemos/static/taler-fallback.css)0
3 files changed, 1 insertions, 1 deletions
diff --git a/talermerchantdemos/static/demo.css b/talermerchantdemos/static/demo.scss
index 7733515..7733515 100644
--- a/talermerchantdemos/static/demo.css
+++ b/talermerchantdemos/static/demo.scss
diff --git a/talermerchantdemos/static/pure.css b/talermerchantdemos/static/pure.scss
index 7391139..9b555ed 100644
--- a/talermerchantdemos/static/pure.css
+++ b/talermerchantdemos/static/pure.scss
@@ -821,7 +821,7 @@ this the same font stack that Normalize.css sets for the `body`.
.pure-button-active,
.pure-button:active {
box-shadow: 0 0 0 1px rgba(0,0,0, 0.15) inset, 0 0 6px rgba(0,0,0, 0.20) inset;
- border-color: #000\9;
+ border-color: #000;
}
.pure-button[disabled],
diff --git a/talermerchantdemos/static/taler-fallback.css b/talermerchantdemos/static/taler-fallback.scss
index e403d71..e403d71 100644
--- a/talermerchantdemos/static/taler-fallback.css
+++ b/talermerchantdemos/static/taler-fallback.scss