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

WIP: apply bootstrap theme

* wiki.scss
Yuki Takei 8 лет назад
Родитель
Сommit
06517cbb49
2 измененных файлов с 16 добавлено и 58 удалено
  1. 14 56
      resource/styles/scss/_wiki.scss
  2. 2 2
      resource/styles/scss/crowi.scss

+ 14 - 56
resource/styles/scss/_wiki.scss

@@ -1,6 +1,3 @@
-// import crowi variable
-@import 'utilities';
-
 div.body {
 div.body {
   padding: 10px;
   padding: 10px;
 }
 }
@@ -34,6 +31,13 @@ div.body {
     background: #fcfcfc;
     background: #fcfcfc;
     padding: 10px;
     padding: 10px;
 
 
+    > ul {
+      padding-left: 0;
+      ul {
+        padding-left: 1em;
+      }
+    }
+
     > ul > li { // first level of li
     > ul > li { // first level of li
       margin: 4px 4px 4px 15px;
       margin: 4px 4px 4px 15px;
       padding: 5px;
       padding: 5px;
@@ -47,14 +51,18 @@ div.body {
   .revision-head-edit-button {
   .revision-head-edit-button {
     visibility: hidden;
     visibility: hidden;
     font-size: 0.6em;
     font-size: 0.6em;
-    padding-top: 4px;
-    padding-left: 10px;
   }
   }
   &:hover .revision-head-link,
   &:hover .revision-head-link,
   &:hover .revision-head-edit-button {
   &:hover .revision-head-edit-button {
     visibility: unset;
     visibility: unset;
   }
   }
 
 
+  .revision-head-link {
+    margin-left: -1em;
+  }
+  .revision-head-edit-button {
+    margin-left: 0.5em;
+  }
 
 
 }
 }
 
 
@@ -108,45 +116,14 @@ div.body {
     color: darken(gray, 10%);
     color: darken(gray, 10%);
   }
   }
 
 
-  a {
-    text-decoration: underline;
-    color: #38ad9e;
-
-    &:hover {
-      text-decoration: none;
-      color: darken(#38ad9e, 10%);
-    }
-  }
-
-/* ensure to disable in crowi-plus system
-  pre {
-    line-height: 1.4em;
-    font-size: .9em;
-    border: none;
-    background: #444;
-    color: #f0f0f0;
-    font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
-    word-wrap: break-word;
-  }
-*/
   pre {
   pre {
     border: none;
     border: none;
   }
   }
 
 
   img {
   img {
     margin: 5px 0;
     margin: 5px 0;
-/* ensure to disable in crowi-plus system
-    box-shadow: 0 0 5px 0px rgba(0,0,0,.2);
-    border: solid 1px #ccc;
-*/
     max-width: 100%;
     max-width: 100%;
   }
   }
-/* ensure to disable in crowi-plus system
-  .noborder img, .img.noborder {
-    box-shadow: none;
-    border: none;
-  }
-*/
 
 
   img.emojione {
   img.emojione {
     margin-top: -0.3em !important;
     margin-top: -0.3em !important;
@@ -214,30 +191,11 @@ div.body {
   }
   }
 
 
   .highlighted {
   .highlighted {
-    &em {
-      padding: 2px;
-      margin: 0 -2px;
-      font-weight: bold;
-    }
-    font-style: normal;
-    color: #333;
-    background-color: rgba(255,255,140,0.5);
-    border-radius: 3px;
+    @extend .bg-warning;
   }
   }
 
 
 }
 }
 
 
-
-@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) { // {{{ tablet size
-  .crowi.main-container .main .wiki {
-  }
-} // }}}
-
-@media (max-width: $screen-xs-max) { // {{{ iPhone size
-  .crowi.main-container .main .wiki {
-  }
-} // }}}
-
 @media (max-width: $screen-sm-max) { // {{{ tablet and iphone size
 @media (max-width: $screen-sm-max) { // {{{ tablet and iphone size
   .crowi.main-container .main .wiki {
   .crowi.main-container .main .wiki {
     img {
     img {

+ 2 - 2
resource/styles/scss/crowi.scss

@@ -28,8 +28,8 @@
 @import 'shortcuts';
 @import 'shortcuts';
 // @import 'user';
 // @import 'user';
 // @import 'user_crowi-plus';
 // @import 'user_crowi-plus';
-// @import 'wiki';
-// @import 'wiki_crowi-plus';
+@import 'wiki';
+@import 'wiki_crowi-plus';
 
 
 /*
 /*
 ul {
 ul {