From bb8cf1758b6fe7c7ae956ae696d1d5b4fa77bc8d Mon Sep 17 00:00:00 2001 From: Vladimir Lugovsky Date: Tue, 5 Jan 2016 21:35:51 +0300 Subject: [PATCH] feat(panel): panel intermediate --- src/sass/app/_typography.scss | 2 +- src/sass/theme/bootstrap-overrides/_panel.scss | 4 ++-- src/sass/theme/{components => bootstrap-overrides}/_tabs.scss | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) rename src/sass/theme/{components => bootstrap-overrides}/_tabs.scss (98%) diff --git a/src/sass/app/_typography.scss b/src/sass/app/_typography.scss index 9648c0b..7886501 100644 --- a/src/sass/app/_typography.scss +++ b/src/sass/app/_typography.scss @@ -12,7 +12,7 @@ a { color: $primary; text-decoration: none !important; &:hover { - color: $danger; + color: shade($primary, 20); } } diff --git a/src/sass/theme/bootstrap-overrides/_panel.scss b/src/sass/theme/bootstrap-overrides/_panel.scss index 61b80ed..a335b49 100644 --- a/src/sass/theme/bootstrap-overrides/_panel.scss +++ b/src/sass/theme/bootstrap-overrides/_panel.scss @@ -55,8 +55,8 @@ $panel-heading-font-size: 16px; } .panel-title { - font-weight: 600; - text-transform: uppercase; + font-weight: 400; + //text-transform: uppercase; } .panel-white { diff --git a/src/sass/theme/components/_tabs.scss b/src/sass/theme/bootstrap-overrides/_tabs.scss similarity index 98% rename from src/sass/theme/components/_tabs.scss rename to src/sass/theme/bootstrap-overrides/_tabs.scss index fba7f52..a5cadc4 100644 --- a/src/sass/theme/components/_tabs.scss +++ b/src/sass/theme/bootstrap-overrides/_tabs.scss @@ -126,4 +126,5 @@ .tab-content { padding: 15px; background: #ffffff; + color: $default-text; } \ No newline at end of file