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

WIP: apply bootstrap theme

* panel
Yuki Takei 8 лет назад
Родитель
Сommit
4eb3979acf

+ 17 - 4
resource/styles/agile-admin/inverse/eliteadmin.scss

@@ -1441,6 +1441,14 @@ table.dataTable thead .sorting:after {
       font-size:14px;
     }
 }
+
+@mixin panel-border-and-footer($color) {
+  border: 1px solid $color;
+  .panel-footer {
+    background-color: rgba($color, .1);
+  }
+}
+
 .panel{
   border-radius:$radius;
   margin-bottom:15px;
@@ -1485,7 +1493,6 @@ table.dataTable thead .sorting:after {
   }
 }
 .panel-green, .panel-success{
-    border-color: $success;
     .panel-heading {
         border-color: $success;
         color: white;
@@ -1503,6 +1510,7 @@ table.dataTable thead .sorting:after {
             color: darken($success, 15%);
         }
     }
+    @include panel-border-and-footer($success);
 }
 .panel-black, .panel-inverse{
     border-color: $inverse;
@@ -1523,6 +1531,7 @@ table.dataTable thead .sorting:after {
             color: darken($inverse, 15%);
         }
     }
+    @include panel-border-and-footer($inverse);
 }
 .panel-darkblue, .panel-primary{
     border-color: $primary;
@@ -1543,6 +1552,7 @@ table.dataTable thead .sorting:after {
             color: darken($primary, 15%);
         }
     }
+    @include panel-border-and-footer($primary);
 }
 .panel-blue, .panel-info{
     border-color: $info;
@@ -1563,6 +1573,7 @@ table.dataTable thead .sorting:after {
             color: darken($info, 15%);
         }
     }
+    @include panel-border-and-footer($info);
 }
 
 .panel-red, .panel-danger {
@@ -1584,6 +1595,7 @@ table.dataTable thead .sorting:after {
             color: darken($danger, 15%);
         }
     }
+    @include panel-border-and-footer($danger);
 }
 
 .panel-yellow, .panel-warning {
@@ -1605,17 +1617,18 @@ table.dataTable thead .sorting:after {
             color: darken($warning, 15%);
         }
     }
+    @include panel-border-and-footer($warning);
 }
 .panel-white, .panel-default{
     border-color: $border;
     .panel-heading {
         color: $dark;
-        background-color: $white;
+        background-color: $border;
         border-bottom:1px solid $border;
 
     }
     .panel-body{
-     color:$dark;
+      color:$dark;
     }
     .panel-action a{ color:$dark; opacity:0.5;
       &:hover{
@@ -1628,7 +1641,7 @@ table.dataTable thead .sorting:after {
       color:$dark;
       border-top:1px solid $border;
     }
-
+    @include panel-border-and-footer($border);
 }
 .full-panel-info{
     border-color: $info;

+ 1 - 1
resource/styles/agile-admin/inverse/variables.scss

@@ -47,7 +47,7 @@ $lft:left;
 $dark-text:#848a96;
 
 /*Border radius*/
-$radius:3px;
+$radius: 0;
 
 /*Preloader*/
 .preloader{

+ 25 - 34
resource/styles/scss/_override-agileadmin.scss

@@ -81,30 +81,9 @@
 }
 
 
-/*
- * Alert
- */
-.alert {
-  border-radius: 0;
-}
-
-
-/*
- * Form
- */
-.form-control {
-  border-radius: 0;
-}
-
-
 /*
  * Button
  */
-.btn {
-  &:not(.btn-rounded):not(.btn-circle) {
-    border-radius: 0;
-  }
-}
 button.btn.btn-link:hover {
   text-decoration: none;
 }
@@ -113,8 +92,6 @@ button.btn.btn-link:hover {
  * Dropdown
  */
 .dropdown-menu {
-  border-radius: 0;
-
   > li > a {
     padding: 5px 15px;
   }
@@ -126,7 +103,7 @@ button.btn.btn-link:hover {
  */
 .modal-content {
   border: none;
-  border-radius: 0;
+  // border-radius: 0;
 
   .modal-header, .modal-footer {
     padding: 10px 15px;
@@ -134,16 +111,6 @@ button.btn.btn-link:hover {
 }
 
 
-/*
- * Tab
- */
-.nav-tabs {
-  > li > a {
-    border-radius: 0;
-  }
-}
-
-
 /*
  * Wells
  */
@@ -154,3 +121,27 @@ button.btn.btn-link:hover {
     padding: .5em;
   }
 }
+
+
+/*
+ * Panel
+ */
+.panel {
+  .panel-heading {
+    padding: 7px 15px;
+  }
+  .panel-body {
+    padding: 15px;
+  }
+  .panel-footer {
+    padding: 7px 15px;
+  }
+}
+
+
+/*
+ * Label
+ */
+.label {
+  padding: 2px 7px;
+}