fixes #63

aktos-io · Feb 9, 2017 · ae24b93 · ae24b93
1 parent 28f4e27
commit ae24b93
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 52 deletions.
diff --git a/apps/example/webapps/showcase/previews/r-table.pug b/apps/example/webapps/showcase/previews/r-table.pug
@@ -19,8 +19,12 @@ panel(type="info" title="r-table")
                 tr
                     th Id
                     th Name
+                    th Test combobox
             tbody
                 +each('combobox.list1')
                     tr
                         td {{ .id }}
                         td {{ .name }}
+                        td
+                          input-field(value="{{ inputField.value }}" placeholder="hello!")
+                              search-combobox(data="{{ combobox.list1 }}" selected="{{ combobox.boundSelected }}" fit-width)
diff --git a/src/client/components/r-table/rwd-table.css b/src/client/components/r-table/rwd-table.css
@@ -9,67 +9,51 @@ body {
   margin: 1em 0;
   min-width: 300px;
   width: 100% !important;
+  border-radius: .4em;
+  overflow: hidden;
 }
-.rwd-table tr {
+.rwd-table > tr {
   border-top: 1px solid #ddd;
   border-bottom: 1px solid #ddd;
+  border-color: #46637f;
 }
-.rwd-table th {
+.rwd-table > th {
   display: none;
 }
-.rwd-table td {
+.rwd-table > td {
   display: block;
 }
-.rwd-table td:first-child {
+.rwd-table > td:before {
+  content: attr(data-th) " ";
+  font-weight: bold;
+  display: inline-block;
+  color: black;
+}
+
+.rwd-table > td:first-child {
   padding-top: .5em;
 }
-.rwd-table td:last-child {
+.rwd-table > td:last-child {
   padding-bottom: .5em;
 }
-.rwd-table tr:nth-child(odd) {
+.rwd-table > tr:nth-child(odd) {
     background-color: rgb(0, 80, 50, 0.05);
 }
 
-.rwd-table td:before {
-  content: attr(data-th) " ";
-  font-weight: bold;
-  display: inline-block;
-}
-.rwd-table th,
-.rwd-table td {
+.rwd-table > th,
+.rwd-table > td {
   text-align: left;
-}
-.rwd-table {
-  border-radius: .4em;
-  overflow: hidden;
-}
-.rwd-table tr {
-  border-color: #46637f;
-}
-.rwd-table th,
-.rwd-table td {
   margin: .5em 1em;
-}
-.rwd-table th,
-.rwd-table td:before {
-  color: black;
-}
-
-.rwd-table th,
-.rwd-table td {
-  padding: 1em !important;
-}
-.rwd-table th,
-.rwd-table td {
   display: table-cell;
-  padding: .25em .5em;
+  padding: 1em !important;
 }
-.rwd-table th:first-child,
-.rwd-table td:first-child {
+
+.rwd-table > th:first-child,
+.rwd-table > td:first-child {
   padding-left: 0;
 }
-.rwd-table th:last-child,
-.rwd-table td:last-child {
+.rwd-table > th:last-child,
+.rwd-table > td:last-child {
   padding-right: 0;
 }
 
@@ -79,7 +63,7 @@ body {
 /* ------------------------------------------------------------------------ */
 
 @media (min-width: 601px) {
-  .rwd-table td:before {
+  .rwd-table > td:before {
     display: none;
   }
 }
@@ -89,32 +73,32 @@ body {
     border: 0;
   }
 
-  .rwd-table thead {
+  .rwd-table > thead {
     display: none;
   }
 
-  .rwd-table tr {
+  .rwd-table > tr {
     margin-bottom: 10px;
     display: block;
     border-bottom: 2px solid #ddd;
   }
 
-  .rwd-table td {
+  .rwd-table > td {
     display: block;
     /*text-align: right;*/
     font-size: 13px;
     border-bottom: 1px dotted #ccc;
   }
 
-  .rwd-table td[data-th] {
+  .rwd-table > td[data-th] {
     text-align: right;
   }
 
-  .rwd-table td:last-child {
+  .rwd-table > td:last-child {
     border-bottom: 0;
   }
 
-  .rwd-table td:before {
+  .rwd-table > td:before {
     content: attr(data-th);
     float: left;
     font-weight: bold !important;
@@ -130,28 +114,28 @@ body {
     border: 0;
   }
 
-  .rwd-table thead {
+  .rwd-table > thead {
     display: none;
   }
 
-  .rwd-table tr {
+  .rwd-table > tr {
     margin-bottom: 10px;
     display: block;
     border-bottom: 2px solid #ddd;
   }
 
-  .rwd-table td {
+  .rwd-table > td {
     display: block;
     text-align: left;
     font-size: 13px;
     border-bottom: 1px dotted #ccc;
   }
 
-  .rwd-table td:last-child {
+  .rwd-table > td:last-child {
     border-bottom: 0;
   }
 
-  .rwd-table td:before {
+  .rwd-table > td:before {
     content: attr(data-th);
     font-weight: bold;
     display: block !important;