diff --git a/app/partials/membership.jade b/app/partials/membership.jade index e0b59efd..200e9399 100644 --- a/app/partials/membership.jade +++ b/app/partials/membership.jade @@ -14,7 +14,7 @@ block content a.button.button-green(title="Add New US" href="") span.text + New role - section.admin-membership-table + section.admin-membership-table.basic-table div.row.title div.header-member Member div.header-role Role diff --git a/app/partials/views/modules/colors-table.jade b/app/partials/views/modules/colors-table.jade index 4ced16bf..db216d4c 100644 --- a/app/partials/views/modules/colors-table.jade +++ b/app/partials/views/modules/colors-table.jade @@ -1,4 +1,4 @@ -section.colors-table +section.colors-table.basic-table div.row.title div.width-1.color-column Color div.width-6 Name diff --git a/app/partials/views/modules/issues-table.jade b/app/partials/views/modules/issues-table.jade index 3adf6568..1c5da4d4 100644 --- a/app/partials/views/modules/issues-table.jade +++ b/app/partials/views/modules/issues-table.jade @@ -1,4 +1,4 @@ -section.issues-table +section.issues-table.basic-table div.row.title div.level-field.width-1 Severity div.level-field.width-1 Priority diff --git a/app/partials/views/modules/search-result-issues-table.jade b/app/partials/views/modules/search-result-issues-table.jade index 08362dd3..b9ce175b 100644 --- a/app/partials/views/modules/search-result-issues-table.jade +++ b/app/partials/views/modules/search-result-issues-table.jade @@ -1,4 +1,4 @@ -section.search-result-table +section.search-result-table.basic-table div.row.title div.user-stories.width-6 Issue div.status.width-2 Status diff --git a/app/partials/views/modules/search-result-table.jade b/app/partials/views/modules/search-result-table.jade index 5ab6d748..89d4553a 100644 --- a/app/partials/views/modules/search-result-table.jade +++ b/app/partials/views/modules/search-result-table.jade @@ -1,4 +1,4 @@ -section.search-result-table +section.search-result-table.basic-table div.row.title div.user-stories.width-4 User Stories div.status.width-2 Status diff --git a/app/styles/components/basic-table.scss b/app/styles/components/basic-table.scss new file mode 100644 index 00000000..edd079ad --- /dev/null +++ b/app/styles/components/basic-table.scss @@ -0,0 +1,31 @@ +.basic-table { + align-content: stretch; + align-items: center; + display: flex; + flex-direction: column; + flex-wrap: wrap; + justify-content: flex-start; + width: 100%; + .row { + align-content: stretch; + align-items: center; + border-bottom: 1px solid $gray-light; + display: flex; + flex-direction: row; + flex-wrap: nowrap; + justify-content: flex-start; + padding: 1rem 0 1rem 1rem; + text-align: left; + width: 100%; + @for $i from 1 through 8 { + .width-#{$i} { + flex-basis: 50px; + flex-grow: $i; + flex-shrink: 0; + } + } + &:last-child { + border-bottom: 0; + } + } +} diff --git a/app/styles/main.scss b/app/styles/main.scss index 3a4ed08b..6b9075e8 100755 --- a/app/styles/main.scss +++ b/app/styles/main.scss @@ -25,6 +25,7 @@ $prefix-for-spec: true; @import 'components/filter'; @import 'components/taskboard-task'; @import 'components/notification-message'; +@import 'components/basic-table'; //Modules @import 'modules/nav'; diff --git a/app/styles/modules/admin-membership-table.scss b/app/styles/modules/admin-membership-table.scss index ac27d849..47aabf9d 100644 --- a/app/styles/modules/admin-membership-table.scss +++ b/app/styles/modules/admin-membership-table.scss @@ -1,29 +1,7 @@ .admin-membership-table { - align-content: stretch; - align-items: center; - display: flex; - flex-direction: column; - flex-wrap: wrap; - justify-content: flex-start; - width: 100%; .title { font-family: 'DroidSans-Bold'; } - .row { - align-content: stretch; - align-items: center; - border-bottom: 1px solid $gray-light; - display: flex; - flex-direction: row; - flex-wrap: nowrap; - justify-content: flex-start; - padding: 1rem 0 1rem 1rem; - text-align: left; - width: 100%; - &:last-child { - border-bottom: 0; - } - } .avatar { align-items: center; display: flex; diff --git a/app/styles/modules/colors-table.scss b/app/styles/modules/colors-table.scss index ce553920..6e2552df 100644 --- a/app/styles/modules/colors-table.scss +++ b/app/styles/modules/colors-table.scss @@ -1,29 +1,5 @@ .colors-table { - align-content: stretch; - align-items: center; - display: flex; - flex-direction: column; - flex-wrap: wrap; - justify-content: flex-start; - width: 100%; .row { - align-content: stretch; - align-items: center; - display: flex; - flex-direction: row; - flex-wrap: nowrap; - justify-content: flex-start; - padding: 1rem 0 1rem 1rem; - position: relative; - text-align: left; - width: 100%; - @for $i from 1 through 8 { - .width-#{$i} { - flex-basis: 50px; - flex-grow: $i; - flex-shrink: 0; - } - } &:hover { background: lighten($green-taiga, 60%); @include transition (background .2s ease-in); diff --git a/app/styles/modules/issues-table.scss b/app/styles/modules/issues-table.scss index 7bef17dd..d3639d9c 100644 --- a/app/styles/modules/issues-table.scss +++ b/app/styles/modules/issues-table.scss @@ -1,28 +1,5 @@ .issues-table { - align-content: stretch; - align-items: center; - display: flex; - flex-direction: column; - flex-wrap: wrap; - justify-content: flex-start; - width: 100%; .row { - align-content: stretch; - align-items: center; - display: flex; - flex-direction: row; - flex-wrap: nowrap; - justify-content: flex-start; - padding: 1rem 0; - text-align: left; - width: 100%; - @for $i from 1 through 8 { - .width-#{$i} { - flex-basis: 50px; - flex-grow: $i; - flex-shrink: 0; - } - } &:hover { background: lighten($green-taiga, 60%); @include transition (background .2s ease-in); diff --git a/app/styles/modules/search-result-table.scss b/app/styles/modules/search-result-table.scss index 0f5846cd..b046babf 100644 --- a/app/styles/modules/search-result-table.scss +++ b/app/styles/modules/search-result-table.scss @@ -1,28 +1,5 @@ .search-result-table { - align-content: stretch; - align-items: center; - display: flex; - flex-direction: column; - flex-wrap: wrap; - justify-content: flex-start; - width: 100%; .row { - align-content: stretch; - align-items: center; - display: flex; - flex-direction: row; - flex-wrap: nowrap; - justify-content: flex-start; - padding: 1rem 0 1rem 1rem; - text-align: left; - width: 100%; - @for $i from 1 through 8 { - .width-#{$i} { - flex-basis: 50px; - flex-grow: $i; - flex-shrink: 0; - } - } &:hover { background: lighten($green-taiga, 60%); @include transition (background .2s ease-in);