瀏覽代碼

update colors

jqh 5 年之前
父節點
當前提交
089d43d178

+ 6 - 1
resources/assets/dcat/sass/_colors.scss

@@ -39,6 +39,9 @@
 .text-blue-2 {
   color: $blue-2!important;
 }
+.text-cyan {
+  color: $cyan!important;
+}
 
 .text-tear {
   color: $tear!important;
@@ -111,7 +114,9 @@
 .bg-blue-2 {
   background: $blue-2!important;
 }
-
+.bg-cyan {
+  background: $cyan!important;
+}
 .bg-tear {
   background: $tear!important;
 }

+ 39 - 1
resources/assets/dcat/sass/components/_button.scss

@@ -33,6 +33,7 @@
 //  padding: 0.6rem 1rem !important;
 //}
 
+// --------------------- btn-custom -----------------------
 .btn-custom {
   background: $custom;
   border-color: $custom;
@@ -45,7 +46,6 @@
 }
 
 .btn-outline-custom {
-  background: $white;
   border: 1px solid $custom;
   color: $custom;
   box-shadow: none;
@@ -56,6 +56,44 @@
   color: $custom;
 }
 
+.btn-outline-custom:not(:disabled):not(.disabled):active, .btn-outline-custom:not(:disabled):not(.disabled).active, .show > .btn-outline-custom.dropdown-toggle {
+  color: #fff;
+  background-color: $custom;
+  border-color: $custom;
+}
+.btn-outline-custom:not(:disabled):not(.disabled):active:focus, .btn-outline-custom:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-custom.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0.2rem rgba($custom, 0.5);
+}
+
+// --------------------- btn-cyan -----------------------
+.btn-cyan {
+  background: $cyan;
+  border-color: $cyan;
+  color: $white;
+}
+.btn-cyan:hover {
+  color: $white;
+  box-shadow: 0 8px 25px -8px $cyan;
+}
+
+.btn-outline-cyan {
+  border: 1px solid $cyan;
+  color: $cyan;
+  box-shadow: none;
+}
+.btn-outline-cyan:hover {
+  background: rgba($cyan, .15);
+  color: $cyan;
+}
+.btn-outline-cyan:not(:disabled):not(.disabled):active, .btn-outline-cyan:not(:disabled):not(.disabled).active, .show > .btn-outline-cyan.dropdown-toggle {
+  color: #fff;
+  background-color: $cyan;
+  border-color: $cyan;
+}
+.btn-outline-cyan:not(:disabled):not(.disabled):active:focus, .btn-outline-cyan:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-cyan.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0.2rem rgba($cyan, 0.5);
+}
+
 .btn.btn-white {
   color: $font-color;
 }

File diff suppressed because it is too large
+ 0 - 0
resources/dist/dcat/css/dcat-app.css


Some files were not shown because too many files changed in this diff