mrflos/memo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:aliasaria/scrumblr

Browse source 
Conflicts:
	client/css/style.css
This commit is contained in:
ali asaria 2014-09-01 19:59:16 -04:00
commit 46a80badc7
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
client/css/style.css
View file

@ -298,8 +298,13 @@ xopacity: .5;
} }
.sticker { .sticker {
<<<<<<< HEAD
padding-top: 0px; padding-top: 0px;
padding-left: 2px; padding-left: 2px;
=======
xpadding-top: 3px;
xpadding-left: 2px;
>>>>>>> 165a83e28357608b36daab0986a00ca7d9735b06
xz-index:10; xz-index:10;
display: inline-block; display: inline-block;
width: 11px; width: 11px;