Merge pull request '2020.12.21' (#2) from RonWang/custom-bootstrap4:master into master

Reviewed-on: #2
pull/3/head
BobsonLin 3 years ago
commit b50138e38e

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -5,8 +5,9 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title>
<link rel="stylesheet" href="css/argon-theme.css">
<link rel="stylesheet" href="css/spacelab-theme.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.2.1/font/bootstrap-icons.css">
</head>
<body>
@ -186,11 +187,32 @@
</tbody>
</table>
<div class="col-md-6">
<div class="card">
<div class="card-body">
<div class="icon icon-shape icon-shape-info rounded-circle shadow mb-4">
<i class="bi bi-arrow-bar-up"></i>
</div>
<h5 class="h3">Components</h5>
<p>Argon comes with over 70 handcrafted components.</p>
</div>
</div>
<div class="card">
<div class="card-body">
<div class="icon icon-shape icon-shape-info rounded-circle shadow mb-4">
<i class="bi bi-arrow-bar-up"></i>
</div>
<h5 class="h3">Plugins</h5>
<p>Fully integrated and extendable third-party plugins that you will love.</p>
</div>
</div>
</div>
</body>
<style>
html{
font-family: ;
}
.bi{
line-height: 0;
}
</style>
</html>

@ -4,12 +4,17 @@
// Argon varialbes
@import "argon/variables";
@import "argon/custom/icon-variables";
@import "../../node_modules/bootstrap/scss/variables";
// Argon mixins
// @import "argon/mixins";
@import 'argon/custom/background-variant';
@import 'argon/custom/icon';
@import "../../node_modules/bootstrap/scss/mixins";
// Bootstrap components
@import "../../node_modules/bootstrap/scss/root";
@import "../../node_modules/bootstrap/scss/reboot";
@ -28,7 +33,6 @@
// Argon components
@import 'argon/custom/forms';
@import 'argon/custom/table';
@import 'argon/custom/pagination';
@import 'argon/custom/buttons';
@import 'argon/custom/cards';

@ -0,0 +1,30 @@
// Contextual backgrounds
@mixin bg-variant($parent, $color) {
#{$parent} {
background-color: $color !important;
}
a#{$parent},
button#{$parent} {
@include hover-focus {
background-color: darken($color, 10%) !important;
}
}
}
@mixin bg-gradient-variant($parent, $color) {
#{$parent} {
background: linear-gradient(87deg, $color 0, adjust-hue($color, 25%) 100%) !important;
}
}
@mixin bg-translucent-variant($parent, $color) {
#{$parent} {
background-color: darken(rgba($color, $translucent-color-opacity), 7%) !important;
}
a#{$parent},
button#{$parent} {
@include hover-focus {
background-color: darken(rgba($color, $translucent-color-opacity), 12%) !important;
}
}
}

@ -0,0 +1,3 @@
$favorite-color: $yellow ;
$like-color: $blue ;
$love-color: $red ;

@ -0,0 +1,203 @@
//
@mixin icon-shape-variant($color) {
color: saturate(darken($color, 10%), 10);
background-color: transparentize(lighten($color, 10%), .5);
}
@mixin icon-font($content, $font-size) {
content: $content;
font-family: $icon-font-family;
font-size: $font-size;
}
// Icon action
//
$icon-size: 3rem !default;
$icon-size-xl: 5rem !default;
$icon-size-lg: 4rem !default;
$icon-size-sm: 2rem !default;
$icon-size-xs: 1.25rem !default;
.icon-actions {
> a {
display: inline-block;
margin-right: .75rem;
color: $gray-600;
font-size: .875rem;
&:last-of-type {
margin-right: 0;
}
span {
margin-left: .1875rem;
font-weight: $font-weight-bold;
color: $text-muted;
}
&:hover {
span {
color: darken($text-muted, 10%);
}
}
}
> a,
> a:hover,
> a.active {
color: $gray-800;
}
> .favorite:hover,
> .favorite.active {
color: $favorite-color;
}
> .love:hover,
> .love.active {
color: $love-color;
}
> .like:hover,
> .like.active {
color: $like-color;
}
}
.icon-actions-lg {
a {
font-size: 1.25rem;
margin-right: .875rem;
}
}
//
// Icon shape
//
.icon-shape {
padding: 12px;
text-align: center;
display: inline-flex;
align-items: center;
justify-content: center;
border-radius: 50%;
i, svg {
font-size: 1.25rem;
}
&.icon-lg {
i, svg {
font-size: 1.625rem;
}
}
&.icon-sm {
i, svg {
font-size: .875rem;
}
}
&.icon-xs {
i, svg {
font-size: .6rem;
}
}
svg {
width: 30px;
height: 30px;
}
}
@each $color, $value in $theme-colors {
.icon-shape-#{$color} {
@include icon-shape-variant(theme-color($color));
}
}
// Icon
//
.icon {
width: $icon-size;
height: $icon-size;
i, svg {
font-size: $icon-size - .75;
}
+ .icon-text {
padding-left: 1rem;
width: calc(100% - #{$icon-size} - 1);
}
}
// Extra large icons
.icon-xl {
width: $icon-size-xl;
height: $icon-size-xl;
i, svg {
font-size: $icon-size-xl - .75;
}
+ .icon-text {
width: calc(100% - #{$icon-size-xl} - 1);
}
}
// Large icons
.icon-lg {
width: $icon-size-lg;
height: $icon-size-lg;
i, svg {
font-size: $icon-size-lg - .75;
}
+ .icon-text {
width: calc(100% - #{$icon-size-lg} - 1);
}
}
// Small icon
.icon-sm {
width: $icon-size-sm;
height: $icon-size-sm;
i, svg {
font-size: $icon-size-sm - .75;
}
+ .icon-text {
width: calc(100% - #{$icon-size-sm} - 1);
}
}
// Extra Small icon
.icon-xs {
width: $icon-size-xs;
height: $icon-size-xs;
i, svg {
font-size: $icon-size-xs - .75;
}
+ .icon-text {
width: calc(100% - #{$icon-size-xs} - 1);
}
}

@ -4,9 +4,11 @@
// Cosmo varialbes
@import "cosmo/variables";
@import "argon/custom/icon-variables";
@import "../../node_modules/bootstrap/scss/variables";
// Cosmo mixins
@import 'argon/custom/background-variant';
@import 'argon/custom/icon';
// Bootstrap mixins
@import "../../node_modules/bootstrap/scss/mixins";

@ -0,0 +1,31 @@
// Bootstrap functions
@import '../../node_modules/bootstrap/scss/functions';
// cyborg varialbes
@import "../scss/cyborg/variables";
@import "argon/custom/icon-variables";
@import "../../node_modules/bootstrap/scss/variables";
// cyborg mixins
// Bootstrap mixins
@import 'argon/custom/background-variant';
@import 'argon/custom/icon';
@import "../../node_modules/bootstrap/scss/mixins";
// Bootstrap components
@import "../../node_modules/bootstrap/scss/root";
@import "../../node_modules/bootstrap/scss/reboot";
@import "../../node_modules/bootstrap/scss/type";
@import "../../node_modules/bootstrap/scss/images";
@import "../../node_modules/bootstrap/scss/grid";
@import "../../node_modules/bootstrap/scss/buttons";
@import "../../node_modules/bootstrap/scss/card";
@import "../../node_modules/bootstrap/scss/utilities";
@import "../../node_modules/bootstrap/scss/tables";
@import "../../node_modules/bootstrap/scss/pagination";
@import "../../node_modules/bootstrap/scss/forms";
@import "../scss/cyborg/bootswatch";

@ -0,0 +1,327 @@
// Cyborg 4.5.3
// Bootswatch
// Variables ===================================================================
@import "../cyborg/variables";
// Navbar ======================================================================
.navbar {
&.bg-primary {
border: 1px solid $gray-700;
}
&.bg-dark {
background-color: $body-bg !important;
border: 1px solid $gray-700;
}
&.bg-light {
background-color: $gray-500 !important;
}
&.fixed-top {
border-width: 0 0 1px;
}
&.fixed-bottom {
border-width: 1px 0 0;
}
}
// Buttons =====================================================================
.btn {
@each $color, $value in $theme-colors {
&-#{$color} {
@if $enable-gradients {
background: $value linear-gradient(180deg, mix($white, $value, 15%), $value) repeat-x;
} @else {
background-color: $value;
}
}
}
}
// Tables ======================================================================
table {
color: $white;
}
.table {
&-primary {
&,
> th,
> td {
background-color: $primary;
}
}
&-secondary {
&,
> th,
> td {
background-color: $secondary;
}
}
&-light {
&,
> th,
> td {
background-color: $light;
}
}
&-dark {
&,
> th,
> td {
background-color: $dark;
}
}
&-success {
&,
> th,
> td {
background-color: $success;
}
}
&-info {
&,
> th,
> td {
background-color: $info;
}
}
&-danger {
&,
> th,
> td {
background-color: $danger;
}
}
&-warning {
&,
> th,
> td {
background-color: $warning;
}
}
&-active {
&,
> th,
> td {
background-color: $table-active-bg;
}
}
&-hover {
.table-primary:hover {
&,
> th,
> td {
background-color: darken($primary, 5%);
}
}
.table-secondary:hover {
&,
> th,
> td {
background-color: darken($secondary, 5%);
}
}
.table-light:hover {
&,
> th,
> td {
background-color: darken($light, 5%);
}
}
.table-dark:hover {
&,
> th,
> td {
background-color: darken($dark, 5%);
}
}
.table-success:hover {
&,
> th,
> td {
background-color: darken($success, 5%);
}
}
.table-info:hover {
&,
> th,
> td {
background-color: darken($info, 5%);
}
}
.table-danger:hover {
&,
> th,
> td {
background-color: darken($danger, 5%);
}
}
.table-warning:hover {
&,
> th,
> td {
background-color: darken($warning, 5%);
}
}
.table-active:hover {
&,
> th,
> td {
background-color: $table-active-bg;
}
}
}
}
// Forms =======================================================================
legend {
color: $white;
}
.form-control {
background-clip: border-box;
&:disabled,
&[readonly] {
border-color: transparent;
}
}
// Navs ========================================================================
.nav-tabs,
.nav-pills {
.nav-link {
color: $white;
&:hover {
background-color: $gray-700;
}
&.disabled,
&.disabled:hover {
background-color: transparent;
color: $nav-link-disabled-color;
}
&.active {
background-color: $primary;
}
}
}
.breadcrumb {
a {
color: $white;
}
}
.pagination {
a:hover {
text-decoration: none;
}
}
// Indicators ==================================================================
.alert {
border: none;
color: $white;
a,
.alert-link {
color: $white;
text-decoration: underline;
}
@each $color, $value in $theme-colors {
&-#{$color} {
@if $enable-gradients {
background: $value linear-gradient(180deg, mix($white, $value, 15%), $value) repeat-x;
} @else {
background-color: $value;
}
}
}
}
.badge {
&-warning {
color: $white;
}
}
.close {
opacity: .6;
&:hover {
opacity: 1;
}
}
// Containers ==================================================================
.list-group-item {
&:hover {
background-color: $gray-700;
color: $white;
}
&-action {
color: $gray-500;
.list-group-item-heading {
color: $gray-500;
}
}
&:hover .list-group-item-heading {
color: $white;
}
}
.card,
.list-group-item {
h1,
h2,
h3,
h4,
h5,
h6 {
color: inherit;
}
}
.popover {
&-title {
border-bottom: none;
}
}

@ -0,0 +1,169 @@
// Cyborg 4.5.3
// Bootswatch
//
// Color system
//
$white: #fff !default;
$gray-100: #f8f9fa !default;
$gray-200: #e9ecef !default;
$gray-300: #dee2e6 !default;
$gray-400: #adafae !default;
$gray-500: #888 !default;
$gray-600: #555 !default;
$gray-700: #282828 !default;
$gray-800: #222 !default;
$gray-900: #212529 !default;
$black: #000 !default;
$blue: #2a9fd6 !default;
$indigo: #6610f2 !default;
$purple: #6f42c1 !default;
$pink: #e83e8c !default;
$red: #c00 !default;
$orange: #fd7e14 !default;
$yellow: #f80 !default;
$green: #77b300 !default;
$teal: #20c997 !default;
$cyan: #00A3A3 !default;
$primary: $blue !default;
$secondary: $gray-600 !default;
$success: $green !default;
$info: $cyan !default;
$warning: $yellow !default;
$danger: $red !default;
$light: $gray-800 !default;
$dark: $gray-400 !default;
$yiq-contrasted-threshold: 175 !default;
// Body
$body-bg: #060606 !default;
$body-color: $gray-400 !default;
// Fonts
// stylelint-disable-next-line value-keyword-case
$font-family-sans-serif: Roboto, -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", Arial, sans-serif !default;
$font-size-base: .875rem !default;
$h1-font-size: 4rem !default;
$h2-font-size: 3rem !default;
$h3-font-size: 2.5rem !default;
$h4-font-size: 2rem !default;
$h5-font-size: 1.5rem !default;
$headings-color: $white !default;
// Tables
$table-color: $white !default;
$table-accent-bg: rgba($white, .05) !default;
$table-hover-bg: rgba($white, .075) !default;
$table-border-color: $gray-700 !default;
$table-dark-bg: $gray-500 !default;
$table-dark-border-color: darken($gray-500, 7.5%) !default;
// Buttons
$input-btn-padding-x: 1rem !default;
// Forms
$input-disabled-bg: $gray-400 !default;
$input-border-color: $white !default;
$input-group-addon-color: $white !default;
$input-group-addon-bg: $gray-700 !default;
$input-group-addon-border-color: transparent !default;
$custom-file-color: $white !default;
$custom-file-border-color: $gray-700 !default;
// Dropdowns
$dropdown-bg: $gray-700 !default;
$dropdown-divider-bg: $gray-800 !default;
$dropdown-link-color: $white !default;
$dropdown-link-hover-color: $white !default;
$dropdown-link-hover-bg: $primary !default;
// Navs
$nav-tabs-border-color: $table-border-color !default;
$nav-tabs-link-hover-border-color: $nav-tabs-border-color !default;
$nav-tabs-link-active-color: $white !default;
$nav-tabs-link-active-bg: $nav-tabs-border-color !default;
$nav-tabs-link-active-border-color: $nav-tabs-border-color !default;
// Navbar
$navbar-dark-hover-color: $white !default;
// Pagination
$pagination-color: $white !default;
$pagination-bg: $gray-700 !default;
$pagination-border-color: transparent !default;
$pagination-hover-color: $white !default;
$pagination-hover-bg: $primary !default;
$pagination-hover-border-color: $pagination-border-color !default;
$pagination-disabled-bg: $pagination-bg !default;
$pagination-disabled-border-color: $pagination-border-color !default;
// Jumbotron
$jumbotron-bg: $gray-700 !default;
// Cards
$card-bg: $gray-700 !default;
// Tooltips
$tooltip-bg: $gray-700 !default;
$tooltip-opacity: 1 !default;
// Popovers
$popover-bg: $gray-700 !default;
// Toasts
$toast-color: $white !default;
$toast-background-color: $gray-800 !default;
$toast-border-color: $gray-700 !default;
$toast-header-color: $body-color !default;
$toast-header-background-color: $toast-background-color !default;
$toast-header-border-color: $toast-border-color !default;
// Modals
$modal-content-bg: $gray-800 !default;
$modal-header-border-color: $gray-700 !default;
// Progress bars
$progress-bg: $gray-700 !default;
// List group
$list-group-bg: $gray-800 !default;
$list-group-border-color: $gray-700 !default;
$list-group-hover-bg: $primary !default;
$list-group-disabled-bg: $gray-700 !default;
$list-group-action-active-bg: $primary !default;
// Breadcrumbs
$breadcrumb-bg: $gray-700 !default;
// Close
$close-color: $white !default;
$close-text-shadow: none !default;
// Code
$pre-color: inherit !default;

@ -0,0 +1,28 @@
// Bootstrap functions
@import '../../node_modules/bootstrap/scss/functions';
// spacelab varialbes
@import "../scss/spacelab/variables";
@import "argon/custom/icon-variables";
@import "../../node_modules/bootstrap/scss/variables";
// spacelab mixins
// Bootstrap mixins
@import 'argon/custom/icon';
@import 'argon/custom/background-variant';
@import "../../node_modules/bootstrap/scss/mixins";
// Bootstrap components
@import "../../node_modules/bootstrap/scss/root";
@import "../../node_modules/bootstrap/scss/reboot";
@import "../../node_modules/bootstrap/scss/type";
@import "../../node_modules/bootstrap/scss/images";
@import "../../node_modules/bootstrap/scss/grid";
@import "../../node_modules/bootstrap/scss/buttons";
@import "../../node_modules/bootstrap/scss/card";
@import "../../node_modules/bootstrap/scss/utilities";
@import "../../node_modules/bootstrap/scss/tables";
@import "../../node_modules/bootstrap/scss/pagination";
@import "../../node_modules/bootstrap/scss/forms";
@import "../scss/spacelab/bootswatch";

@ -0,0 +1,97 @@
// Spacelab 4.5.3
// Bootswatch
// Variables ===================================================================
$web-font-path: "https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,400;0,700;1,400;1,700&display=swap" !default;
@import url($web-font-path);
// Mixins ======================================================================
@mixin btn-shadow($color){
// @include gradient-y-three-colors(lighten($color, 15%), $color, 50%, darken($color, 4%));
filter: none;
border: 1px solid darken($color, 10%);
}
// Navbar ======================================================================
.navbar {
.nav-link,
.navbar-brand {
text-shadow: -1px -1px 0 rgba(0, 0, 0, .1);
transition: color ease-in-out .2s;
}
&.bg-primary {
@include btn-shadow(map-get($theme-colors, "primary"));
}
&.bg-dark {
@include btn-shadow(map-get($theme-colors, "secondary"));
}
&.bg-light {
@include btn-shadow(map-get($theme-colors, "light"));
.nav-link,
.navbar-brand {
text-shadow: 1px 1px 0 rgba(255, 255, 255, .1);
}
.navbar-brand {
color: $navbar-light-color;
&:hover {
color: $info;
}
}
}
}
// Buttons =====================================================================
.btn {
text-shadow: -1px -1px 0 rgba(0, 0, 0, .1);
&-link {
text-shadow: none;
}
}
@each $color, $value in $theme-colors {
.btn-#{$color} {
@include btn-shadow($value);
}
.btn-#{$color}:not(.disabled):hover {
@include btn-shadow(darken($value, 4%));
}
}
[class*="btn-outline-"] {
text-shadow: none;
}
// Indicators ==================================================================
.badge {
&-secondary {
color: $white;
}
}
// Containers ==================================================================
.card,
.list-group-item {
h1,
h2,
h3,
h4,
h5,
h6 {
color: inherit;
}
}

@ -0,0 +1,64 @@
// Spacelab 4.5.3
// Bootswatch
//
// Color system
//
$white: #fff !default;
$gray-100: #f8f9fa !default;
$gray-200: #eee !default;
$gray-300: #dee2e6 !default;
$gray-400: #ced4da !default;
$gray-500: #999 !default;
$gray-600: #777 !default;
$gray-700: #495057 !default;
$gray-800: #333 !default;
$gray-900: #2d2d2d !default;
$black: #000 !default;
$blue: #446e9b !default;
$indigo: #6610f2 !default;
$purple: #6f42c1 !default;
$pink: #e83e8c !default;
$red: #cd0200 !default;
$orange: #fd7e14 !default;
$yellow: #d47500 !default;
$green: #3cb521 !default;
$teal: #20c997 !default;
$cyan: #3399f3 !default;
$primary: $blue !default;
$secondary: $gray-500 !default;
$success: $green !default;
$info: $cyan !default;
$warning: $yellow !default;
$danger: $red !default;
$light: $gray-200 !default;
$dark: $gray-800 !default;
$yiq-contrasted-threshold: 200 !default;
$enable-gradients: false;
// Body
$body-color: $gray-600 !default;
// Links
$link-color: $info !default;
// Fonts
// stylelint-disable-next-line value-keyword-case
$font-family-sans-serif: "Open Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default;
$headings-color: $gray-900 !default;
// Navbar
$navbar-dark-color: rgba($white, .75) !default;
$navbar-dark-hover-color: $white !default;
$navbar-light-color: rgba($black, .4) !default;
$navbar-light-hover-color: $info !default;
$navbar-light-active-color: $info !default;
Loading…
Cancel
Save