Sotaro KARASAWA 10 лет назад
Родитель
Сommit
5e3323b14b
3 измененных файлов с 16 добавлено и 20 удалено
  1. 2 2
      lib/views/_form.html
  2. 0 18
      resource/css/_form.scss
  3. 14 0
      resource/css/_layout.scss

+ 2 - 2
lib/views/_form.html

@@ -20,7 +20,7 @@
         ファイルを追加 ...
         ファイルを追加 ...
       </button>#}
       </button>#}
 
 
-      <div class="pull-right">
+      <div class="pull-right form-inline">
         <select name="pageForm[grant]" class="form-control">
         <select name="pageForm[grant]" class="form-control">
           {% for grantId, grantLabel in consts.pageGrants %}
           {% for grantId, grantLabel in consts.pageGrants %}
           <option value="{{ grantId }}" {% if pageForm.grant|default(page.grant) == grantId %}selected{% endif %}>{{ grantLabel }}</option>
           <option value="{{ grantId }}" {% if pageForm.grant|default(page.grant) == grantId %}selected{% endif %}>{{ grantLabel }}</option>
@@ -30,7 +30,7 @@
       </div>
       </div>
     </div>
     </div>
   </form>
   </form>
-  <div class="col-md-6">
+  <div class="col-md-6 hidden-sm hidden-xs">
     <div id="preview-body" class="wiki preview-body">
     <div id="preview-body" class="wiki preview-body">
     </div>
     </div>
   </div>
   </div>

+ 0 - 18
resource/css/_form.scss

@@ -1,8 +1,4 @@
 
 
-.form-full {
-  width: 99%;
-}
-
 textarea {
 textarea {
   font-family: menlo, monaco, consolas, monospace;
   font-family: menlo, monaco, consolas, monospace;
   line-height: 1.1em;
   line-height: 1.1em;
@@ -18,17 +14,3 @@ input::-webkit-input-placeholder {
 input:-moz-placeholder {
 input:-moz-placeholder {
   color: #ccc;
   color: #ccc;
 }
 }
-
-
-.form-maximized {
-  position: absolute;
-  background: #fff;
-  top: 0;
-  left: 0;
-  margin: 0;
-  padding: 0;
-  width: 100%;
-  height: 100%;
-  z-index: 100;
-  -webkit-transition: opacity 1s linear;
-}

+ 14 - 0
resource/css/_layout.scss

@@ -477,7 +477,9 @@
     }
     }
 
 
     .form-group.form-submit-group {
     .form-group.form-submit-group {
+
       position: fixed;
       position: fixed;
+      z-index: 1054;
       bottom: 0;
       bottom: 0;
       width: 100%;
       width: 100%;
       left: 0;
       left: 0;
@@ -576,6 +578,18 @@
 
 
 } // }}}
 } // }}}
 
 
+@media (max-width: $screen-sm-max) { // {{{ less than tablet size
+
+  .content-main.on-edit {
+    .form-group.form-submit-group {
+      select.form-control {
+        display: inline-block;
+        width: auto;
+      }
+    }
+  }
+
+} // }}}
 
 
 @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) { // {{{ tablet size
 @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) { // {{{ tablet size
   .crowi.main-container { // {{{
   .crowi.main-container { // {{{