Bläddra i källkod

improve create-page modal

Yuki Takei 9 år sedan
förälder
incheckning
67e548b8bd
2 ändrade filer med 15 tillägg och 8 borttagningar
  1. 14 7
      resource/css/crowi.scss
  2. 1 1
      resource/js/legacy/crowi.js

+ 14 - 7
resource/css/crowi.scss

@@ -6,16 +6,16 @@ $bootstrap-sass-asset-helper: true;
 @import "~bootstrap-sass/assets/stylesheets/bootstrap";
 @import "~bootstrap-sass/assets/stylesheets/bootstrap";
 
 
 // crowi component
 // crowi component
-@import 'layout';
-@import 'page';
-@import 'page_list';
-@import 'form';
-@import 'wiki';
 @import 'admin';
 @import 'admin';
 @import 'comment';
 @import 'comment';
-@import 'user';
+@import 'form';
+@import 'layout';
+@import 'page_list';
+@import 'page';
 @import 'portal';
 @import 'portal';
 @import 'search';
 @import 'search';
+@import 'user';
+@import 'wiki';
 
 
 
 
 ul {
 ul {
@@ -102,6 +102,13 @@ footer {
 }
 }
 
 
 .modal.create-page {
 .modal.create-page {
+
+  @media (min-width: 768px) {
+    .modal-dialog {
+      width: 750px;
+    }
+  }
+
   .modal-body {
   .modal-body {
     h3, h4 {
     h3, h4 {
       margin-bottom: 10px;
       margin-bottom: 10px;
@@ -142,7 +149,7 @@ footer {
         display: inline-block;
         display: inline-block;
       }
       }
       .page-today-input2 {
       .page-today-input2 {
-        width: 100%;
+        // width: 100%;
         display: inline-block;
         display: inline-block;
       }
       }
     }
     }

+ 1 - 1
resource/js/legacy/crowi.js

@@ -223,7 +223,7 @@ $(function() {
 
 
   $('#create-page').on('shown.bs.modal', function (e) {
   $('#create-page').on('shown.bs.modal', function (e) {
 
 
-    var input2Width = $('#create-page-today .col-xs-10').outerWidth();
+    var input2Width = $('#create-page-today .col-xs-10').outerWidth() - 1;
     var newWidth = input2Width
     var newWidth = input2Width
       - $('#create-page-today .page-today-prefix').outerWidth()
       - $('#create-page-today .page-today-prefix').outerWidth()
       - $('#create-page-today .page-today-input1').outerWidth()
       - $('#create-page-today .page-today-input1').outerWidth()