Merge branch 'local-v4-dev' into v4-dev

Orange-OpenSource · Oct 21, 2016 · 58c771e · 58c771e
2 parents 4fb34b5 + 86b4b20
commit 58c771e
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 4 deletions.
diff --git a/scss/_o-accordion.scss b/scss/_o-accordion.scss
@@ -4,9 +4,9 @@
 
 .panel,
 .o-accordion {
+  margin-bottom: 0;
   border: 0;
   border-bottom: 1px solid $gray-light-o;
-  margin-bottom: 0;
 
   &.panel-default > .panel-heading,
   .card-header {

diff --git a/scss/_o-navbar.scss b/scss/_o-navbar.scss
@@ -22,8 +22,11 @@
 
   .navbar-toggleable-xs {
     position: static;
-    display: inline-block !important;
     width: auto;
+
+    @include media-breakpoint-up(sm) {
+      display: inline-block !important;
+    }
   }
 
   .navbar-toggler {
@@ -202,7 +205,8 @@
 
     .navbar-toggler {
       float: right;
-      padding: .9375rem .9375rem .875rem;
+      height: 3.125rem;
+      padding: .125rem 0 0;
       font-size: 1.25rem;
       color: $navbar-dark-color;
       background-color: transparent;
@@ -243,7 +247,6 @@
       top: $navbar-height-sm;
       left: 0;
       z-index: 100;
-      display: inline-block;
       width: 100%;
       margin: 0;
       background-color: #000;

diff --git a/scss/_orange-css.scss b/scss/_orange-css.scss
@@ -280,6 +280,47 @@ a:focus {
       }
     }
   }
+
+  &.table-reflow {
+    thead,
+    tbody, {
+      > tr {
+        border: 0;
+      }
+
+      > tr > td {
+        line-height: 1.25rem;
+      }
+
+      > tr > th:first-child {
+        border-bottom: 2px solid $table-border-color;
+      }
+
+      > tr > th,
+      > tr > td {
+        border-bottom: 1px solid $table-border-color;
+      }
+
+      > tr > td:last-child {
+        border-right: 0;
+      }
+    }
+
+    thead > tr {
+      border: 0;
+
+      > th:not(:first-child) {
+        padding-left: .625rem;
+        border-bottom: 1px solid $table-border-color;
+      }
+    }
+
+    tbody {
+      > tr > th:first-child {
+        padding-left: 0;
+      }
+    }
+  }
 }
 
 @include table-row-variant-border(success, $state-success-border);