Procházet zdrojové kódy

WIP: apply bootstrap theme

* buttons
    * copy, edit
Yuki Takei před 8 roky
rodič
revize
a7feab1866

+ 2 - 2
lib/views/crowi-plus/widget/header.html

@@ -13,11 +13,11 @@
       {% if page %}
       {% if page %}
       <div class="flex-item-action">
       <div class="flex-item-action">
         {% if user %}
         {% if user %}
-        <a
+        <button
             data-csrftoken="{{ csrf() }}"
             data-csrftoken="{{ csrf() }}"
             data-liked="{% if page.isLiked(user) %}1{% else %}0{% endif %}"
             data-liked="{% if page.isLiked(user) %}1{% else %}0{% endif %}"
             class="like-button btn btn-default btn-outline btn-circle {% if page.isLiked(user) %}active{% endif %}"
             class="like-button btn btn-default btn-outline btn-circle {% if page.isLiked(user) %}active{% endif %}"
-        ><i class="fa fa-thumbs-o-up"></i></a>
+        ><i class="fa fa-thumbs-o-up"></i></button>
         {% endif %}
         {% endif %}
       </div>
       </div>
       <div class="flex-item-action">
       <div class="flex-item-action">

+ 1 - 1
lib/views/page.html

@@ -22,7 +22,7 @@
         <button
         <button
             data-csrftoken="{{ csrf() }}"
             data-csrftoken="{{ csrf() }}"
             data-liked="{% if page.isLiked(user) %}1{% else %}0{% endif %}"
             data-liked="{% if page.isLiked(user) %}1{% else %}0{% endif %}"
-            class="like-button btn btn-default btn-sm {% if page.isLiked(user) %}active{% endif %}"
+            class="like-button btn btn-default btn-outline btn-circle {% if page.isLiked(user) %}active{% endif %}"
         ><i class="fa fa-thumbs-o-up"></i></button>
         ><i class="fa fa-thumbs-o-up"></i></button>
         {% endif %}
         {% endif %}
       </div>
       </div>

+ 1 - 1
lib/views/page_list.html

@@ -42,7 +42,7 @@
         <button
         <button
             data-csrftoken="{{ csrf() }}"
             data-csrftoken="{{ csrf() }}"
             data-liked="{% if page.isLiked(user) %}1{% else %}0{% endif %}"
             data-liked="{% if page.isLiked(user) %}1{% else %}0{% endif %}"
-            class="like-button btn btn-default btn-sm {% if page.isLiked(user) %}active{% endif %}"
+            class="like-button btn btn-default btn-outline btn-circle {% if page.isLiked(user) %}active{% endif %}"
         ><i class="fa fa-thumbs-o-up"></i></button>
         ><i class="fa fa-thumbs-o-up"></i></button>
         {% endif %}
         {% endif %}
       </div>
       </div>

+ 1 - 1
lib/views/widget/page_side_header.html

@@ -36,7 +36,7 @@
         <button
         <button
           data-csrftoken="{{ csrf() }}"
           data-csrftoken="{{ csrf() }}"
           data-liked="{% if page.isLiked(user) %}1{% else %}0{% endif %}"
           data-liked="{% if page.isLiked(user) %}1{% else %}0{% endif %}"
-          class="like-button btn btn-default btn-sm {% if page.isLiked(user) %}active{% endif %}"
+          class="like-button btn btn-default btn-outline btn-circle {% if page.isLiked(user) %}active{% endif %}"
           ><i class="fa fa-thumbs-o-up"></i> {{ t('Like!') }}</button>
           ><i class="fa fa-thumbs-o-up"></i> {{ t('Like!') }}</button>
         {% endif %}
         {% endif %}
         </p>
         </p>

+ 3 - 3
resource/js/components/Page/RevisionPath.js

@@ -74,7 +74,7 @@ export default class RevisionPath extends React.Component {
       marginRight: "0.2em",
       marginRight: "0.2em",
     }
     }
     const editButtonStyle = {
     const editButtonStyle = {
-      fontSize: "0.6em",
+      fontSize: "0.5em",
       marginLeft: "0.5em",
       marginLeft: "0.5em",
       padding: "0 2px",
       padding: "0 2px",
     };
     };
@@ -106,9 +106,9 @@ export default class RevisionPath extends React.Component {
         </span>
         </span>
         {afterElements}
         {afterElements}
         <CopyButton buttonId="btnCopyRevisionPath" text={this.props.pagePath}
         <CopyButton buttonId="btnCopyRevisionPath" text={this.props.pagePath}
-            buttonClassName="btn btn-default btn-copy" iconClassName="fa fa-clone" />
+            buttonClassName="btn btn-default btn-copy" iconClassName="ti-layers" />
         <a href="#edit-form" className="btn btn-default btn-edit" style={editButtonStyle}>
         <a href="#edit-form" className="btn btn-default btn-edit" style={editButtonStyle}>
-          <i className="fa fa-edit"></i>
+          <i className="ti-pencil-alt"></i>
         </a>
         </a>
       </span>
       </span>
     );
     );