Remove boxes around code comments
This commit is contained in:
		
							parent
							
								
									076c3a9878
								
							
						
					
					
						commit
						63e2c97b36
					
				| 
						 | 
					@ -394,7 +394,7 @@ Please check your network connection and try again.`;
 | 
				
			||||||
                  <div class="discussion-with-resolve-btn">
 | 
					                  <div class="discussion-with-resolve-btn">
 | 
				
			||||||
                    <button
 | 
					                    <button
 | 
				
			||||||
                      type="button"
 | 
					                      type="button"
 | 
				
			||||||
                      class="js-vue-discussion-reply btn btn-text-field mr-sm-2 qa-discussion-reply"
 | 
					                      class="js-vue-discussion-reply btn btn-text-field qa-discussion-reply"
 | 
				
			||||||
                      title="Add a reply"
 | 
					                      title="Add a reply"
 | 
				
			||||||
                      @click="showReplyForm"
 | 
					                      @click="showReplyForm"
 | 
				
			||||||
                    >
 | 
					                    >
 | 
				
			||||||
| 
						 | 
					@ -403,7 +403,7 @@ Please check your network connection and try again.`;
 | 
				
			||||||
                    <div v-if="discussion.resolvable">
 | 
					                    <div v-if="discussion.resolvable">
 | 
				
			||||||
                      <button
 | 
					                      <button
 | 
				
			||||||
                        type="button"
 | 
					                        type="button"
 | 
				
			||||||
                        class="btn btn-default mr-sm-2"
 | 
					                        class="btn btn-default ml-sm-2"
 | 
				
			||||||
                        @click="resolveHandler();"
 | 
					                        @click="resolveHandler();"
 | 
				
			||||||
                      >
 | 
					                      >
 | 
				
			||||||
                        <i v-if="isResolving" aria-hidden="true" class="fa fa-spinner fa-spin"></i>
 | 
					                        <i v-if="isResolving" aria-hidden="true" class="fa fa-spinner fa-spin"></i>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -36,7 +36,6 @@
 | 
				
			||||||
  &:target,
 | 
					  &:target,
 | 
				
			||||||
  &.target {
 | 
					  &.target {
 | 
				
			||||||
    background: $line-target-blue;
 | 
					    background: $line-target-blue;
 | 
				
			||||||
    margin-bottom: $gl-padding;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    &.system-note .note-body .note-text.system-note-commit-list::after {
 | 
					    &.system-note .note-body .note-text.system-note-commit-list::after {
 | 
				
			||||||
      background: linear-gradient(rgba($line-target-blue, 0.1) -100px, $line-target-blue 100%);
 | 
					      background: linear-gradient(rgba($line-target-blue, 0.1) -100px, $line-target-blue 100%);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -255,7 +255,6 @@ table {
 | 
				
			||||||
    display: flex;
 | 
					    display: flex;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
  .discussion-actions {
 | 
					  .discussion-actions {
 | 
				
			||||||
    display: table;
 | 
					    display: table;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -276,8 +275,10 @@ table {
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  .btn {
 | 
					  @include media-breakpoint-down(xs) {
 | 
				
			||||||
    width: 100%;
 | 
					    .btn {
 | 
				
			||||||
 | 
					      width: 100%;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  .btn-text-field {
 | 
					  .btn-text-field {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -27,8 +27,10 @@ $note-form-margin-left: 72px;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.main-notes-list {
 | 
					.issuable-discussion {
 | 
				
			||||||
  @include vertical-line(36px);
 | 
					  .main-notes-list {
 | 
				
			||||||
 | 
					    @include vertical-line(36px);
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.notes {
 | 
					.notes {
 | 
				
			||||||
| 
						 | 
					@ -76,10 +78,10 @@ $note-form-margin-left: 72px;
 | 
				
			||||||
    .card {
 | 
					    .card {
 | 
				
			||||||
      border: 0;
 | 
					      border: 0;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    li.note {
 | 
					  li.note {
 | 
				
			||||||
      border-bottom: 1px solid $border-color;
 | 
					    border-bottom: 1px solid $border-color;
 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  .replies-toggle {
 | 
					  .replies-toggle {
 | 
				
			||||||
| 
						 | 
					@ -161,19 +163,6 @@ $note-form-margin-left: 72px;
 | 
				
			||||||
    position: relative;
 | 
					    position: relative;
 | 
				
			||||||
    border-bottom: 0;
 | 
					    border-bottom: 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    &:target,
 | 
					 | 
				
			||||||
    &.target {
 | 
					 | 
				
			||||||
      border-bottom: 1px solid $white-normal;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
      &:not(:first-child) {
 | 
					 | 
				
			||||||
        border-top: 1px solid $white-normal;
 | 
					 | 
				
			||||||
      }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
      .timeline-entry-inner {
 | 
					 | 
				
			||||||
        border-bottom: 0;
 | 
					 | 
				
			||||||
      }
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    &.being-posted {
 | 
					    &.being-posted {
 | 
				
			||||||
      pointer-events: none;
 | 
					      pointer-events: none;
 | 
				
			||||||
      opacity: 0.5;
 | 
					      opacity: 0.5;
 | 
				
			||||||
| 
						 | 
					@ -461,7 +450,7 @@ $note-form-margin-left: 72px;
 | 
				
			||||||
    font-family: $regular-font;
 | 
					    font-family: $regular-font;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    td {
 | 
					    td {
 | 
				
			||||||
      border: 1px solid $white-normal;
 | 
					      border: 1px solid $border-color;
 | 
				
			||||||
      border-left: 0;
 | 
					      border-left: 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      &.notes_content {
 | 
					      &.notes_content {
 | 
				
			||||||
| 
						 | 
					@ -503,8 +492,6 @@ $note-form-margin-left: 72px;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  .note-wrapper {
 | 
					  .note-wrapper {
 | 
				
			||||||
    @include outline-comment();
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    &.system-note {
 | 
					    &.system-note {
 | 
				
			||||||
      border: 0;
 | 
					      border: 0;
 | 
				
			||||||
      margin-left: 20px;
 | 
					      margin-left: 20px;
 | 
				
			||||||
| 
						 | 
					@ -518,10 +505,6 @@ $note-form-margin-left: 72px;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.commit-diff {
 | 
					.commit-diff {
 | 
				
			||||||
  .notes {
 | 
					 | 
				
			||||||
    @include vertical-line(52px);
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  .notes_content {
 | 
					  .notes_content {
 | 
				
			||||||
    background-color: $white-light;
 | 
					    background-color: $white-light;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
| 
						 | 
					@ -937,12 +920,6 @@ $note-form-margin-left: 72px;
 | 
				
			||||||
    border-bottom: 1px solid $border-color;
 | 
					    border-bottom: 1px solid $border-color;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  .note-wrapper.outlined {
 | 
					 | 
				
			||||||
    margin: 0;
 | 
					 | 
				
			||||||
    border: 0;
 | 
					 | 
				
			||||||
    border-radius: 0;
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  .discussion-form-container {
 | 
					  .discussion-form-container {
 | 
				
			||||||
    padding: $gl-padding;
 | 
					    padding: $gl-padding;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -5,7 +5,7 @@
 | 
				
			||||||
- note_editable = can?(current_user, :admin_note, note)
 | 
					- note_editable = can?(current_user, :admin_note, note)
 | 
				
			||||||
- note_counter = local_assigns.fetch(:note_counter, 0)
 | 
					- note_counter = local_assigns.fetch(:note_counter, 0)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
%li.timeline-entry.note-wrapper.outlined{ id: dom_id(note),
 | 
					%li.timeline-entry.note-wrapper{ id: dom_id(note),
 | 
				
			||||||
  class: ["note", "note-row-#{note.id}", ('system-note' if note.system)],
 | 
					  class: ["note", "note-row-#{note.id}", ('system-note' if note.system)],
 | 
				
			||||||
  data: { author_id: note.author.id,
 | 
					  data: { author_id: note.author.id,
 | 
				
			||||||
    editable: note_editable,
 | 
					    editable: note_editable,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue