/* markup buttons */
.jsbuttonbar {
+<<<<<<< HEAD:nucleus/styles/addedit.css
+ height: 30px;
+=======
padding: 3px;
+>>>>>>> skinnable-master:skins/admin/bookmarklet/styles/addedit.css
cursor: default;
}
.jsbuttonspacer {
float: left;
width: 10px;
+<<<<<<< HEAD:nucleus/styles/addedit.css
+=======
}
.jsbuttonend {
clear: both;
+>>>>>>> skinnable-master:skins/admin/bookmarklet/styles/addedit.css
}