Adjust CSS for thread layout improvements

Adjust CSS not contained within `Thread` to account for annotations
displayed within nested threads.

src/sidebar/components/annotation.js

@@ -117,15 +117,15 @@ function Annotation({
       {isEditing && <TagEditor onEditTags={onEditTags} tagList={tags} />}
       {!isEditing && <TagList annotation={annotation} tags={tags} />}
       <footer className="annotation__footer">
-        <div className="annotation__form-actions">
-          {isEditing && (
+        {isEditing && (
+          <div className="annotation__form-actions">
             <AnnotationPublishControl
               annotation={annotation}
               isDisabled={isEmpty}
               onSave={onSave}
             />
-          )}
-        </div>
+          </div>
+        )}
         {shouldShowLicense && <AnnotationLicense />}
         <div className="annotation__controls">
           {shouldShowReplyToggle && (

src/styles/sidebar/components/annotation-header.scss

@@ -10,6 +10,7 @@
 
   &__row {
     display: flex;
+    flex-wrap: wrap-reverse;
     align-items: baseline;
   }