itizawa 6 лет назад
Родитель
Сommit
e2220239c7

+ 2 - 2
src/client/js/components/Admin/Users/UserInviteModal.jsx

@@ -87,7 +87,7 @@ class UserInviteModal extends React.Component {
         <div>
         <div>
           <button
           <button
             type="button"
             type="button"
-            className="btn-fill btn btn-outline-light rounded-pill mr-2"
+            className="btn btn-outline-danger rounded-pill mr-2"
             onClick={this.onToggleModal}
             onClick={this.onToggleModal}
           >
           >
             Cancel
             Cancel
@@ -95,7 +95,7 @@ class UserInviteModal extends React.Component {
 
 
           <button
           <button
             type="button"
             type="button"
-            className="btn-fill btn btn-outline-primary rounded-pill btn-1b"
+            className="btn btn-outline-primary rounded-pill"
             onClick={this.handleSubmit}
             onClick={this.handleSubmit}
             disabled={!this.validEmail()}
             disabled={!this.validEmail()}
           >
           >

+ 1 - 1
src/client/js/components/InstallerForm.jsx

@@ -142,7 +142,7 @@ class InstallerForm extends React.Component {
             <input type="hidden" name="_csrf" value={this.props.csrf} />
             <input type="hidden" name="_csrf" value={this.props.csrf} />
 
 
             <div className="input-group mt-4 mb-3 d-flex justify-content-center">
             <div className="input-group mt-4 mb-3 d-flex justify-content-center">
-              <button type="submit" className="btn-fill btn btn-success btn-1b btn-register">
+              <button type="submit" className="btn-fill btn btn-success btn-register">
                 <span className="btn-label"><i className="icon-user-follow" /></span>
                 <span className="btn-label"><i className="icon-user-follow" /></span>
                 <span className="btn-label-text">{ this.props.t('Create') }</span>
                 <span className="btn-label-text">{ this.props.t('Create') }</span>
               </button>
               </button>

+ 2 - 2
src/client/js/components/PageComment/CommentEditor.jsx

@@ -224,7 +224,7 @@ class CommentEditor extends React.Component {
 
 
     const errorMessage = <span className="text-danger text-right mr-2">{this.state.errorMessage}</span>;
     const errorMessage = <span className="text-danger text-right mr-2">{this.state.errorMessage}</span>;
     const cancelButton = (
     const cancelButton = (
-      <Button outline color="danger" size="xs" className="btn-fill rounded-pill" onClick={this.toggleEditor}>
+      <Button outline color="danger" size="xs" className="btn btn-outline-danger rounded-pill" onClick={this.toggleEditor}>
         Cancel
         Cancel
       </Button>
       </Button>
     );
     );
@@ -232,7 +232,7 @@ class CommentEditor extends React.Component {
       <Button
       <Button
         outline
         outline
         color="primary"
         color="primary"
-        className="btn-fill rounded-pill btn-1b"
+        className="btn btn-outline-primary rounded-pill"
         onClick={this.postHandler}
         onClick={this.postHandler}
       >
       >
         Comment
         Comment

+ 1 - 1
src/server/views/invited.html

@@ -84,7 +84,7 @@
 
 
         <input type="hidden" name="_csrf" value="{{ csrf() }}">
         <input type="hidden" name="_csrf" value="{{ csrf() }}">
         <div class="input-group mt-5 m-b-20 d-flex justify-content-center">
         <div class="input-group mt-5 m-b-20 d-flex justify-content-center">
-          <button type="submit" class="btn-fill btn btn-success btn-1b btn-register">
+          <button type="submit" class="btn-fill btn btn-success btn-register">
             <span class="btn-label"><i class="icon-user-follow"></i></span>
             <span class="btn-label"><i class="icon-user-follow"></i></span>
             {{ t('Create') }}
             {{ t('Create') }}
           </button>
           </button>

+ 3 - 3
src/server/views/modal/create_page.html

@@ -21,7 +21,7 @@
                   <input type="text" data-prefix="/{{ now|datetz('Y/m/d') }}/" class="page-today-input2 form-control" id="page-today-input2" name="" placeholder="{{ t('Input page name (optional)') }}">
                   <input type="text" data-prefix="/{{ now|datetz('Y/m/d') }}/" class="page-today-input2 form-control" id="page-today-input2" name="" placeholder="{{ t('Input page name (optional)') }}">
                 </div>
                 </div>
                 <div class="create-page-button-container">
                 <div class="create-page-button-container">
-                  <button type="submit" class="btn-fill btn btn-outline-primary rounded-pill btn-1b"><i class="icon-fw icon-doc"></i>{{ t('Create') }}</button>
+                  <button type="submit" class="btn btn-outline-primary rounded-pill"><i class="icon-fw icon-doc"></i>{{ t('Create') }}</button>
                 </div>
                 </div>
               </div>
               </div>
             </fieldset>
             </fieldset>
@@ -41,7 +41,7 @@
                   {% endif %}
                   {% endif %}
                 </div>
                 </div>
                 <div class="create-page-button-container">
                 <div class="create-page-button-container">
-                  <button type="submit" class="btn-fill btn btn-outline-primary rounded-pill btn-1b"><i class="icon-fw icon-doc"></i>{{ t('Create') }}</button>
+                  <button type="submit" class="btn btn-outline-primary rounded-pill"><i class="icon-fw icon-doc"></i>{{ t('Create') }}</button>
                 </div>
                 </div>
               </div>
               </div>
             </fieldset>
             </fieldset>
@@ -72,7 +72,7 @@
 
 
               </div>
               </div>
               <div class="create-page-button-container my-auto">
               <div class="create-page-button-container my-auto">
-                <a id="link-to-template" href="{{ page.path || path }}" class="btn-fill btn btn-outline-primary rounded-pill btn-1b disabled">
+                <a id="link-to-template" href="{{ page.path || path }}" class="btn btn-outline-primary rounded-pill disabled">
                   <i class="icon-fw icon-doc"></i>
                   <i class="icon-fw icon-doc"></i>
                   <span id="create-template-button-link">{{ t('Edit') }}</span>
                   <span id="create-template-button-link">{{ t('Edit') }}</span>
                 </a>
                 </a>