diff options
author | IgnatzHome <ignatz@maschath.de> | 2018-05-17 20:21:07 +0200 |
---|---|---|
committer | IgnatzHome <ignatz@maschath.de> | 2018-05-17 20:21:07 +0200 |
commit | 9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874 (patch) | |
tree | 47ffe9a487aa6d66bbb4cd327ca248c4b30fda4a /client/components/main | |
parent | c0c7b269a794fb28ddf5ffc17744f6724041de96 (diff) | |
parent | 8b16955cc27b29ae507be084adccc4fad61b05ef (diff) | |
download | wekan-9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874.tar.gz wekan-9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874.tar.bz2 wekan-9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874.zip |
resolving merge conflicts
Diffstat (limited to 'client/components/main')
-rw-r--r-- | client/components/main/popup.styl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/client/components/main/popup.styl b/client/components/main/popup.styl index b7c9e264..ff00eef3 100644 --- a/client/components/main/popup.styl +++ b/client/components/main/popup.styl @@ -33,6 +33,9 @@ $popupWidth = 300px textarea height: 72px + form a span + padding: 0 0.5rem + .header height: 36px position: relative |