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

WIP: reconstruct layouts

* editor controls
Yuki Takei 8 лет назад
Родитель
Сommit
2c94b98b39
2 измененных файлов с 7 добавлено и 13 удалено
  1. 5 10
      lib/views/_form.html
  2. 2 3
      resource/styles/scss/_on-edit.scss

+ 5 - 10
lib/views/_form.html

@@ -21,19 +21,14 @@
   <input type="hidden" id="form-body" name="pageForm[body]" value="{% if pageForm.body %}{{ pageForm.body }}{% endif %}">
   <input type="hidden" name="pageForm[path]" value="{{ path }}">
   <input type="hidden" name="pageForm[currentRevision]" value="{{ pageForm.currentRevision|default(page.revision._id.toString()) }}">
-  <div class="form-submit-group form-group form-inline">
-    {#<button class="btn btn-default">
-      <i class="fa fa-file-text"></i>
-      ファイルを追加 ...
-    </button>#}
-
-    <div class="pull-left">
+  <div class="form-submit-group form-group form-inline d-flex justify-content-between">
+    <div>
       <div id="page-editor-options-selector"></div>
     </div>
 
-    <div class="pull-right form-inline page-form-setting" id="page-form-setting" data-slack-configured="{{ slackConfigured() }}">
+    <div class="form-inline page-form-setting d-flex" id="page-form-setting" data-slack-configured="{{ slackConfigured() }}">
       {% if slackConfigured() %}
-      <span class="input-group extended-setting">
+      <span class="input-group extended-setting m-r-5">
         <span class="input-group-addon">
           <label>
             <i class="fa fa-slack"></i>
@@ -54,7 +49,7 @@
       {% if forceGrant %}
       <input type="hidden" name="pageForm[grant]" value="{{ forceGrant }}">
       {% else %}
-      <select name="pageForm[grant]" class="form-control">
+      <select name="pageForm[grant]" class="form-control m-r-5">
         {% for grantId, grantLabel in consts.pageGrants %}
         <option value="{{ grantId }}" {% if pageForm.grant|default(page.grant) == grantId %}selected{% endif %}>{{ t(grantLabel) }}</option>
         {% endfor %}

+ 2 - 3
resource/styles/scss/_on-edit.scss

@@ -262,13 +262,12 @@ body.on-edit {
         background-color: inherit;
       }
     }
-  }
 
-  @media (max-width: $screen-xs-max) { // {{{ less than smartphone size
-    #page-editor-options-selector {
+    @media (max-width: $screen-xs-max) { // {{{ less than smartphone size
       display: none;
     }
   }
+
 } // }}}
 
 /*