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

rename #toggle-sidebar -> #toggle-crowi-sidebar

Yuki Takei 6 лет назад
Родитель
Сommit
71e435212f

+ 1 - 1
src/client/js/legacy/crowi.js

@@ -221,7 +221,7 @@ $(() => {
   $('[data-toggle="tooltip"]').tooltip();
   $('[data-tooltip-stay]').tooltip('show');
 
-  $('#toggle-sidebar').click((e) => {
+  $('#toggle-crowi-sidebar').click((e) => {
     const $mainContainer = $('.main-container');
     if ($mainContainer.hasClass('aside-hidden')) {
       $('.main-container').removeClass('aside-hidden');

+ 2 - 2
src/client/styles/scss/_layout_crowi_sidebar.scss

@@ -174,7 +174,7 @@
   }
 }
 
-body:not(.aside-hidden) #toggle-sidebar {
+body:not(.aside-hidden) #toggle-crowi-sidebar {
   i.ti-angle-left {
     display: none;
   }
@@ -184,7 +184,7 @@ body:not(.aside-hidden) #toggle-sidebar {
 }
 
 .aside-hidden {
-  #toggle-sidebar {
+  #toggle-crowi-sidebar {
     right: 0;
     i.ti-angle-right {
       display: block;

+ 1 - 1
src/client/styles/scss/_on-edit.scss

@@ -55,7 +55,7 @@ body.on-edit {
   }
 
   // hide unnecessary elements for crowi layout
-  #toggle-sidebar,
+  #toggle-crowi-sidebar,
   .crowi-sidebar {
     display: none;
   }

+ 2 - 16
src/client/styles/scss/_search.scss

@@ -53,9 +53,8 @@
   }
 }
 
-// top and sidebar input styles
-.search-top,
-.search-sidebar {
+// input styles
+.search-top {
   .search-clear {
     top: 3px;
     right: 26px;
@@ -107,19 +106,6 @@
   }
 }
 
-.search-sidebar {
-  .search-form,
-  .form-group,
-  .rbt-input.form-control,
-  .input-group {
-    width: 100%;
-  }
-
-  .btn-group-submit-search {
-    right: 30px;
-  }
-}
-
 .search-result {
   .search-result-list {
     nav {

+ 1 - 1
src/server/views/layout-crowi/base/layout.html

@@ -10,7 +10,7 @@
 {% block layout_main %}
 <div class="container-fluid">
 
-  <a href="" class=" hidden-xs hidden-sm layout-control" id="toggle-sidebar">
+  <a href="" class=" hidden-xs hidden-sm layout-control" id="toggle-crowi-sidebar">
     <i class="ti-angle-right"></i><i class="ti-angle-left"></i> <span class="hide-on-affix-top"></span>
   </a>
   <aside class="crowi-sidebar col-md-3 hidden-xs hidden-sm hidden-print">