From a98cead8eefcf66dfb72ed1c4d1a659265c70f9f Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Tue, 20 Nov 2012 13:02:08 -0500 Subject: [PATCH 1/2] added basic lms styles --- askbot | 1 + cms/static/sass/_lms.scss | 69 +++++++++++++++++++++++++++++++++ cms/static/sass/base-style.scss | 1 + 3 files changed, 71 insertions(+) create mode 160000 askbot create mode 100644 cms/static/sass/_lms.scss diff --git a/askbot b/askbot new file mode 160000 index 0000000000..e56ae38084 --- /dev/null +++ b/askbot @@ -0,0 +1 @@ +Subproject commit e56ae380846f7c6cdaeacfc58880fab103540491 diff --git a/cms/static/sass/_lms.scss b/cms/static/sass/_lms.scss new file mode 100644 index 0000000000..6c5fca36cf --- /dev/null +++ b/cms/static/sass/_lms.scss @@ -0,0 +1,69 @@ +.components li { + font-family: 'Open Sans', Verdana, Arial, Helvetica, sans-serif; + font-size: 16px; + line-height: 1.6; + color: #3c3c3c; + + a { + color: #1d9dd9; + text-decoration: none; + } + + p { + font-size: 16px; + line-height: 1.6; + } + + h1 { + float: none; + } + + h2 { + color: #646464; + font-size: 19px; + font-weight: 300; + letter-spacing: 1px; + margin-bottom: 15px; + margin-left: 0; + text-transform: uppercase; + } + + h3 { + font-size: 19px; + font-weight: 400; + } + + h4 { + background: none; + padding: 0; + border: none; + @include box-shadow(none); + font-size: 16px; + font-weight: 400; + } + + code { + margin: 0 2px; + padding: 0px 5px; + border-radius: 3px; + border: 1px solid #eaeaea; + white-space: nowrap; + font-family: Monaco, monospace; + font-size: 14px; + background-color: #f8f8f8; + } + + p + h2, ul + h2, ol + h2, p + h3 { + margin-top: 40px; + } + + p + p, ul + p, ol + p { + margin-top: 20px; + } + + p { + color: #3c3c3c; + font: normal 1em/1.6em; + margin: 0px; + } +} \ No newline at end of file diff --git a/cms/static/sass/base-style.scss b/cms/static/sass/base-style.scss index 6a6105c109..038db536b1 100644 --- a/cms/static/sass/base-style.scss +++ b/cms/static/sass/base-style.scss @@ -24,6 +24,7 @@ @import "modal"; @import "alerts"; @import "login"; +@import "lms"; @import 'jquery-ui-calendar'; @import 'content-types'; From 86ebba3f0eda1d6ac9a7ef4281c759086da35f07 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Mon, 26 Nov 2012 09:55:37 -0500 Subject: [PATCH 2/2] removed askbot --- askbot | 1 - 1 file changed, 1 deletion(-) delete mode 160000 askbot diff --git a/askbot b/askbot deleted file mode 160000 index e56ae38084..0000000000 --- a/askbot +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e56ae380846f7c6cdaeacfc58880fab103540491