Skip to content

Commit

Permalink
Merge pull request #262 from sparc-request/kg-user_portal_display_bugs
Browse files Browse the repository at this point in the history
KG - User Portal Display Bugs
  • Loading branch information
kyle-glick committed Jan 28, 2016
2 parents c04e02a + 66adf8e commit d752ede
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions app/assets/javascripts/portal/protocols.js.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ $(document).ready ->
)

$(document).on('click', '.archive_button', ->
$('.search_protocols').hide()
$('#protocol-accordion').hide()
$('.loading_protocol').show()
include_archived = 'true'

Expand All @@ -97,7 +97,7 @@ $(document).ready ->
$('.archive_button').data('showing-archived', 0)
$('.archive_button').text("Show All Projects/Studies")
$('.loading_protocol').hide()
$('.search_protocols').show()
$('#protocol-accordion').show()
)

$('.view-sub-service-request-button').live('click', ->
Expand Down
8 changes: 5 additions & 3 deletions app/assets/stylesheets/portal/layout.css.sass
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ h2.title

.dashboard-view
float: left
overflow: hidden
h3.blue-provider.ui-accordion-header
border: 0px !important
.row-portal-header
Expand All @@ -183,6 +184,7 @@ h2.title
.portal_create_new_project
float: right
position: relative
top: -3
.new-study-text
margin-left: 17px
.new-project-text
Expand Down Expand Up @@ -489,15 +491,15 @@ div.permissions_dialog
background-color: white
border: 3px solid #FF0000
display: none
left: -221px
left: -287px
padding: 10px 1px 1px
position: absolute
top: 57px
width: 443px
width: 510px
z-index: 1000
table
border-collapse: collapse
width: 100%
width: 500px
tr:hover
cursor: pointer
tr.read_notification
Expand Down

0 comments on commit d752ede

Please sign in to comment.