Skip to content
This repository has been archived by the owner on Jan 7, 2020. It is now read-only.

New Feature - Joint Public Comment Period #119

Merged
merged 3 commits into from
Jun 5, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions modules/core/client/scss/components/misc.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Show More link
.show-more-link {
font-weight: bold;
}

/* LIST VARIATIONS */
.comma-separated-list {
Expand Down
35 changes: 35 additions & 0 deletions modules/core/client/scss/components/table.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ $table-pagination-bg: #fff;
tr.filter-row {
border-top: $table-row-border;
}

input, select {
font-weight: normal;
}
}

th, td {
Expand Down Expand Up @@ -211,4 +215,35 @@ $pgn-btn-color: #000;
}
}
}
}

td.pagination-container {
display: block;
width: 100%;
}

.pg-step-btns,
.pg-display-count-btns {
text-align: center;
}

.pg-display-count-btns {
margin-top: 1rem;
}

@media (min-width: 640px) {
td.pagination-container {
display: table-cell;
width: auto;
}

.pg-step-btns {
float: left;
text-align: left;
}

.pg-display-count-btns {
float: right;
margin: 0;
}
}
182 changes: 18 additions & 164 deletions modules/core/client/scss/core.scss
Original file line number Diff line number Diff line change
Expand Up @@ -187,12 +187,12 @@ pre {
}
}

textarea {
textarea.form-control {
resize: vertical;
padding: 1rem;
}



/* MIXINS / UTILITY SELECTORS
------------------------------ */
button.close {
Expand All @@ -206,31 +206,6 @@ button.close {
margin: 0;
}

/* Margin Helpers */
.m-b-0 {
margin-bottom: 0 !important;
}

.m-b-1 {
margin-bottom: 1rem !important;
}

.m-b-2 {
margin-bottom: 2rem !important;
}

.m-t-0 {
margin-top: 0 !important;
}

.m-t-1 {
margin-top: 1rem !important;
}

.m-t-2 {
margin-top: 2rem !important;
}

/* MIXINS */
@mixin flexbox() {
display: -webkit-box;
Expand Down Expand Up @@ -2481,9 +2456,24 @@ form {
.radio-group {
padding-top: 0.7rem;

label {
margin-bottom: 0.5rem;

&:last-child {
margin-bottom: 0;
}

+ .help-block {
margin-top: -0.5rem;
margin-left: 2rem;
}
}

/* Fix - Myriad Pro causes an issue with the label offset so we fix it */
input[type="radio"] {
margin-top: 2px;
margin-top: -0.2rem;
margin-right: 0.5rem;
vertical-align: middle;
}
}

Expand Down Expand Up @@ -3183,12 +3173,6 @@ section {
}
}

.pcp-comment-count-label {
display: inline-block;
margin-top: 0.8rem;
font-weight: bold;
}

.pcp-pillar-vc-list {
.vc-details {
-webkit-flex: 1 1 auto;
Expand Down Expand Up @@ -3290,136 +3274,6 @@ section {
}
}

.public-comment-modal {
h4 {
margin-top: 0;
font-weight: bold;
}

p {
margin: 1.5rem 0;
line-height: 2rem;

a {
text-decoration: underline;
}
}

.control-label,
.comment-opt-in label {
font-weight: bold;
text-shadow: 0 0 1px #FFF;
}

.comment-opt-in {
margin-top: 0.5rem;
margin-bottom: 0;

+ .help-block {
margin-top: 0.25rem;
font-size: 1.3rem;
color: #999;
text-shadow: 0 0 1px #FFF;
}
}

.comment-review-btns {
-webkit-flex: 0 0 auto;
flex: 0 0 auto;

.defer-btn,
.publish-btn,
.reject-btn {
text-shadow: 1px 1px 0 #FFF;

&.active {
color: #FFF;
text-shadow: none;
}
}

.defer-btn {
&.active {
background: $info-bg;
border-color: $info-border;
}
}

.publish-btn {
&.active {
background: $success-bg;
border-color: $success-border;
}
}

.reject-btn {
&.active {
background: $danger-bg;
border-color: $danger-border;
}
}
}

.comment-author-info {
margin-bottom: 1rem;

.author {
font-size: 1.4rem;
}

.date {
display: block;
color: $font-color-grey;
}
}

.comment-body {
margin: 0;
max-height: 40rem;
overflow-y: auto;

pre {
padding: 1.5rem;
overflow-x: hidden;
}
}

.comment-attachments {
.comment-review-btns {
-webkit-flex: 0 0 auto;
flex: 0 0 auto;
padding-right: 0.5rem;

.btn {
margin-top: 0.5rem;
min-width: 7rem;
}
}
}

.comment-alert {
margin-bottom: 2rem;
display: none;
}

.eao-comment-review {
.form-group {
margin-bottom: 2.5rem;

&:last-child {
margin-bottom: 0;
}
}

.comment-review-btns {
.btn {
min-width: 10rem;
padding-top: 0.7rem;
}
}
}
}


/* COMPLAINTS VIEW
------------------------------ */
Expand Down
70 changes: 40 additions & 30 deletions modules/core/client/styles/tabs.scss
Original file line number Diff line number Diff line change
@@ -1,39 +1,49 @@
$tab-active-bg: #5091cd;
$tab-active-border: #4187c9;
$tab-active-color: #fff;

.pcp-tab-content {
.tab-pane {
padding-top: 1.4rem;
}

.btn-sm {
padding: 0.65rem 1rem;
}
.toggle-tabs {
display: inline-block;
margin: 0;
padding: 0;
list-style-type: none;

li {
position: relative;
float: left;
margin-left: -1px;
z-index: 1;

.nav-pills {
> li {
> a {
padding: 0.8rem 1.2rem;
font-size: 1.2rem;
font-weight: bold;
background: #DDD;
color: #777;
text-shadow: 0 0 1px #FFF;

&:hover {
background-color: #CCC;
color: #494949;
}
&:hover {
z-index: 2;
}

.btn {
border-radius: 0;
}

&:first-child {
.btn {
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
}
}

&:last-child {
.btn {
border-top-right-radius: 4px;
border-bottom-right-radius: 4px;
}
}

&.active {
> a {
color: #FFF;
background-color: #1a5a96;
text-shadow: 0 0 1px #1a5a96;
&.active {
z-index: 2;

&:focus {
background-color: #1a5a96;
}
}
.btn {
background: $tab-active-bg;
border-color: $tab-active-border;
color: $tab-active-color;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion modules/documents/client/styles/file-browser.scss
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,7 @@ $fb-upload-target-border: 2px dashed #BBB;
}

.fb-upload-target-msg {
font-size: 1.6rem;
font-size: 1.4rem;
font-weight: bold;
color: #999;

Expand Down
3 changes: 2 additions & 1 deletion modules/documents/client/views/document-manager-upload.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<div class="fb-body">

<!-- FILE BROWSER LIST -->
<!-- TODO consider replacing the following div and contents with <x-file-upload-listing> -->
<div class="fb-list">

<div class="column-header">
Expand All @@ -38,7 +39,7 @@
<span>File Size</span>
</div>
</div>

<ul>
<li class="fb-list-item" ng-class="{'has-error': f.failed}" ng-repeat="f in uploadService.fileList">
<span class="fb-col-group">
Expand Down
Loading