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

WIP: apply bootstrap theme

* notification alert
Yuki Takei 8 лет назад
Родитель
Сommit
1aa5957501
3 измененных файлов с 3 добавлено и 40 удалено
  1. 3 1
      lib/views/page.html
  2. 0 2
      resource/styles/agile-admin/inverse/widgets.scss
  3. 0 37
      resource/styles/scss/crowi.scss

+ 3 - 1
lib/views/page.html

@@ -209,7 +209,9 @@
   </div>
   </div>
   {% endif %}
   {% endif %}
 
 
-  <div id="notifPageEdited" class="fk-notif fk-notif-danger"><i class="fa fa-exclamation-triangle"></i> <span class="edited-user"></span> {{ t('edited this page') }} <a href="javascript:location.reload();"><i class="fa fa-angle-double-right"></i> {{ t('Load latest') }}</a></div>
+  <div id="notifPageEdited" class="myadmin-alert alert-warning myadmin-alert-bottom alertbottom2">
+    <i class="fa fa-exclamation-triangle"></i> <span class="edited-user"></span> {{ t('edited this page') }} <a href="javascript:location.reload();"><i class="fa fa-angle-double-right"></i> {{ t('Load latest') }}</a>
+  </div>
 </div>
 </div>
 
 
 {% block content_main_after %}
 {% block content_main_after %}

+ 0 - 2
resource/styles/agile-admin/inverse/widgets.scss

@@ -506,7 +506,6 @@ Basic List
 */
 */
 
 
 /*Notification alert*/
 /*Notification alert*/
-/*
 .myadmin-alert {
 .myadmin-alert {
     border-radius: 0px;
     border-radius: 0px;
     color: #fff;
     color: #fff;
@@ -664,7 +663,6 @@ Basic List
 .alert-info a.closed:hover {
 .alert-info a.closed:hover {
     color: inherit;
     color: inherit;
 }
 }
-*/
 
 
 /*custom tab*/
 /*custom tab*/
 /*
 /*

+ 0 - 37
resource/styles/scss/crowi.scss

@@ -326,43 +326,6 @@ input.searching {
   }
   }
 }
 }
 
 
-// notification
-.fk-notif {
-  display: none;
-
-  bottom: 0;
-  left: 0;
-  width: 100%;
-  position: fixed;
-  z-index: 1029;
-  padding: 10px;
-  box-shadow: -1px 0 3px 0px #666;
-  font-weight: bold;
-  transition: all .3s;
-
-  &.fk-notif-danger {
-    background: #b94a48;
-    color: #fff;
-
-    a {
-      color: #f5ecf4;
-      text-decoration: underline;
-      &:hover {
-        text-decoration: none;
-      }
-    }
-  }
-
-  &.fk-notif-warning {
-    background: #fcf8e3;
-    color: #8a6d3b;
-  }
-}
-.on-edit .fk-notif {
-  bottom: 50px;
-  z-index: 1061;
-}
-
 // external-services
 // external-services
 .crowi {
 .crowi {
   .github-link {
   .github-link {