Merge branch 'master' into production

This commit is contained in:
Nick Winter 2014-11-12 20:45:40 -08:00
commit f522d2fb04
2 changed files with 6 additions and 5 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

View file

@ -43,11 +43,12 @@
.bubble
position: relative
margin: 20px
padding: 10px 10px 30px 10px
margin: 10px
padding: 20px 20px 40px 20px
color: white
font-weight: bold
background: rgb(45, 35, 234)
background: transparent url(/images/level/dialogue_background.png)
background-size: 100% 100%
border: black solid 1px
border-radius: 10px
font-size: 18px
@ -65,8 +66,8 @@
.enter
position: absolute
right: 10px
bottom: 10px
right: 15px
bottom: 20px
div.dot
background: #337
width: 8px