- Merge devel-framework branch, resolved conflicts

alecpl

2012-04-13 0c259682f65eaaf23ea4ccb56a706d6baf3007e4

1
2
3
4
5
input.radio {border:1px none #000; background:transparent; vertical-align:middle;} 
.panel_wrapper div.current {height:80px;} 
#width {width:50px; vertical-align:middle;} 
#width2 {width:50px; vertical-align:middle;} 
#size {width:100px;}