From a94778f70674d36cf86640566abaec3d80b3ef13 Mon Sep 17 00:00:00 2001 From: marco Date: Wed, 13 Feb 2013 08:26:03 -0500 Subject: [PATCH] fixed broken calendar style caused by problem tab styling --- cms/envs/common.py | 2 +- cms/static/sass/_reset.scss | 46 +++++++++++-------------------------- 2 files changed, 15 insertions(+), 33 deletions(-) diff --git a/cms/envs/common.py b/cms/envs/common.py index e2f00362c3..30aac6ea01 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -207,7 +207,7 @@ PIPELINE_CSS = { 'base-style': { 'source_filenames': [ 'js/vendor/CodeMirror/codemirror.css', - 'css/vendor/ui-lightndess/jquery-ui-1.8.22.custom.css', + 'css/vendor/ui-lightness/jquery-ui-1.8.22.custom.css', 'css/vendor/jquery.qtip.min.css', 'sass/base-style.scss' ], diff --git a/cms/static/sass/_reset.scss b/cms/static/sass/_reset.scss index 74e576b682..ee03a0fca3 100644 --- a/cms/static/sass/_reset.scss +++ b/cms/static/sass/_reset.scss @@ -72,6 +72,7 @@ from the tabs component (used in the add component problem tab menu) border-top-left-radius: 0; } + .ui-widget-content { border: 0; background: none; @@ -88,63 +89,43 @@ from the tabs component (used in the add component problem tab menu) .ui-tabs .ui-tabs-nav { padding: 0; +} + +.ui-tabs .ui-tabs-nav li { + margin: 0; + padding: 0; + border: none; top: 0; margin: 0; - float: none; - li { - padding: 0; - } + float: none; + border-top-left-radius: 0; + border-top-right-radius: 0; } .ui-tabs-nav { li { - white-space: normal; top: 0; margin: 0; - white-space: none; } a { float: none; + font-weight: normal; } } + .ui-tabs .ui-tabs-panel { padding: 0; } -.ui-helper-reset { - line-height: 25.6; -} - -.ui-state-default, { - border: none; - background: none; - color: none; - font-weight: 400; -} - -.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { - border: 0; - background: none; - font-weight: normal; - color: #1C94C4; -} - -.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { - border: 0; - background: none; - color: #fff; -} - /* reapplying the tab styles from unit.scss after removing jquery ui ui-lightness styling */ .problem-type-tabs { + border:none; list-style-type: none; width: 100%; - border-top-left-radius: 3px; - border-top-right-radius: 3px; @include linear-gradient(top, rgba(255, 255, 255, .4), rgba(255, 255, 255, 0)); //background-color: $lightBluishGrey; @include box-shadow(0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 -1px 0 rgba(0, 0, 0, 0.2) inset); @@ -158,6 +139,7 @@ removing jquery ui ui-lightness styling &:ui-state-active { background-color: rgba(255, 255, 255, .3); opacity: 1; + font-weight: 400; } a:focus { outline: none;