Skip to content

Commit

Permalink
Merge pull request #370 from npds/v16.0.2-beta-dev
Browse files Browse the repository at this point in the history
skin maj
  • Loading branch information
jipexu authored Oct 19, 2018
2 parents acee178 + 61ad711 commit 9cb59c5
Show file tree
Hide file tree
Showing 34 changed files with 621 additions and 340 deletions.
4 changes: 4 additions & 0 deletions revolution_16/themes/_skins/cerulean/_bootswatch.scss
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ $text-shadow: 0 1px 0 rgba(0, 0, 0, 0.05) !default;

// Typography ==================================================================

.text-secondary {
color: $gray-500 !important;
}

.bg-primary,
.bg-success,
.bg-info,
Expand Down
4 changes: 2 additions & 2 deletions revolution_16/themes/_skins/cerulean/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Cerulean 4.0.0
// Cerulean 4.1.3
// Bootswatch

//
Expand Down Expand Up @@ -39,7 +39,7 @@ $dark: $gray-800 !default;

// Body

$body-color: $gray-600 !default;
$body-color: $gray-700 !default;

// Fonts

Expand Down
4 changes: 4 additions & 0 deletions revolution_16/themes/_skins/cerulean/bootstrap.css
Original file line number Diff line number Diff line change
Expand Up @@ -9572,6 +9572,10 @@ a.text-dark:hover, a.text-dark:focus {
background-repeat: no-repeat;
}

.text-secondary {
color: #adb5bd !important;
}

.bg-primary h1, .bg-primary h2, .bg-primary h3, .bg-primary h4, .bg-primary h5, .bg-primary h6,
.bg-success h1,
.bg-success h2,
Expand Down
2 changes: 1 addition & 1 deletion revolution_16/themes/_skins/cerulean/bootstrap.min.css

Large diffs are not rendered by default.

18 changes: 13 additions & 5 deletions revolution_16/themes/_skins/cyborg/_bootswatch.scss
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,14 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Roboto:400,700" !defaul
// Buttons =====================================================================

.btn {

&-warning,
&-warning:hover {
color: $white;
@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;
}
}
}
}

Expand Down Expand Up @@ -222,7 +226,11 @@ legend {

@each $color, $value in $theme-colors {
&-#{$color} {
background-color: $value;
@if $enable-gradients {
background: $value linear-gradient(180deg, mix($white, $value, 15%), $value) repeat-x;
} @else {
background-color: $value;
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions revolution_16/themes/_skins/cyborg/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ $danger: $red !default;
$light: $gray-800 !default;
$dark: $gray-400 !default;

$yiq-contrasted-threshold: 175 !default;


// Body

Expand Down Expand Up @@ -64,8 +66,6 @@ $table-hover-bg: rgba($white,.075) !default;

$table-border-color: $gray-700 !default;

$table-head-color: $white !default;

$table-dark-bg: $gray-500 !default;
$table-dark-border-color: darken($gray-500, 7.5%) !default;
$table-dark-color: $body-bg !default;
Expand Down
60 changes: 44 additions & 16 deletions revolution_16/themes/_skins/cyborg/bootstrap.css
Original file line number Diff line number Diff line change
Expand Up @@ -1873,7 +1873,7 @@ pre code {
}

.table .thead-light th {
color: #fff;
color: #282828;
background-color: #e9ecef;
border-color: #282828;
}
Expand Down Expand Up @@ -2665,7 +2665,7 @@ fieldset:disabled a.btn {
}

.btn-warning {
color: #212529;
color: #fff;
background-color: #FF8800;
border-color: #FF8800;
}
Expand All @@ -2682,7 +2682,7 @@ fieldset:disabled a.btn {
}

.btn-warning.disabled, .btn-warning:disabled {
color: #212529;
color: #fff;
background-color: #FF8800;
border-color: #FF8800;
}
Expand Down Expand Up @@ -2773,13 +2773,13 @@ fieldset:disabled a.btn {
}

.btn-dark {
color: #212529;
color: #fff;
background-color: #ADAFAE;
border-color: #ADAFAE;
}

.btn-dark:hover {
color: #212529;
color: #fff;
background-color: #9a9c9b;
border-color: #939695;
}
Expand All @@ -2790,7 +2790,7 @@ fieldset:disabled a.btn {
}

.btn-dark.disabled, .btn-dark:disabled {
color: #212529;
color: #fff;
background-color: #ADAFAE;
border-color: #ADAFAE;
}
Expand Down Expand Up @@ -2960,7 +2960,7 @@ fieldset:disabled a.btn {
}

.btn-outline-warning:hover {
color: #212529;
color: #fff;
background-color: #FF8800;
border-color: #FF8800;
}
Expand All @@ -2977,7 +2977,7 @@ fieldset:disabled a.btn {

.btn-outline-warning:not(:disabled):not(.disabled):active, .btn-outline-warning:not(:disabled):not(.disabled).active,
.show > .btn-outline-warning.dropdown-toggle {
color: #212529;
color: #fff;
background-color: #FF8800;
border-color: #FF8800;
}
Expand Down Expand Up @@ -3068,7 +3068,7 @@ fieldset:disabled a.btn {
}

.btn-outline-dark:hover {
color: #212529;
color: #fff;
background-color: #ADAFAE;
border-color: #ADAFAE;
}
Expand All @@ -3085,7 +3085,7 @@ fieldset:disabled a.btn {

.btn-outline-dark:not(:disabled):not(.disabled):active, .btn-outline-dark:not(:disabled):not(.disabled).active,
.show > .btn-outline-dark.dropdown-toggle {
color: #212529;
color: #fff;
background-color: #ADAFAE;
border-color: #ADAFAE;
}
Expand Down Expand Up @@ -5160,12 +5160,12 @@ input[type="button"].btn-block {
}

.badge-warning {
color: #212529;
color: #fff;
background-color: #FF8800;
}

.badge-warning[href]:hover, .badge-warning[href]:focus {
color: #212529;
color: #fff;
text-decoration: none;
background-color: #cc6d00;
}
Expand Down Expand Up @@ -5193,12 +5193,12 @@ input[type="button"].btn-block {
}

.badge-dark {
color: #212529;
color: #fff;
background-color: #ADAFAE;
}

.badge-dark[href]:hover, .badge-dark[href]:focus {
color: #212529;
color: #fff;
text-decoration: none;
background-color: #939695;
}
Expand Down Expand Up @@ -9518,8 +9518,36 @@ a.text-dark:hover, a.text-dark:focus {
border-width: 1px 0 0 0;
}

.btn-warning, .btn-warning:hover {
color: #fff;
.btn-primary {
background-color: #2A9FD6;
}

.btn-secondary {
background-color: #555;
}

.btn-success {
background-color: #77B300;
}

.btn-info {
background-color: #9933CC;
}

.btn-warning {
background-color: #FF8800;
}

.btn-danger {
background-color: #CC0000;
}

.btn-light {
background-color: #222;
}

.btn-dark {
background-color: #ADAFAE;
}

table {
Expand Down
2 changes: 1 addition & 1 deletion revolution_16/themes/_skins/cyborg/bootstrap.min.css

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion revolution_16/themes/_skins/darkly/_bootswatch.scss
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,11 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic"

@each $color, $value in $theme-colors {
&-#{$color} {
background-color: $value;
@if $enable-gradients {
background: $value linear-gradient(180deg, mix($white, $value, 15%), $value) repeat-x;
} @else {
background-color: $value;
}
}
}
}
Expand Down
6 changes: 5 additions & 1 deletion revolution_16/themes/_skins/flatly/_bootswatch.scss
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,11 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic"

@each $color, $value in $theme-colors {
&-#{$color} {
background-color: $value;
@if $enable-gradients {
background: $value linear-gradient(180deg, mix($body-bg, $value, 15%), $value) repeat-x;
} @else {
background-color: $value;
}
}
}

Expand Down
6 changes: 5 additions & 1 deletion revolution_16/themes/_skins/litera/_bootswatch.scss
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,11 @@ table,

@each $color, $value in $theme-colors {
&-#{$color} {
background-color: $value;
@if $enable-gradients {
background: $value linear-gradient(0deg, mix($body-bg, $value, 15%), $value) repeat-x;
} @else {
background-color: $value;
}
}
}

Expand Down
9 changes: 4 additions & 5 deletions revolution_16/themes/_skins/lumen/_bootswatch.scss
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,10 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400

// Typography ==================================================================

.text-secondary {
color: $gray-700 !important;
}

.blockquote-footer {
color: $gray-600;
}
Expand All @@ -123,11 +127,6 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400
color: #fff;
}

.thead-dark th {
background-color: $primary;
border-color: $primary;
}

&-primary {
&, > th, > td {
background-color: $primary;
Expand Down
9 changes: 4 additions & 5 deletions revolution_16/themes/_skins/lumen/bootstrap.css
Original file line number Diff line number Diff line change
Expand Up @@ -9581,6 +9581,10 @@ a.text-dark:hover, a.text-dark:focus {
border-top-width: 2px;
}

.text-secondary {
color: #555 !important;
}

.blockquote-footer {
color: #999;
}
Expand All @@ -9589,11 +9593,6 @@ a.text-dark:hover, a.text-dark:focus {
color: #fff;
}

.table .thead-dark th {
background-color: #158CBA;
border-color: #158CBA;
}

.table-primary, .table-primary > th, .table-primary > td {
background-color: #158CBA;
}
Expand Down
2 changes: 1 addition & 1 deletion revolution_16/themes/_skins/lumen/bootstrap.min.css

Large diffs are not rendered by default.

28 changes: 10 additions & 18 deletions revolution_16/themes/_skins/materia/_bootswatch.scss
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,10 @@ a {
transition: all 0.2s;
}

.text-secondary {
color: $gray-500 !important;
}

// Tables ======================================================================

.table-hover {
Expand Down Expand Up @@ -263,7 +267,6 @@ input[type=number],
[type=email].form-control,
[type=tel].form-control,
[contenteditable].form-control {
font-size: 1rem;
box-shadow: inset 0 -1px 0 #ddd;
transition: all 0.2s;

Expand All @@ -282,22 +285,6 @@ input[type=number],
color: #ddd;
}

&:not(textarea) {
height: $input-height;
}

&.form-control {
&-sm {
height: $input-height-sm;
font-size: $font-size-sm;
}

&-lg {
height: $input-height-lg;
font-size: $font-size-lg;
}
}

&::-ms-clear {
display: none;
}
Expand Down Expand Up @@ -564,14 +551,19 @@ select.form-control {

.alert {
padding-right: 2.5rem;
border: none;

&, h1, h2, h3, h4, h5, h6 {
color: #fff;
}

@each $color, $value in $theme-colors {
&-#{$color} {
background-color: $value;
@if $enable-gradients {
background: $value linear-gradient(180deg, mix($body-bg, $value, 15%), $value) repeat-x;
} @else {
background-color: $value;
}
}
}

Expand Down
Loading

0 comments on commit 9cb59c5

Please sign in to comment.