File tree Expand file tree Collapse file tree 6 files changed +41
-8
lines changed
projects/detail/containers Expand file tree Collapse file tree 6 files changed +41
-8
lines changed Original file line number Diff line number Diff line change 1414 padding : $base-unit * 2 $base-unit * 6 ;
1515 }
1616
17+ .Dropdown li :not (:last-child ) {
18+ a {
19+ border-bottom : 1px solid $tc-gray-10 ;
20+ display : block ;
21+ }
22+ }
1723 .edit-toggle-container {
1824 display : inline ;
1925 float : right ;
3945 }
4046 .dropdown-menu-list a {
4147 text-decoration :none ;
48+ font-weight :400 ;
49+ padding :0px ;
50+ & :hover {
51+ background :transparent ;
52+ }
53+ }
54+ .dropdown-menu-list li {
55+ padding :0px 20px 0 20px ;
56+ & :hover {
57+ background :$tc-gray-10 ;
58+ }
4259 }
4360
61+
62+
4463 .pointer-shadow .dropdown-menu-list {
4564 transform :translate (-50% ,0% );
4665 }
4766 .pointer-shadow .dropdown-menu-list ::before {
4867 content : ' ' ;
4968 display : block ;
5069 position : absolute ;
51- top : -3 px ;
70+ top : -6 px ;
5271 right :14px ;
5372 margin-left :-24px ;
5473 width : 12px ;
207226 margin-bottom : -10px ;
208227 width : calc (100% - 40px );
209228
229+
210230 & .self {
211231 background : $tc-dark-blue-10 ;
212232
232252 }
233253 }
234254
255+ .commentEdit {
256+ padding-left :0px ;
257+ padding-right :0px ;
258+ }
259+
235260 .comment-form {
236261 textarea ,
237262 input {
657682
658683.action-area {
659684 margin-top :45px ;
685+ }
686+
687+ .dropdownContainer {
688+ display :inline ;
660689}
Original file line number Diff line number Diff line change @@ -36,7 +36,7 @@ export default class CommentEditToggle extends React.Component {
3636 const editOptions = { label :this . props . forTopic ? 'Edit post' : 'Edit comment' , val :'1' }
3737 const deleteOptions = { label :this . props . forTopic ? 'Delete post' : 'Delete comment' , val :'2' }
3838 return (
39- < div >
39+ < div className = "dropdownContainer" >
4040 < Dropdown pointerShadow className = "drop-down edit-toggle-container" >
4141 < div className = { cn ( 'dropdown-menu-header' , 'edit-toggle' , { 'for-topic' : this . props . forTopic } ) } >
4242 </ div >
Original file line number Diff line number Diff line change @@ -193,7 +193,7 @@ class RichTextArea extends React.Component {
193193 < div className = "portrait" >
194194 < Avatar avatarUrl = { avatarUrl } userName = { authorName } />
195195 </ div >
196- < div className = { cn ( 'object' , { comment : disableTitle } ) } >
196+ < div className = { cn ( 'object' , { comment : disableTitle } , 'commentEdit' ) } >
197197 < input
198198 ref = "title" value = { titleValue }
199199 className = { cn ( 'new-post-title' , { 'hide-title' : disableTitle } ) }
@@ -237,17 +237,17 @@ class RichTextArea extends React.Component {
237237 </ div >
238238 < div className = "tc-btns" >
239239 { editMode && ! isCreating &&
240- < button className = "tc-btn-link" onClick = { this . cancelEdit } >
240+ < button className = "tc-btn-link postActionButton " onClick = { this . cancelEdit } >
241241 Cancel
242242 </ button >
243243 }
244244 { editMode &&
245- < button className = "tc-btn tc-btn-primary tc-btn-sm" onClick = { this . onPost } disabled = { ! canSubmit } >
245+ < button className = "tc-btn tc-btn-primary tc-btn-sm postActionButton " onClick = { this . onPost } disabled = { ! canSubmit } >
246246 { isCreating ? 'Saving...' : 'Save changes' }
247247 </ button >
248248 }
249249 { ! editMode &&
250- < button className = "tc-btn tc-btn-primary tc-btn-sm" onClick = { this . onPost } disabled = { ! canSubmit } >
250+ < button className = "tc-btn tc-btn-primary tc-btn-sm postActionButton " onClick = { this . onPost } disabled = { ! canSubmit } >
251251 { isCreating ? 'Posting...' : 'Post' }
252252 </ button >
253253 }
Original file line number Diff line number Diff line change 2929
3030.hide-title {
3131 display : none !important ;
32+ }
33+
34+ .postActionButton {
35+ font-size :13px ;
3236}
Original file line number Diff line number Diff line change @@ -74,7 +74,7 @@ class FeedView extends React.Component {
7474 // Notify user if they navigate away while the form is modified.
7575 onLeave ( e ) {
7676 if ( this . isChanged ( ) ) {
77- return e . returnValue = 'You haven\'t saved your edits. Leaving this page would discard all edits . Are you sure you want to leave?'
77+ return e . returnValue = 'You haven\'t posted your message. If you leave this page, your message will not be saved . Are you sure you want to leave?'
7878 }
7979 }
8080
Original file line number Diff line number Diff line change @@ -79,7 +79,7 @@ class MessagesView extends React.Component {
7979 // Notify user if they navigate away while the form is modified.
8080 onLeave ( e ) {
8181 if ( this . isChanged ( ) ) {
82- return e . returnValue = 'You haven\'t saved your edits. Leaving this page would discard all edits . Are you sure you want to leave?'
82+ return e . returnValue = 'You haven\'t posted your message. If you leave this page, your message will not be saved . Are you sure you want to leave?'
8383 }
8484 }
8585
You can’t perform that action at this time.
0 commit comments