refactor(panels): use colors from vars

pull/46/head
alex 2016-04-25 14:23:04 +03:00 committed by kostya.danovsky
parent 8a96c48407
commit 5356ad14fe
5 changed files with 55 additions and 52 deletions

View File

@ -1,15 +1,15 @@
<uib-accordion> <uib-accordion>
<uib-accordion-group is-open="true" heading="Static Header, initially expanded" panel-class="bootstrap-panel accordion-panel"> <uib-accordion-group is-open="true" heading="Static Header, initially expanded" panel-class="bootstrap-panel accordion-panel panel-default">
This content is straight in the template. This content is straight in the template.
</uib-accordion-group> </uib-accordion-group>
<uib-accordion-group heading="Dynamic Body Content" panel-class="bootstrap-panel accordion-panel"> <uib-accordion-group heading="Dynamic Body Content" panel-class="bootstrap-panel accordion-panel panel-default">
<p>The body of the uib-accordion group grows to fit the contents</p> <p>The body of the uib-accordion group grows to fit the contents</p>
<button type="button" class="btn btn-primary btn-sm">Add Item</button> <button type="button" class="btn btn-primary btn-sm">Add Item</button>
</uib-accordion-group> </uib-accordion-group>
<uib-accordion-group heading="Custom template" panel-class="bootstrap-panel accordion-panel"> <uib-accordion-group heading="Custom template" panel-class="bootstrap-panel accordion-panel panel-default">
Hello Hello
</uib-accordion-group> </uib-accordion-group>
<uib-accordion-group panel-class="bootstrap-panel accordion-panel"> <uib-accordion-group panel-class="bootstrap-panel accordion-panel panel-default">
<uib-accordion-heading> <uib-accordion-heading>
I can have markup, too! <i class="fa pull-right ion-settings"></i> I can have markup, too! <i class="fa pull-right ion-settings"></i>
</uib-accordion-heading> </uib-accordion-heading>

View File

@ -47,36 +47,48 @@ $panel-heading-font-size: 16px;
background-attachment: fixed; background-attachment: fixed;
} }
.panel-white { .panel {
background-color: white; > .panel-body {
}
.panel > .panel-body {
padding: 15px 22px; padding: 15px 22px;
height: 100%; height: 100%;
} }
> .panel-heading {
color: $default-text;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
}
> .panel-footer {
color: $default-text;
}
}
.panel-heading, .panel-footer { .panel-heading, .panel-footer {
border-bottom: 1px solid rgba(0, 0, 0, 0.12); border-bottom: 1px solid rgba(0, 0, 0, 0.12);
box-shadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.12); box-shadow: 0 1px 0 0 rgba(255, 255, 255, 0.12);
height: $panel-title-height; height: $panel-title-height;
font-size: $panel-heading-font-size; font-size: $panel-heading-font-size;
$vertical-padding: ($panel-title-height - $panel-heading-font-size) / 2; $vertical-padding: ($panel-title-height - $panel-heading-font-size) / 2;
padding: $vertical-padding 22px; padding: $vertical-padding 22px;
} }
.panel-title { .panel-title {
font-weight: $font-normal; font-weight: $font-normal;
text-transform: uppercase; text-transform: uppercase;
opacity: 0.9; opacity: 0.9;
//text-transform: uppercase;
} }
.panel-default {
> .panel-heading {
color: $bootstrap-panel-text;
}
> .panel-footer {
color: $bootstrap-panel-text;
}
}
.panel-primary { .panel-primary {
> .panel-heading { > .panel-heading {
color: $primary;
background-color: $primary-bg; background-color: $primary-bg;
border-color: $primary-bg; border-color: $primary-bg;
} }
@ -84,7 +96,6 @@ $panel-heading-font-size: 16px;
.panel-success { .panel-success {
> .panel-heading { > .panel-heading {
color: $success;
background-color: $success-bg; background-color: $success-bg;
border-color: $success-bg; border-color: $success-bg;
} }
@ -92,7 +103,6 @@ $panel-heading-font-size: 16px;
.panel-info { .panel-info {
> .panel-heading { > .panel-heading {
color: $info;
background-color: $info-bg; background-color: $info-bg;
border-color: $info-bg; border-color: $info-bg;
} }
@ -100,7 +110,6 @@ $panel-heading-font-size: 16px;
.panel-warning { .panel-warning {
> .panel-heading { > .panel-heading {
color: $warning;
background-color: $warning-bg; background-color: $warning-bg;
border-color: $warning-bg; border-color: $warning-bg;
} }
@ -108,27 +117,19 @@ $panel-heading-font-size: 16px;
.panel-danger { .panel-danger {
> .panel-heading { > .panel-heading {
color: $danger;
background-color: $danger-bg; background-color: $danger-bg;
border-color: $danger-bg; border-color: $danger-bg;
} }
} }
.panel-primary, .panel-success, .panel-info, .panel-warning, .panel-danger { .bootstrap-panel{
.panel-heading { background-color: $bootstrap-panel-bg;
color: rgba(255, 255, 255, 0.8); .panel-body{
color: $bootstrap-panel-text;
} }
} }
.panel.bootstrap-panel{ .accordion-panel.panel {
.panel-body, .panel-heading {
p, div, span {
color: $default-text;
}
}
}
.accordion-panel.panel.bootstrap-panel{
&.panel-primary, &.panel-primary,
&.panel-success, &.panel-success,
&.panel-info, &.panel-info,
@ -170,7 +171,6 @@ $panel-heading-font-size: 16px;
font-weight: $font-light; font-weight: $font-light;
} }
/* /*
.panel-group .panel { .panel-group .panel {
border-radius: 0; border-radius: 0;

View File

@ -168,9 +168,9 @@
border: none; border: none;
} }
.panel-primary, .panel-info, .panel-success, .panel-warning, .panel-danger, { .accordion-panel {
.panel-heading { .panel-heading {
border-radius: 4px; border-radius: 3px;
} }
&.panel-open .panel-heading { &.panel-open .panel-heading {

View File

@ -10,6 +10,8 @@ $input-border: $border;// shade
$sidebar: rgba(#000000, 0.5); $sidebar: rgba(#000000, 0.5);
$sidebar-text: #ffffff; $sidebar-text: #ffffff;
$dropdown-text: #7d7d7d; $dropdown-text: #7d7d7d;
$bootstrap-panel-text: #7d7d7d;
$bootstrap-panel-bg: #ffffff;
$primary: #209e91 !default; $primary: #209e91 !default;
$info: #2dacd1 !default; $info: #2dacd1 !default;

View File

@ -133,6 +133,19 @@
@mixin cd-timeline-color($color) { @mixin cd-timeline-color($color) {
background: $color; background: $color;
} }
@mixin cd-timeline-left-color($color) {
&:before {
border-left-color: $color;
}
}
@mixin cd-timeline-right-color($color) {
&::before {
border-right-color: $color;
}
}
.cd-timeline-content.warning { .cd-timeline-content.warning {
@include cd-timeline-color(rgba($warning, 0.2)); @include cd-timeline-color(rgba($warning, 0.2));
} }
@ -147,18 +160,6 @@
background-color: $border; background-color: $border;
} }
@mixin cd-timeline-left-color($color) {
&:before {
border-left-color: $color;
}
}
@mixin cd-timeline-right-color($color) {
&::before {
border-right-color: $color;
}
}
@media only screen and (min-width: $resXL) { @media only screen and (min-width: $resXL) {
#cd-timeline::before { #cd-timeline::before {