[MERGE] forward port of branch 8.0 up to a5419ca

2014-07-15 11:23:47 +02:00
parent bcfa4c8e7c a5419ca800
commit b7ba49825a
151 changed files with 7946 additions and 8929 deletions
@@ -163,6 +163,23 @@ table.editorbar-panel td.selected {
  background-color: #b1c9d9;
 }

+.link-style .dropdown > .btn {
+  min-width: 160px;
+}
+.link-style .link-style {
+  display: none;
+}
+.link-style li {
+  text-align: center;
+}
+.link-style li label {
+  width: 100px;
+  margin: 0 5px;
+}
+.link-style .col-sm-2 > * {
+  line-height: 2em;
+}
+
 /* ---- TRANSLATIONS ---- {{{ */
 .oe_translate_or {
  color: white;