milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix merge conflict

Browse source
This commit is contained in:
Luke Pulverenti 2015-12-19 10:54:44 -05:00
parent ff4c684e54
commit c504f5005d
11 changed files with 151 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

3
dashboard-ui/devices/ios/ios.css
View file

@ -189,7 +189,8 @@ paper-tab {
padding: 0;
}
.cardBox {
/* Need the div specifier to gain preference over the value in card.css */
div.cardBox {
margin: 5px;
}