Просмотр исходного кода

WIP: apply bootstrap theme

* BugFix Button style
Yuki Takei 8 лет назад
Родитель
Сommit
175ecaa8dc

+ 1 - 1
lib/views/crowi-plus/widget/comments.html

@@ -35,7 +35,7 @@
             <input type="hidden" name="commentForm[revision_id]" value="{{ revision._id.toString() }}">
             <div class="pull-right">
               <span class="text-danger" id="comment-form-message"></span>
-              <button type="submit" id="comment-form-button" class="btn btn-primary form-inline" {% if not user %}disabled{% endif %}>
+              <button type="submit" id="comment-form-button" class="fcbtn btn btn-sm btn-outline btn-rounded btn-primary btn-1f" {% if not user %}disabled{% endif %}>
                 Comment
               </button>
             </div>

+ 3 - 3
resource/js/components/PageComment/Comment.js

@@ -75,9 +75,9 @@ export default class Comment extends React.Component {
             <a className={revisionLavelClassName} href={revHref}>{revFirst8Letters}</a>
           </div>
           <div className="page-comment-control">
-            <a className="btn btn-link" onClick={this.deleteBtnClickedHandler}>
-              <i className="fa fa-trash-o"></i>
-            </a>
+            <button className="btn btn-link" onClick={this.deleteBtnClickedHandler}>
+              <i className="ti-close"></i>
+            </button>
           </div>
         </div>
       </div>

+ 0 - 17
resource/styles/scss/_comment.scss

@@ -88,23 +88,6 @@
       }
     }
 
-    .page-comment.page-comment-me {
-      //color: lighten($crowiHeaderBackground, 65%);
-      // color: $crowiHeaderBackground;
-      .page-comment-main {
-
-        .page-comment-body,
-        .page-comment-creator,
-        .page-comment-meta {
-        }
-
-        .page-comment-meta {
-          //background: lighten($crowiHeaderBackground, 65%);
-        }
-      }
-
-    }
-
   }
 }
 

+ 1 - 1
resource/styles/scss/_override-agileadmin.scss

@@ -97,7 +97,7 @@
  * Button
  */
 .btn {
-  &:not(.btn-rounded) {
+  &:not(.btn-rounded):not(.btn-circle) {
     border-radius: 0;
   }
 }