diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-09-06 18:48:48 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-09-06 18:48:48 +0200 |
commit | 06c708def001b20b6e15d02c5224d835559e4f71 (patch) | |
tree | 7be3fd806190087ca30e631e7d1846dbba4d7141 /talermerchantdemos/static/demo.css | |
parent | d6459ab53ef80f1c799324ea5fa9709f6652db38 (diff) | |
parent | 3b378dd884ffd9580e95d0b20964eb57b87f7552 (diff) | |
download | taler-merchant-demos-06c708def001b20b6e15d02c5224d835559e4f71.tar.gz taler-merchant-demos-06c708def001b20b6e15d02c5224d835559e4f71.tar.bz2 taler-merchant-demos-06c708def001b20b6e15d02c5224d835559e4f71.zip |
fix merge issue
Diffstat (limited to 'talermerchantdemos/static/demo.css')
-rw-r--r-- | talermerchantdemos/static/demo.css | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/talermerchantdemos/static/demo.css b/talermerchantdemos/static/demo.css index b2688ad..7733515 100644 --- a/talermerchantdemos/static/demo.css +++ b/talermerchantdemos/static/demo.css @@ -44,26 +44,39 @@ } body { - overflow-y: scroll; + overflow-x: hidden; + overflow-y: auto; +} + +body * { + /* margin-left: 0.5vw; */ + left: 0.1vw; } @media (min-width: 500px) { .content { - margin-left: 25%; + /* margin-left: 0vw; */ padding-left: 2em; margin-right: 1em; - overflow-x: auto; + overflow-x: hidden; + overflow-y: auto; } .demobar { - height: 100%; + /* height: 100%; */ + /* width: 25%; */ + /* NOTE: Please use "vh"/"vw" instead of "%" when possible, in the future. */ + height: min-content; + width: 100vw; margin: 0; top: 0; left: 0; background-color: #033; color: white; - position: fixed; - width: 25%; + position: relative; padding-right: 1em; - overflow: auto; + overflow-x: hidden; + overflow-y: auto; + text-align: center; } } + |