diff --git a/.DS_Store b/.DS_Store index 9a2711a1c5..5a0cb2b53d 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/copyright.html b/copyright.html index 0f5dc10b47..eb75b58515 100644 --- a/copyright.html +++ b/copyright.html @@ -1,8 +1,9 @@ <%inherit file="marketing.html" /> -
+
@@ -13,18 +14,38 @@
-
+
-

Licensing Information

+
+

Licensing Information

- - - - - -
Videos and Ungraded Exercises Creative Commons License
The videos on this page are licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License.
Graded ExercisesGraded exercises are All Rights Reserved until the due date. Past the due date, they are licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License.
TextbookTextbook is All Rights Reserved Elsevier. We are using it with permission. We apologize for the inclusion of proprietary work.
Student-generated contentDue to privacy concerns, all forum posts, wiki etc, and other student-created works are All Rights Reserved until released otherwise by MIT.
Source CodeSource code is All Rights Reserved during the beta offering. We expect to release it under a free and open license shortly thereafter.
+
    +
  • +

    Videos and Ungraded Exercises

    +

    Creative Commons License
    The videos on this page are licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License.

    +
    • -

    MIT and MITx are trademarks of the Massachusetts Instititute of -Technology, and may not be used without permission. +

  • +

    Graded Exercises

    +

    Graded exercises are All Rights Reserved until the due date. Past the due date, they are licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License.

    +
    • + +
  • +

    Textbook

    +

    Textbook is All Rights Reserved Elsevier. We are using it with permission. We apologize for the inclusion of proprietary work.

    +
    • + +
  • +

    Student-generated content

    + Due to privacy concerns, all forum posts, wiki etc, and other student-created works are All Rights Reserved until released otherwise by MIT.
    • + +
  • +

    Source Code

    +

    Source code is All Rights Reserved during the beta offering. We expect to release it under a free and open license shortly thereafter.

    +
    • +
+ +

MIT and MITx are trademarks of the Massachusetts Institute of Technology, and may not be used without permission.

+
diff --git a/create_account.html b/create_account.html index 435d4604a4..f64ff106d5 100644 --- a/create_account.html +++ b/create_account.html @@ -3,7 +3,7 @@

Enroll in 6.002 Circuits & Electronics

- <% if 'error' in locals(): e = error %> +
<% if 'error' in locals(): e = error %>
@@ -58,11 +58,15 @@
  • + I agree to the Honor code. +
      +
    • Not engage in any activities that would dishonestly improve my results, or improve or hurt those of others.
      • +
    • Never post answers to problems.
      • +
    • Maintain only one account.
      • +
    • - +
    diff --git a/help.html b/help.html index 8b1abcff84..abf7efd38c 100644 --- a/help.html +++ b/help.html @@ -2,7 +2,7 @@ <%include file="navigation.html" /> -
    +

    Help

    If you need help, first try asking a question in the forums and in the IRC channel (irc.mitx.org, channel #6002). As the semester starts, we will add a Frequently Asked Questions section.

    diff --git a/honor.html b/honor.html index fc934c383e..13be4777b8 100644 --- a/honor.html +++ b/honor.html @@ -1,8 +1,9 @@ <%inherit file="marketing.html" /> -
    +
    @@ -13,14 +14,14 @@
    -
    - -

    Honor Code

    - -
      -
    • I agree to not engage in any activities that would dishonestly improve my results, or improve or hurt those of others. - I agree to never post answers to problems. -
    • I agree to maintain only one account. -
    +
    +
    +

    Honor Code

    +
      +
    • I agree to not engage in any activities that would dishonestly improve my results, or improve or hurt those of others.
      • +
    • I agree to never post answers to problems.
      • +
    • I agree to maintain only one account.
      • +
    +
    diff --git a/index.html b/index.html index 24317c0faf..634b101d5d 100644 --- a/index.html +++ b/index.html @@ -34,7 +34,7 @@
    -

    6.002 on MITx

    +

    6.002 on MITx

    Students who successfully complete the course will receive an electronic certificate of accomplishment from MIT. Since this is an experimental version of the course, the certificate will be marked as Beta.

    diff --git a/main.html b/main.html index e514dfaedb..5e8fcc6136 100644 --- a/main.html +++ b/main.html @@ -17,6 +17,10 @@ + + diff --git a/marketing.html b/marketing.html index 3587ff4a23..4c75eb55d3 100644 --- a/marketing.html +++ b/marketing.html @@ -16,7 +16,7 @@ - + @@ -72,20 +73,22 @@ $(function() {
    • Forum name: ${username}
    • E-mail: ${email}
      • -
    • Location: ${location}
      • -
    • Language: ${language}
      • +
    • + Location:
      ${location}
      Change +
      • +
    • + Language:
      ${language}
      Change +
    -

    Password reset

    +

    We'll e-mail you a password reset link at ${email}. Follow the link in the email to reset your password.

    -

    We'll e-mail you a password reset link at ${email}.

    - - +
    diff --git a/sass/_askbot-original.scss b/sass/_askbot-original.scss new file mode 100644 index 0000000000..0be40af3b6 --- /dev/null +++ b/sass/_askbot-original.scss @@ -0,0 +1,2707 @@ +// Original styles + +/*body { + background: #FFF; + font-size: 14px; + line-height: 150%; + margin: 0; + padding: 0; + color: #000; + font-family: Arial; }*/ + +// div { +// margin: 0 auto; +// padding: 0; } + +// h1, h2, h3, h4, h5, h6, ul, li, dl, dt, dd, form, img, p { +// margin: 0; +// padding: 0; +// border: none; } + +// label { +// vertical-align: middle; } + +// hr { +// border: none; +// border-top: 1px dashed #ccccce; } + +// input, select { +// vertical-align: middle; +// font-family: Trebuchet MS,"segoe ui",Helvetica,Tahoma,Verdana,MingLiu,PMingLiu,Arial,sans-serif; +// margin-left: 0px; } + +// textarea:focus, input:focus { +// outline: none; } + +// iframe { +// border: none; } + +// p { +// font-size: 14px; +// line-height: 140%; +// margin-bottom: 6px; } + +// a { +// color: #1b79bd; +// text-decoration: none; +// cursor: pointer; } + +// h2 { +// font-size: 21px; +// padding: 3px 0 3px 5px; } + +// h3 { +// font-size: 19px; +// padding: 3px 0 3px 5px; } + +// ul { +// list-style: disc; +// margin-left: 20px; +// padding-left: 0px; +// margin-bottom: 1em; } + +// ol { +// list-style: decimal; +// margin-left: 30px; +// margin-bottom: 1em; +// padding-left: 0px; } + +// td ul { +// vertical-align: middle; } + +// li input { +// margin: 3px 3px 4px 3px; } + +// pre { +// font-family: Consolas, Monaco, Liberation Mono, Lucida Console, Monospace; +// font-size: 100%; +// margin-bottom: 10px; +// background-color: #F5F5F5; +// padding-left: 5px; +// padding-top: 5px; +// padding-bottom: 20px; } + +// code { +// font-family: Consolas, Monaco, Liberation Mono, Lucida Console, Monospace; +// font-size: 100%; } + +// blockquote { +// margin-bottom: 10px; +// margin-right: 15px; +// padding: 10px 0px 1px 10px; +// background-color: #F5F5F5; } + +// * html { +// .clearfix, .paginator { +// height: 1; +// overflow: visible; } } + +// +html { +// .clearfix, .paginator { +// min-height: 1%; } } + +.clearfix:after, .paginator:after { + clear: both; + content: "."; + display: block; + height: 0; + visibility: hidden; } + +.badges a { + color: #763333; + text-decoration: underline; } + +a:hover { + text-decoration: underline; } + +.badge-context-toggle.active { + cursor: pointer; + text-decoration: underline; } + +// h1 { +// font-size: 24px; +// padding: 10px 0 5px 0px; } + +body.user-messages { + margin-top: 2.4em; } + +.left { + float: left; } + +.right { + float: right; } + +.clean { + clear: both; } + +.center { + margin: 0 auto; + padding: 0; } + +.notify { + position: fixed; + top: 0px; + left: 0px; + width: 100%; + z-index: 100; + padding: 0; + text-align: center; + background-color: #f5dd69; + border-top: #fff 1px solid; + font-family: 'Yanone Kaffeesatz',sans-serif; + p.notification { + margin-top: 6px; + margin-bottom: 6px; + font-size: 16px; + color: #424242; } } + +#closeNotify { + position: absolute; + right: 5px; + top: 7px; + color: #735005; + text-decoration: none; + line-height: 18px; + background: -6px -5px url(../images/sprites.png) no-repeat; + cursor: pointer; + width: 20px; + height: 20px; + &:hover { + background: -26px -5px url(../images/sprites.png) no-repeat; } } + +#header { + margin-top: 0px; + background: #16160f; + font-family: 'Yanone Kaffeesatz',sans-serif; } + +/*.content-wrapper { + width: 960px; + margin: auto; + position: relative; }*/ + +#logo img { + padding: 5px 0px 5px 0px; + height: 75px; + width: auto; + float: left; } + +#userToolsNav { + height: 20px; + padding-bottom: 5px; + a { + height: 35px; + text-align: right; + margin-left: 20px; + text-decoration: underline; + color: #d0e296; + font-size: 16px; + &:first-child { + margin-left: 0; } + &#ab-responses { + margin-left: 3px; } } + .user-info, .user-micro-info { + color: #b5b593; } + a img { + vertical-align: middle; + margin-bottom: 2px; } + .user-info a { + margin: 0; + text-decoration: none; } } + +#metaNav { + float: right; + a { + color: #e2e2ae; + padding: 0px 0px 0px 35px; + height: 25px; + line-height: 30px; + margin: 5px 0px 0px 10px; + font-size: 18px; + font-weight: 100; + text-decoration: none; + display: block; + float: left; + &:hover { + text-decoration: underline; } + &.on { + font-weight: bold; + color: #FFF; + text-decoration: none; } + &.special { + font-size: 18px; + color: #B02B2C; + font-weight: bold; + text-decoration: none; + &:hover { + text-decoration: underline; } } } + #navTags { + background: -50px -5px url(../images/sprites.png) no-repeat; } + #navUsers { + background: -125px -5px url(../images/sprites.png) no-repeat; } + #navBadges { + background: -210px -5px url(../images/sprites.png) no-repeat; } } + +#header { + &.with-logo #userToolsNav { + position: absolute; + bottom: 0; + right: 0px; } + &.without-logo { + #userToolsNav { + float: left; + margin-top: 7px; } + #metaNav { + margin-bottom: 7px; } } } + +/*#secondaryHeader { + height: 55px; + background: #e9e9e1; + border-bottom: #d3d3c2 1px solid; + border-top: #fcfcfc 1px solid; + margin-bottom: 10px; + font-family: 'Yanone Kaffeesatz',sans-serif; + #homeButton { + border-right: #afaf9e 1px solid; + background: -6px -36px url(../images/sprites.png) no-repeat; + height: 55px; + width: 43px; + display: block; + float: left; + &:hover { + background: -51px -36px url(../images/sprites.png) no-repeat; } } + #scopeWrapper { + width: 688px; + float: left; + a { + display: block; + float: left; } + .scope-selector { + font-size: 21px; + color: #5a5a4b; + height: 55px; + line-height: 55px; + margin-left: 24px; } + .on { + background: url(../images/scopearrow.png) no-repeat center bottom; } + .ask-message { + font-size: 24px; } } }*/ + +#searchBar { + display: inline-block; + background-color: #fff; + width: 412px; + border: 1px solid #c9c9b5; + float: right; + height: 42px; + margin: 6px 0px 0px 15px; + .searchInput, .searchInputCancelable { + font-size: 30px; + height: 40px; + font-weight: 300; + background: #FFF; + border: 0px; + color: #484848; + padding-left: 10px; + font-family: Arial; + vertical-align: middle; } + .searchInput { + width: 352px; } + .searchInputCancelable { + width: 317px; } + .logoutsearch { + width: 337px; } + .searchBtn { + font-size: 10px; + color: #666; + background-color: #eee; + height: 42px; + border: #FFF 1px solid; + line-height: 22px; + text-align: center; + float: right; + margin: 0px; + width: 48px; + background: -98px -36px url(../images/sprites.png) no-repeat; + cursor: pointer; + &:hover { + background: -146px -36px url(../images/sprites.png) no-repeat; } } + .cancelSearchBtn { + font-size: 30px; + color: #ce8888; + background: #fff; + height: 42px; + border: 0px; + border-left: #deded0 1px solid; + text-align: center; + width: 35px; + cursor: pointer; + &:hover { + color: #d84040; } } } + +body.anon #searchBar { + width: 500px; + .searchInput { + width: 440px; } + .searchInputCancelable { + width: 405px; } } + +#askButton { + background: url(../images/bigbutton.png) repeat-x bottom; + line-height: 44px; + text-align: center; + width: 200px; + height: 42px; + font-size: 23px; + color: #4a757f; + margin-top: 7px; + float: right; + text-transform: uppercase; + border-radius: 5px; + -ms-border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + -khtml-border-radius: 5px; + -webkit-box-shadow: 1px 1px 2px #636363; + -moz-box-shadow: 1px 1px 2px #636363; + box-shadow: 1px 1px 2px #636363; + &:hover { + text-decoration: none; + background: url(../images/bigbutton.png) repeat-x top; + text-shadow: 0px 1px 0px #c6d9dd; + -moz-text-shadow: 0px 1px 0px #c6d9dd; + -webkit-text-shadow: 0px 1px 0px #c6d9dd; } } + +/*#ContentLeft { + width: 730px; + float: left; + position: relative; + padding-bottom: 10px; } + +#ContentRight { + width: 200px; + float: right; + padding: 0 0px 10px 0px; }*/ + +#ContentFull { + float: left; + width: 960px; } + +.box { + /*background: #fff;*/ + /*padding: 4px 0px 10px 0px;*/ + /*width: 200px;*/ + p { + margin-bottom: 4px; + &.info-box-follow-up-links { + text-align: right; + margin: 0; } } + h2 { + padding-left: 0; + /*background: #eceeeb;*/ + height: 30px; + line-height: 30px; + /*text-align: right;*/ + /*font-size: 18px !important;*/ + font-weight: normal; + color: #656565; + /*padding-right: 10px;*/ + /*margin-bottom: 10px;*/ + /*font-family: 'Yanone Kaffeesatz',sans-serif;*/ + } + h3 { + /*color: #4a757f;*/ + /*font-size: 18px;*/ + text-align: left; + font-weight: normal; + /*font-family: 'Yanone Kaffeesatz',sans-serif;*/ + padding-left: 0px; } + .contributorback { + background: #eceeeb url(../images/contributorsback.png) no-repeat center left; } + label { + color: #707070; + font-size: 15px; + display: block; + float: right; + text-align: left; + font-family: 'Yanone Kaffeesatz',sans-serif; + width: 80px; + margin-right: 18px; } + #displayTagFilterControl label { + width: 160px; } + ul { + margin-left: 22px; } + li { + list-style-type: disc; + font-size: 13px; + line-height: 20px; + margin-bottom: 10px; + color: #707070; } + ul.tags { + list-style: none; + margin: 0; + padding: 0; + line-height: 170%; + display: block; } + #displayTagFilterControl p label { + color: #707070; + font-size: 15px; } + /*.inputs { + #interestingTagInput, #ignoredTagInput { + width: 153px; + padding-left: 5px; + border: #c9c9b5 1px solid; + height: 25px; } + #interestingTagAdd, #ignoredTagAdd { + background: url(../images/small-button-blue.png) repeat-x top; + border: 0; + color: #4a757f; + font-weight: bold; + font-size: 12px; + width: 30px; + height: 27px; + margin-top: -2px; + cursor: pointer; + border-radius: 4px; + -ms-border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + -khtml-border-radius: 4px; + text-shadow: 0px 1px 0px #e6f6fa; + -moz-text-shadow: 0px 1px 0px #e6f6fa; + -webkit-text-shadow: 0px 1px 0px #e6f6fa; + -webkit-box-shadow: 1px 1px 2px #808080; + -moz-box-shadow: 1px 1px 2px #808080; + box-shadow: 1px 1px 2px #808080; } + #interestingTagAdd:hover, #ignoredTagAdd:hover { + background: url(../images/small-button-blue.png) repeat-x bottom; } }*/ + img.gravatar { + margin: 1px; } + a { + &.followed, &.follow { + background: url(../images/medium-button.png) top repeat-x; + height: 34px; + line-height: 34px; + text-align: center; + border: 0; + font-family: 'Yanone Kaffeesatz',sans-serif; + color: #4a757f; + font-weight: normal; + font-size: 21px; + margin-top: 3px; + display: block; + width: 120px; + text-decoration: none; + border-radius: 4px; + -ms-border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + -khtml-border-radius: 4px; + -webkit-box-shadow: 1px 1px 2px #636363; + -moz-box-shadow: 1px 1px 2px #636363; + box-shadow: 1px 1px 2px #636363; + margin: 0 auto; + padding: 0; } + &.followed:hover, &.follow:hover { + text-decoration: none; + background: url(../images/medium-button.png) bottom repeat-x; + text-shadow: 0px 1px 0px #c6d9dd; + -moz-text-shadow: 0px 1px 0px #c6d9dd; + -webkit-text-shadow: 0px 1px 0px #c6d9dd; } + &.followed { + div.unfollow { + display: none; } + &:hover div { + display: none; + &.unfollow { + display: inline; + color: #a05736; } } } } + .favorite-number { + padding: 5px 0 0 5px; + font-size: 100%; + font-family: Arial; + font-weight: bold; + color: #777; + text-align: center; } + .notify-sidebar #question-subscribe-sidebar { + margin: 7px 0 0 3px; } } + +.statsWidget p { + color: #707070; + font-size: 16px; + border-bottom: #cccccc 1px solid; + font-size: 13px; + strong { + float: right; + padding-right: 10px; } } + +.questions-related { + word-wrap: break-word; + p { + line-height: 20px; + padding: 4px 0px 4px 0px; + font-size: 16px; + font-weight: normal; + border-bottom: #cccccc 1px solid; } + a { + font-size: 13px; } } + +#tips { + li { + color: #707070; + font-size: 13px; + list-style-image: url(../images/tips.png); } + a { + font-size: 16px; } } + +#markdownHelp { + li { + color: #707070; + font-size: 13px; } + a { + font-size: 16px; } } + +.tabBar { + background-color: #eff5f6; + height: 30px; + margin-bottom: 3px; + margin-top: 3px; + float: right; + font-family: Georgia,serif; + font-size: 16px; + border-radius: 5px; + -ms-border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + -khtml-border-radius: 5px; + h2 { + float: left; } } + +.tabsA, .tabsC { + float: right; + position: relative; + display: block; + height: 20px; } + +.tabsA { + float: right; } + +.tabsC { + float: left; } + +.tabsA a, .tabsC a { + border-left: 1px solid #d0e1e4; + color: #7ea9b3; + display: block; + float: left; + height: 20px; + line-height: 20px; + padding: 4px 7px 4px 7px; + text-decoration: none; } + +.tabsA a.on, .tabsC a.on, .tabsA a:hover, .tabsC a:hover { + color: #4a757f; } + +.tabsA .label, .tabsC .label { + float: left; + color: #646464; + margin-top: 4px; + margin-right: 5px; } + +.main-page .tabsA .label { + margin-left: 8px; } + +.tabsB a { + background: #eee; + border: 1px solid #eee; + color: #777; + display: block; + float: left; + height: 22px; + line-height: 28px; + margin: 5px 0px 0 4px; + padding: 0 11px 0 11px; + text-decoration: none; } + +.tabsC .first { + border: none; } + +.rss { + float: right; + font-size: 16px; + color: #f57900; + margin: 5px 0px 3px 7px; + width: 52px; + padding-left: 2px; + padding-top: 3px; + background: white url(../images/feed-icon-small.png) no-repeat center right; + float: right; + font-family: Georgia,serif; + font-size: 16px; + &:hover { + color: #F4A731 !important; } } + +#questionCount { + font-weight: bold; + font-size: 23px; + color: #7ea9b3; + width: 200px; + float: left; + margin-bottom: 8px; + padding-top: 6px; + font-family: 'Yanone Kaffeesatz',sans-serif; } + +#listSearchTags { + float: left; + margin-top: 3px; + color: #707070; + font-size: 16px; + font-family: 'Yanone Kaffeesatz',sans-serif; } + +ul#searchTags { + margin-left: 10px; + float: right; + padding-top: 2px; } + +.search-tips { + font-size: 16px; + line-height: 17px; + color: #707070; + margin: 5px 0 10px 0; + padding: 0px; + float: left; + font-family: 'Yanone Kaffeesatz',sans-serif; + a { + text-decoration: underline; + color: #1b79bd; } } + +#question-list { + float: left; + position: relative; + background-color: #FFF; + padding: 0; + width: 100%; } + +.short-summary { + position: relative; + filter: inherit; + padding: 10px; + border-bottom: 1px solid #DDDBCE; + margin-bottom: 1px; + overflow: hidden; + width: 710px; + float: left; + background: url(../images/summary-background.png) repeat-x; + h2 { + font-size: 24px; + font-weight: normal; + line-height: 26px; + padding-left: 0; + margin-bottom: 6px; + display: block; + font-family: 'Yanone Kaffeesatz',sans-serif; } + a { + color: #464646; } + .userinfo { + text-align: right; + line-height: 16px; + font-family: Arial; + padding-right: 4px; + .relativetime { + font-size: 11px; + clear: both; + font-weight: normal; + color: #555; } } + span.anonymous { + font-size: 11px; + clear: both; + font-weight: normal; + color: #555; } + .userinfo a { + font-weight: bold; + font-size: 11px; } + .counts { + float: right; + margin: 4px 0 0 5px; + font-family: 'Yanone Kaffeesatz',sans-serif; + .item-count { + padding: 0px 5px 0px 5px; + font-size: 25px; + font-family: 'Yanone Kaffeesatz',sans-serif; } + .votes div, .views div, .answers div, .favorites div { + margin-top: 3px; + font-size: 14px; + line-height: 14px; + color: #646464; } } + .tags { + margin-top: 0; } + .votes, .answers, .favorites, .views { + text-align: center; + margin: 0 3px; + padding: 8px 2px 0px 2px; + width: 51px; + float: right; + height: 44px; + border: #dbdbd4 1px solid; } + .votes { + background: url(../images/vote-background.png) repeat-x; } + .answers { + background: url(../images/answers-background.png) repeat-x; } + .views { + background: url(../images/view-background.png) repeat-x; } + .no-votes .item-count { + color: #b1b5b6; } + .some-votes .item-count { + color: #4a757f; } + .no-answers .item-count { + color: #b1b5b6; } + .some-answers .item-count { + color: #eab243; } + .no-views .item-count { + color: #b1b5b6; } + .some-views .item-count { + color: #d33f00; } + .accepted .item-count { + background: url(../images/accept.png) no-repeat top right; + display: block; + text-align: center; + width: 40px; + color: #eab243; } + .some-favorites .item-count { + background: #338333; + color: #d0f5a9; } + .no-favorites .item-count { + background: #eab243; + color: yellow; } } + +.evenMore { + font-size: 13px; + color: #707070; + padding: 15px 0px 10px 0px; + clear: both; + a { + text-decoration: underline; + color: #1b79bd; } } + +.pager { + margin-top: 10px; + margin-bottom: 16px; } + +.pagesize { + margin-top: 10px; + margin-bottom: 16px; + float: right; } + +.paginator { + padding: 5px 0 10px 0; + font-size: 13px; + margin-bottom: 10px; + .prev a, .next a { + background-color: #fff; + color: #777; + padding: 2px 4px 3px 4px; + &:visited { + background-color: #fff; + color: #777; + padding: 2px 4px 3px 4px; } } + a { + color: #7ea9b3; } + .prev { + margin-right: .5em; } + .next { + margin-left: .5em; } + .page a { + padding: .25em; + background-color: #fff; + margin: 0em .25em; + color: #ff; + &:visited { + padding: .25em; + background-color: #fff; + margin: 0em .25em; + color: #ff; } } + .curr { + padding: .25em; + background-color: #fff; + margin: 0em .25em; + color: #ff; + background-color: #8ebcc7; + color: #fff; + font-weight: bold; } + .next a, .prev a { + color: #7ea9b3; } + .page a:hover, .curr a:hover, .prev a:hover, .next a:hover { + color: #8C8C8C; + background-color: #E1E1E1; + text-decoration: none; } + .text { + color: #777; + padding: .3em; } + .paginator-container-left { + padding: 5px 0 10px 0; } } + +.tag-size-1 { + font-size: 12px; } + +.tag-size-2 { + font-size: 13px; } + +.tag-size-3 { + font-size: 14px; } + +.tag-size-4 { + font-size: 15px; } + +.tag-size-5 { + font-size: 16px; } + +.tag-size-6 { + font-size: 17px; } + +.tag-size-7 { + font-size: 18px; } + +.tag-size-8 { + font-size: 19px; } + +.tag-size-9 { + font-size: 20px; } + +.tag-size-10 { + font-size: 21px; } + +ul { + &.tags { + list-style: none; + margin: 0; + padding: 0; + line-height: 170%; + display: block; + &.marked-tags { + list-style: none; + margin: 0; + padding: 0; + line-height: 170%; + display: block; } } + &#related-tags { + list-style: none; + margin: 0; + padding: 0; + line-height: 170%; + display: block; } + &.tags li { + float: left; + display: block; + margin: 0 8px 0 0; + padding: 0; + height: 20px; } } + +.wildcard-tags { + clear: both; } + +ul.tags.marked-tags li, .wildcard-tags ul.tags li { + margin-bottom: 5px; } + +#tagSelector div.inputs { + clear: both; + float: none; + margin-bottom: 10px; } + +.tags-page ul.tags li { + width: 160px; + margin: 5px; } + +ul { + &#ab-user-tags li { + width: 160px; + margin: 5px; } + &#related-tags li { + margin: 0 5px 8px 0; + float: left; + clear: left; } } + +.tag-left { + cursor: pointer; + display: block; + float: left; + height: 17px; + margin: 0 5px 0 0; + padding: 0; + -webkit-box-shadow: 0px 0px 5px #d3d6d7; + -moz-box-shadow: 0px 0px 5px #d3d6d7; + box-shadow: 0px 0px 5px #d3d6d7; } + +.tag-right { + background: #f3f6f6; + border: #fff 1px solid; + border-top: #fff 2px solid; + outline: #cfdbdb 1px solid; + display: block; + float: left; + height: 17px; + line-height: 17px; + font-weight: normal; + font-size: 11px; + padding: 0px 8px 0px 8px; + text-decoration: none; + text-align: center; + white-space: nowrap; + vertical-align: middle; + font-family: Arial; + color: #717179; } + +.deletable-tag { + margin-right: 3px; + white-space: nowrap; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + -moz-border-radius-topright: 4px; + -moz-border-radius-bottomright: 4px; + -webkit-border-bottom-right-radius: 4px; + -webkit-border-top-right-radius: 4px; } + +.tags { + a.tag-right, span.tag-right { + color: #585858; + text-decoration: none; } + a:hover { + color: #1A1A1A; } } + +.users-page h1, .tags-page h1 { + float: left; } + +.main-page h1 { + margin-right: 5px; } + +.delete-icon { + margin-top: -1px; + float: left; + height: 21px; + width: 18px; + display: block; + line-height: 20px; + text-align: center; + background: #bbcdcd; + cursor: default; + color: #fff; + border-top: #cfdbdb 1px solid; + font-family: Arial; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + -moz-border-radius-topright: 4px; + -moz-border-radius-bottomright: 4px; + -webkit-border-bottom-right-radius: 4px; + -webkit-border-top-right-radius: 4px; + text-shadow: 0px 1px 0px #7ea0a0; + -moz-text-shadow: 0px 1px 0px #7ea0a0; + -webkit-text-shadow: 0px 1px 0px #7ea0a0; + &:hover { + background: #b32f2f; } } + +.tag-number { + font-weight: normal; + float: left; + font-size: 16px; + color: #5d5d5d; } + +.badges .tag-number { + float: none; + display: inline; + padding-right: 15px; } + +.section-title { + color: #7ea9b3; + font-family: 'Yanone Kaffeesatz',sans-serif; + font-weight: bold; + font-size: 24px; } + +#fmask { + margin-bottom: 30px; + width: 100%; } + +#askFormBar { + display: inline-block; + padding: 4px 7px 5px 0px; + margin-top: 0px; + p { + margin: 0 0 5px 0; + font-size: 14px; + color: #525252; + line-height: 1.4; } + .questionTitleInput { + font-size: 24px; + line-height: 24px; + height: 36px; + margin: 0px; + padding: 0px 0 0 5px; + border: #cce6ec 3px solid; + width: 725px; } } + +.ask-page div#question-list, .edit-question-page div#question-list { + float: none; + border-bottom: #f0f0ec 1px solid; + float: left; + margin-bottom: 10px; } + +.ask-page div#question-list a, .edit-question-page div#question-list a { + line-height: 30px; } + +.ask-page div#question-list h2, .edit-question-page div#question-list h2 { + font-size: 13px; + padding-bottom: 0; + color: #1b79bd; + border-top: #f0f0ec 1px solid; + border-left: #f0f0ec 1px solid; + height: 30px; + line-height: 30px; + font-weight: normal; } + +.ask-page div#question-list span, .edit-question-page div#question-list span { + width: 28px; + height: 26px; + line-height: 26px; + text-align: center; + margin-right: 10px; + float: left; + display: block; + color: #fff; + background: #b8d0d5; + border-radius: 3px; + -ms-border-radius: 3px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + -khtml-border-radius: 3px; } + +.ask-page label, .edit-question-page label { + color: #525252; + font-size: 13px; } + +.ask-page #id_tags, .edit-question-page #id_tags { + border: #cce6ec 3px solid; + height: 25px; + padding-left: 5px; + width: 395px; + font-size: 14px; } + +.title-desc { + color: #707070; + font-size: 13px; } + +#fmanswer input.submit, .ask-page input.submit, .edit-question-page input.submit { + float: left; + background: url(../images/medium-button.png) top repeat-x; + height: 34px; + border: 0; + font-family: 'Yanone Kaffeesatz',sans-serif; + color: #4a757f; + font-weight: normal; + font-size: 21px; + margin-top: 3px; + border-radius: 4px; + -ms-border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + -khtml-border-radius: 4px; + -webkit-box-shadow: 1px 1px 2px #636363; + -moz-box-shadow: 1px 1px 2px #636363; + box-shadow: 1px 1px 2px #636363; + margin-right: 7px; } + +#fmanswer input.submit:hover, .ask-page input.submit:hover, .edit-question-page input.submit:hover { + text-decoration: none; + background: url(../images/medium-button.png) bottom repeat-x; + text-shadow: 0px 1px 0px #c6d9dd; + -moz-text-shadow: 0px 1px 0px #c6d9dd; + -webkit-text-shadow: 0px 1px 0px #c6d9dd; } + +#editor { + font-size: 100%; + min-height: 200px; + line-height: 18px; + margin: 0; + border-left: #cce6ec 3px solid; + border-bottom: #cce6ec 3px solid; + border-right: #cce6ec 3px solid; + border-top: 0; + padding: 10px; + margin-bottom: 10px; + width: 710px; } + +#id_title { + width: 100%; } + +.wmd-preview { + margin: 3px 0 5px 0; + padding: 6px; + background-color: #F5F5F5; + min-height: 20px; + overflow: auto; + font-size: 13px; + font-family: Arial; + p { + margin-bottom: 14px; + line-height: 1.4; + font-size: 14px; } + pre { + background-color: #E7F1F8; } + blockquote { + background-color: #eee; } + IMG { + max-width: 600px; } } + +.preview-toggle { + width: 100%; + color: #b6a475; + text-align: left; + span:hover { + cursor: pointer; } } + +.after-editor { + margin-top: 15px; + margin-bottom: 15px; } + +.checkbox { + margin-left: 5px; + font-weight: normal; + cursor: help; } + +.question-options { + margin-top: 1px; + color: #666; + line-height: 13px; + margin-bottom: 5px; + label { + vertical-align: text-bottom; } } + +.edit-content-html { + border-top: 1px dotted #D8D2A9; + border-bottom: 1px dotted #D8D2A9; + margin: 5px 0 5px 0; } + +.edit-question-page, #fmedit, .wmd-preview { + color: #525252; } + +.edit-question-page #id_revision, #fmedit #id_revision, .wmd-preview #id_revision { + font-size: 14px; + margin-top: 5px; + margin-bottom: 5px; } + +.edit-question-page #id_title, #fmedit #id_title, .wmd-preview #id_title { + font-size: 24px; + line-height: 24px; + height: 36px; + margin: 0px; + padding: 0px 0 0 5px; + border: #cce6ec 3px solid; + width: 725px; + margin-bottom: 10px; } + +.edit-question-page #id_summary, #fmedit #id_summary, .wmd-preview #id_summary { + border: #cce6ec 3px solid; + height: 25px; + padding-left: 5px; + width: 395px; + font-size: 14px; } + +.edit-question-page .title-desc, #fmedit .title-desc, .wmd-preview .title-desc { + margin-bottom: 10px; } + +.question-page { + h1 { + padding-top: 0px; + font-family: 'Yanone Kaffeesatz',sans-serif; + a { + color: #464646; + font-size: 30px; + font-weight: normal; + line-height: 1; } } + p.rss { + float: none; + clear: both; + padding: 3px 0 0 23px; + font-size: 15px; + width: 110px; + background-position: center left; + margin-left: 0px !important; + a { + font-family: 'Yanone Kaffeesatz',sans-serif; + vertical-align: top; } } + .question-content { + float: right; + width: 682px; + margin-bottom: 10px; } + #question-table { + float: left; + border-top: #f0f0f0 1px solid; + margin: 6px 0 6px 0; + border-spacing: 0px; + width: 670px; + padding-right: 10px; } + .answer-table { + margin: 6px 0 6px 0; + border-spacing: 0px; + width: 670px; + padding-right: 10px; + margin-top: 0px; + border-bottom: 1px solid #D4D4D4; + float: right; + td { + width: 20px; + vertical-align: top; } } + #question-table td { + width: 20px; + vertical-align: top; } + .question-body, .answer-body { + overflow: auto; + margin-top: 10px; + font-family: Arial; + color: #4b4b4b; } + .question-body p, .answer-body p { + margin-bottom: 14px; + line-height: 1.4; + font-size: 14px; + padding: 0px 5px 5px 0px; } + .question-body a, .answer-body a { + color: #1b79bd; } + .question-body li, .answer-body li { + margin-bottom: 7px; } + .question-body IMG, .answer-body IMG { + max-width: 600px; } + .post-update-info-container { + float: right; + width: 175px; } + .post-update-info { + background: white url(../images/background-user-info.png) repeat-x bottom; + float: right; + font-size: 9px; + font-family: Arial; + width: 158px; + padding: 4px; + margin: 0px 0px 5px 5px; + line-height: 14px; + border-radius: 4px; + -ms-border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + -khtml-border-radius: 4px; + -webkit-box-shadow: 0px 2px 1px #bfbfbf; + -moz-box-shadow: 0px 2px 1px #bfbfbf; + box-shadow: 0px 2px 1px #bfbfbf; + p { + line-height: 13px; + font-size: 11px; + margin: 0 0 2px 1px; + padding: 0; } + a { + color: #444; } + .gravatar { + float: left; + margin-right: 4px; } + p.tip { + color: #444; + line-height: 13px; + font-size: 10px; } } + .post-controls { + font-size: 11px; + line-height: 12px; + min-width: 200px; + padding-left: 5px; + text-align: right; + clear: left; + float: right; + margin-top: 10px; + margin-bottom: 8px; + a { + color: #777; + padding: 0px 3px 3px 22px; + cursor: pointer; + border: none; + font-size: 12px; + font-family: Arial; + text-decoration: none; + height: 18px; + display: block; + float: right; + line-height: 18px; + margin-top: -2px; + margin-left: 4px; + &:hover { + background-color: #f5f0c9; + border-radius: 3px; + -ms-border-radius: 3px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + -khtml-border-radius: 3px; } } + .sep { + color: #ccc; + float: right; + height: 18px; + font-size: 18px; } + .question-delete { + background: url(../images/delete.png) no-repeat center left; + padding-left: 16px; } } + .answer-controls .question-delete { + background: url(../images/delete.png) no-repeat center left; + padding-left: 16px; } + .post-controls .question-flag, .answer-controls .question-flag { + background: url(../images/flag.png) no-repeat center left; } + .post-controls .question-edit, .answer-controls .question-edit { + background: url(../images/edit2.png) no-repeat center left; } + .post-controls .question-retag, .answer-controls .question-retag { + background: url(../images/retag.png) no-repeat center left; } + .post-controls .question-close, .answer-controls .question-close { + background: url(../images/close.png) no-repeat center left; } + .post-controls .permant-link, .answer-controls .permant-link { + background: url(../images/link.png) no-repeat center left; } + .tabBar { + width: 100%; } + #questionCount { + float: left; + font-family: 'Yanone Kaffeesatz',sans-serif; + line-height: 15px; } + .question-img-upvote, .question-img-downvote, .answer-img-upvote, .answer-img-downvote { + width: 25px; + height: 20px; + cursor: pointer; } + .question-img-upvote, .answer-img-upvote { + background: url(../images/vote-arrow-up-new.png) no-repeat; } + .question-img-downvote, .answer-img-downvote { + background: url(../images/vote-arrow-down-new.png) no-repeat; } + .question-img-upvote { + &:hover, &.on { + background: url(../images/vote-arrow-up-on-new.png) no-repeat; } } + .answer-img-upvote { + &:hover, &.on { + background: url(../images/vote-arrow-up-on-new.png) no-repeat; } } + .question-img-downvote { + &:hover, &.on { + background: url(../images/vote-arrow-down-on-new.png) no-repeat; } } + .answer-img-downvote { + &:hover, &.on { + background: url(../images/vote-arrow-down-on-new.png) no-repeat; } } + #fmanswer_button { + margin: 8px 0px; } + .question-img-favorite:hover { + background: url(../images/vote-favorite-on.png); } + div.comments { + padding: 0; } + #comment-title { + font-weight: bold; + font-size: 23px; + color: #7ea9b3; + width: 200px; + float: left; + font-family: 'Yanone Kaffeesatz',sans-serif; } + .comments { + font-size: 12px; + clear: both; + div.controls { + clear: both; + float: left; + width: 100%; + margin: 3px 0 20px 5px; } + .controls a { + color: #988e4c; + padding: 0 3px 2px 22px; + font-family: Arial; + font-size: 13px; + background: url(../images/comment.png) no-repeat center left; + &:hover { + background-color: #f5f0c9; + text-decoration: none; } } + .button { + color: #988e4c; + font-size: 11px; + padding: 3px; + cursor: pointer; } + a { + background-color: inherit; + color: #1b79bd; + padding: 0; } + form.post-comments { + margin: 3px 26px 0 42px; + textarea { + font-size: 13px; + line-height: 1.3; } } + textarea { + height: 42px; + width: 100%; + margin: 7px 0 5px 1px; + font-family: Arial; + outline: none; + overflow: auto; + font-size: 12px; + line-height: 140%; + padding-left: 2px; + padding-top: 3px; + border: #cce6ec 3px solid; } + input { + margin-left: 10px; + margin-top: 1px; + vertical-align: top; + width: 100px; } + button { + background: url(../images/small-button-blue.png) repeat-x top; + border: 0; + color: #4a757f; + font-family: Arial; + font-size: 13px; + width: 100px; + font-weight: bold; + height: 27px; + line-height: 25px; + margin-bottom: 5px; + cursor: pointer; + border-radius: 4px; + -ms-border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + -khtml-border-radius: 4px; + text-shadow: 0px 1px 0px #e6f6fa; + -moz-text-shadow: 0px 1px 0px #e6f6fa; + -webkit-text-shadow: 0px 1px 0px #e6f6fa; + -webkit-box-shadow: 1px 1px 2px #808080; + -moz-box-shadow: 1px 1px 2px #808080; + box-shadow: 1px 1px 2px #808080; + &:hover { + background: url(../images/small-button-blue.png) bottom repeat-x; + text-shadow: 0px 1px 0px #c6d9dd; + -moz-text-shadow: 0px 1px 0px #c6d9dd; + -webkit-text-shadow: 0px 1px 0px #c6d9dd; } } + .counter { + display: inline-block; + width: 245px; + float: right; + color: #b6a475 !important; + vertical-align: top; + font-family: Arial; + float: right; + text-align: right; } + .comment { + border-bottom: 1px solid #edeeeb; + clear: both; + margin: 0; + margin-top: 8px; + padding-bottom: 4px; + overflow: auto; + font-family: Arial; + font-size: 11px; + min-height: 25px; + background: white url(../images/comment-background.png) bottom repeat-x; + border-radius: 5px; + -ms-border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + -khtml-border-radius: 5px; } + div.comment:hover { + background-color: #efefef; } + a.author { + background-color: inherit; + color: #1b79bd; + padding: 0; + &:hover { + text-decoration: underline; } } + span.delete-icon { + background: url(../images/close-small.png) no-repeat; + border: 0; + width: 14px; + height: 14px; + &:hover { + border: #BC564B 2px solid; + border-radius: 10px; + -ms-border-radius: 10px; + -moz-border-radius: 10px; + -webkit-border-radius: 10px; + -khtml-border-radius: 10px; + margin: -3px 0px 0px -2px; } } + .content { + margin-bottom: 7px; } + .comment-votes { + float: left; + width: 37px; + line-height: 130%; + padding: 6px 5px 6px 3px; } + .comment-body { + line-height: 1.3; + margin: 3px 26px 0 46px; + padding: 5px 3px; + color: #666; + font-size: 13px; + .edit { + padding-left: 6px; } + p { + font-size: 13px; + line-height: 1.3; + margin-bottom: 3px; + padding: 0; } } + .comment-delete { + float: right; + width: 14px; + line-height: 130%; + padding: 8px 6px; } + .upvote { + margin: 0px; + padding-right: 17px; + padding-top: 2px; + text-align: right; + height: 20px; + font-size: 13px; + font-weight: bold; + color: #777; + &.upvoted { + color: #d64000; } + &.hover { + background: url(../images/go-up-grey.png) no-repeat; + background-position: right 1px; } + &:hover { + background: url(../images/go-up-orange.png) no-repeat; + background-position: right 1px; } } + .help-text { + float: right; + text-align: right; + color: gray; + margin-bottom: 0px; + margin-top: 0px; + line-height: 50%; } } + #questionTools { + font-size: 22px; + margin-top: 11px; + text-align: left; } + .question-status { + margin-top: 10px; + margin-bottom: 15px; + padding: 20px; + background-color: #fef7cc; + text-align: center; + border: #e1c04a 1px solid; + h3 { + font-size: 20px; + color: #707070; + font-weight: normal; } } + .vote-buttons { + float: left; + text-align: center; + padding-top: 2px; + margin: 10px 10px 0px 3px; + IMG { + cursor: pointer; } } + .vote-number { + font-family: 'Yanone Kaffeesatz',sans-serif; + padding: 0px 0 5px 0; + font-size: 25px; + font-weight: bold; + color: #777; } + .vote-buttons .notify-sidebar { + text-align: left; + width: 120px; + label { + vertical-align: top; } } + .tabBar-answer { + margin-bottom: 15px; + padding-left: 7px; + width: 723px; + margin-top: 10px; } + .answer .vote-buttons { + float: left; } + .accepted-answer { + background-color: #f7fecc; + border-bottom-color: #9BD59B; + .vote-buttons { + width: 27px; + margin-right: 10px; + margin-top: 10px; } } + .answer .post-update-info a { + color: #444444; } + .answered { + background: #CCC; + color: #999; } + .answered-accepted { + background: #DCDCDC; + color: #763333; + strong { + color: #E1E818; } } + .answered-by-owner { + background: #F1F1FF; + .comments { + .button { + background-color: #E6ECFF; } + background-color: #E6ECFF; } + .vote-buttons { + margin-right: 10px; } } + .answer-img-accept:hover { + background: url(../images/vote-accepted-on.png); } + .answer-body { + a { + color: #1b79bd; } + li { + margin-bottom: 0.7em; } } + #fmanswer { + color: #707070; + line-height: 1.2; + margin-top: 10px; + h2 { + font-family: 'Yanone Kaffeesatz',sans-serif; + color: #7ea9b3; + font-size: 24px; } + label { + font-size: 13px; } } + .message { + padding: 5px; + margin: 0px 0 10px 0; } } + +@media screen and (-webkit-min-device-pixel-ratio:0) { + textarea { + padding-left: 3px !important; } } + +.facebook-share.icon, .twitter-share.icon, .linkedin-share.icon, .identica-share.icon { + background: url(../images/socialsprite.png) no-repeat; + display: block; + text-indent: -100em; + height: 25px; + width: 25px; + margin-bottom: 3px; } + +.facebook-share.icon:hover, .twitter-share.icon:hover, .linkedin-share.icon:hover, .identica-share.icon:hover { + opacity: 0.8; + filter: alpha(opacity = 80); } + +.facebook-share.icon { + background-position: -26px 0px; } + +.identica-share.icon { + background-position: -78px 0px; } + +.twitter-share.icon { + margin-top: 10px; + background-position: 0px 0px; } + +.linkedin-share.icon { + background-position: -52px 0px; } + +.openid-signin, .meta, .users-page, .user-profile-edit-page { + font-size: 13px; + line-height: 1.3; + color: #525252; } + +.openid-signin p, .meta p, .users-page p, .user-profile-edit-page p { + font-size: 13px; + color: #707070; + line-height: 1.3; + font-family: Arial; + color: #525252; + margin-bottom: 12px; } + +.openid-signin h2, .meta h2, .users-page h2, .user-profile-edit-page h2 { + color: #525252; + padding-left: 0px; + font-size: 16px; } + +.openid-signin form, .meta form, .users-page form, .user-profile-edit-page form, .user-profile-page form { + margin-bottom: 15px; } + +.openid-signin input[type="text"], .meta input[type="text"], .users-page input[type="text"], .user-profile-edit-page input[type="text"], .user-profile-page input[type="text"], .openid-signin input[type="password"], .meta input[type="password"], .users-page input[type="password"], .user-profile-edit-page input[type="password"], .user-profile-page input[type="password"], .openid-signin select, .meta select, .users-page select, .user-profile-edit-page select, .user-profile-page select { + border: #cce6ec 3px solid; + height: 25px; + padding-left: 5px; + width: 395px; + font-size: 14px; } + +.openid-signin select, .meta select, .users-page select, .user-profile-edit-page select, .user-profile-page select { + width: 405px; + height: 30px; } + +.openid-signin textarea, .meta textarea, .users-page textarea, .user-profile-edit-page textarea, .user-profile-page textarea { + border: #cce6ec 3px solid; + padding-left: 5px; + padding-top: 5px; + width: 395px; + font-size: 14px; } + +.openid-signin input.submit, .meta input.submit, .users-page input.submit, .user-profile-edit-page input.submit, .user-profile-page input.submit { + background: url(../images/small-button-blue.png) repeat-x top; + border: 0; + color: #4a757f; + font-weight: bold; + font-size: 13px; + font-family: Arial; + height: 26px; + margin: 5px 0px; + width: 100px; + cursor: pointer; + border-radius: 4px; + -ms-border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + -khtml-border-radius: 4px; + text-shadow: 0px 1px 0px #e6f6fa; + -moz-text-shadow: 0px 1px 0px #e6f6fa; + -webkit-text-shadow: 0px 1px 0px #e6f6fa; + -webkit-box-shadow: 1px 1px 2px #808080; + -moz-box-shadow: 1px 1px 2px #808080; + box-shadow: 1px 1px 2px #808080; } + +.openid-signin input.submit:hover, .meta input.submit:hover, .users-page input.submit:hover, .user-profile-edit-page input.submit:hover, .user-profile-page input.submit:hover { + background: url(../images/small-button-blue.png) repeat-x bottom; + text-decoration: none; } + +.openid-signin .cancel, .meta .cancel, .users-page .cancel, .user-profile-edit-page .cancel, .user-profile-page .cancel { + background: url(../images/small-button-cancel.png) repeat-x top !important; + color: #525252 !important; } + +.openid-signin .cancel:hover, .meta .cancel:hover, .users-page .cancel:hover, .user-profile-edit-page .cancel:hover, .user-profile-page .cancel:hover { + background: url(../images/small-button-cancel.png) repeat-x bottom !important; } + +#email-input-fs, #local_login_buttons, #password-fs, #openid-fs { + margin-top: 10px; } + +#email-input-fs #id_email, #local_login_buttons #id_email, #password-fs #id_email, #openid-fs #id_email, #email-input-fs #id_username, #local_login_buttons #id_username, #password-fs #id_username, #openid-fs #id_username, #email-input-fs #id_password, #local_login_buttons #id_password, #password-fs #id_password, #openid-fs #id_password { + font-size: 12px; + line-height: 20px; + height: 20px; + margin: 0px; + padding: 0px 0 0 5px; + border: #cce6ec 3px solid; + width: 200px; } + +#email-input-fs .submit-b, #local_login_buttons .submit-b, #password-fs .submit-b, #openid-fs .submit-b { + background: url(../images/small-button-blue.png) repeat-x top; + border: 0; + color: #4a757f; + font-weight: bold; + font-size: 13px; + font-family: Arial; + height: 24px; + margin-top: -2px; + padding-left: 10px; + padding-right: 10px; + cursor: pointer; + border-radius: 4px; + -ms-border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + -khtml-border-radius: 4px; + text-shadow: 0px 1px 0px #e6f6fa; + -moz-text-shadow: 0px 1px 0px #e6f6fa; + -webkit-text-shadow: 0px 1px 0px #e6f6fa; + -webkit-box-shadow: 1px 1px 2px #808080; + -moz-box-shadow: 1px 1px 2px #808080; + box-shadow: 1px 1px 2px #808080; } + +#email-input-fs .submit-b:hover, #local_login_buttons .submit-b:hover, #password-fs .submit-b:hover, #openid-fs .submit-b:hover { + background: url(../images/small-button-blue.png) repeat-x bottom; } + +.openid-input { + background: url(../images/openid.gif) no-repeat; + padding-left: 15px; + cursor: pointer; } + +.openid-login-input { + background-position: center left; + background: url(../images/openid.gif) no-repeat 0% 50%; + padding: 5px 5px 5px 15px; + cursor: pointer; + font-family: Trebuchet MS; + font-weight: 300; + font-size: 150%; + width: 500px; } + +.openid-login-submit { + height: 40px; + width: 80px; + line-height: 40px; + cursor: pointer; + border: 1px solid #777; + font-weight: bold; + font-size: 120%; } + +.tabBar-user { + width: 375px; } + +.user { + padding: 5px; + line-height: 140%; + width: 166px; + border: #eee 1px solid; + margin-bottom: 5px; + border-radius: 3px; + -ms-border-radius: 3px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + -khtml-border-radius: 3px; + .user-micro-info { + color: #525252; } + ul { + margin: 0; + list-style-type: none; } + .thumb { + clear: both; + float: left; + margin-right: 4px; + display: inline; } } + +.tabBar-tags { + width: 270px; + margin-bottom: 15px; } + +a { + &.medal { + font-size: 17px; + line-height: 250%; + margin-right: 5px; + color: #333; + text-decoration: none; + background: url(../images/medala.gif) no-repeat; + border-left: 1px solid #EEE; + border-top: 1px solid #EEE; + border-bottom: 1px solid #CCC; + border-right: 1px solid #CCC; + padding: 4px 12px 4px 6px; } + &:hover.medal { + color: #333; + text-decoration: none; + background: url(../images/medala_on.gif) no-repeat; + border-left: 1px solid #E7E296; + border-top: 1px solid #E7E296; + border-bottom: 1px solid #D1CA3D; + border-right: 1px solid #D1CA3D; } } + +#award-list .user { + float: left; + margin: 5px; } + +.tabBar-profile { + width: 100%; + margin-bottom: 15px; + float: left; } + +.user-profile-page { + font-size: 13px; + color: #525252; + p { + font-size: 13px; + line-height: 1.3; + color: #525252; } + .avatar img { + border: #eee 1px solid; + padding: 5px; } + h2 { + padding: 10px 0px 10px 0px; + font-family: 'Yanone Kaffeesatz',sans-serif; } } + +.user-details { + font-size: 13px; + h3 { + font-size: 16px; } } + +.user-about { + background-color: #EEEEEE; + height: 200px; + line-height: 20px; + overflow: auto; + padding: 10px; + width: 90%; + p { + font-size: 13px; } } + +.follow-toggle, .submit { + border: 0 !important; + color: #4a757f; + font-weight: bold; + font-size: 12px; + height: 26px; + line-height: 26px; + margin-top: -2px; + font-size: 15px; + cursor: pointer; + font-family: 'Yanone Kaffeesatz',sans-serif; + background: url(../images/small-button-blue.png) repeat-x top; + border-radius: 4px; + -ms-border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + -khtml-border-radius: 4px; + text-shadow: 0px 1px 0px #e6f6fa; + -moz-text-shadow: 0px 1px 0px #e6f6fa; + -webkit-text-shadow: 0px 1px 0px #e6f6fa; + -webkit-box-shadow: 1px 1px 2px #808080; + -moz-box-shadow: 1px 1px 2px #808080; + box-shadow: 1px 1px 2px #808080; } + +.follow-toggle:hover, .submit:hover { + background: url(../images/small-button-blue.png) repeat-x bottom; + text-decoration: none !important; } + +.follow-toggle { + .follow { + font-color: #000; + font-style: normal; } + .unfollow { + div.unfollow-red { + display: none; } + &:hover div { + &.unfollow-red { + display: inline; + color: #fff; + font-weight: bold; + color: #A05736; } + &.unfollow-green { + display: none; } } } } + +.count { + font-family: 'Yanone Kaffeesatz',sans-serif; + font-size: 200%; + font-weight: 700; + color: #777777; } + +.scoreNumber { + font-family: 'Yanone Kaffeesatz',sans-serif; + font-size: 35px; + font-weight: 800; + color: #777; + line-height: 40px; + margin-top: 3px; } + +.vote-count { + font-family: Arial; + font-size: 160%; + font-weight: 700; + color: #777; } + +.answer-summary { + display: block; + clear: both; + padding: 3px; } + +.answer-votes { + background-color: #EEEEEE; + color: #555555; + float: left; + font-family: Arial; + font-size: 15px; + font-weight: bold; + height: 17px; + padding: 2px 4px 5px; + text-align: center; + text-decoration: none; + width: 20px; + margin-right: 10px; + border-radius: 4px; + -ms-border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + -khtml-border-radius: 4px; } + +.karma-summary { + padding: 5px; + font-size: 13px; + h3 { + text-align: center; + font-weight: bold; + padding: 5px; } } + +.karma-diagram { + width: 477px; + height: 300px; + float: left; + margin-right: 10px; } + +.karma-details { + float: right; + width: 450px; + height: 250px; + overflow-y: auto; + word-wrap: break-word; + p { + margin-bottom: 10px; } } + +.karma-gained { + font-weight: bold; + background: #eee; + width: 25px; + margin-right: 5px; + color: green; + padding: 3px; + display: block; + float: left; + text-align: center; + border-radius: 3px; + -ms-border-radius: 3px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + -khtml-border-radius: 3px; } + +.karma-lost { + font-weight: bold; + background: #eee; + width: 25px; + color: red; + padding: 3px; + display: block; + margin-right: 5px; + float: left; + text-align: center; + border-radius: 3px; + -ms-border-radius: 3px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + -khtml-border-radius: 3px; } + +.submit-row { + margin-bottom: 10px; } + +.revision { + margin: 10px 0 10px 0; + font-size: 13px; + color: #525252; + p { + font-size: 13px; + line-height: 1.3; + color: #525252; } + h3 { + font-family: 'Yanone Kaffeesatz',sans-serif; + font-size: 21px; + padding-left: 0px; } + .header { + background-color: #F5F5F5; + padding: 5px; + cursor: pointer; } + .author { + background-color: #e9f3f5; } + .summary { + padding: 5px 0 10px 0; + span { + background-color: #fde785; + padding: 6px; + border-radius: 4px; + -ms-border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + -khtml-border-radius: 4px; + display: inline; + -webkit-box-shadow: 1px 1px 4px #cfb852; + -moz-box-shadow: 1px 1px 4px #cfb852; + box-shadow: 1px 1px 4px #cfb852; } } + .answerbody { + padding: 10px 0 5px 10px; } + .revision-mark { + width: 150px; + text-align: left; + display: inline-block; + font-size: 11px; + overflow: hidden; + .gravatar { + float: left; + margin-right: 4px; + padding-top: 5px; } } + .revision-number { + font-size: 300%; + font-weight: bold; + font-family: sans-serif; } } + +del { + color: #C34719; + .post-tag { + color: #C34719; } } + +ins { + .post-tag, p { + background-color: #E6F0A2; } + background-color: #E6F0A2; } + +.vote-notification { + z-index: 1; + cursor: pointer; + display: none; + position: absolute; + font-family: Arial; + font-size: 14px; + font-weight: normal; + color: white; + background-color: #8e0000; + text-align: center; + padding-bottom: 10px; + -webkit-box-shadow: 0px 2px 4px #370000; + -moz-box-shadow: 0px 2px 4px #370000; + box-shadow: 0px 2px 4px #370000; + border-radius: 4px; + -ms-border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + -khtml-border-radius: 4px; + h3 { + background: url(../images/notification.png) repeat-x top; + padding: 10px 10px 10px 10px; + font-size: 13px; + margin-bottom: 5px; + border-top: #8e0000 1px solid; + color: #fff; + font-weight: normal; + border-top-right-radius: 4px; + border-top-left-radius: 4px; + -moz-border-radius-topright: 4px; + -moz-border-radius-topleft: 4px; + -webkit-border-top-left-radius: 4px; + -webkit-border-top-right-radius: 4px; } + a { + color: #fb7321; + text-decoration: underline; + font-weight: bold; } } + +#ground { + width: 100%; + clear: both; + border-top: 1px solid #000; + padding: 6px 0 0 0; + background: #16160f; + font-size: 16px; + font-family: 'Yanone Kaffeesatz',sans-serif; + p { + margin-bottom: 0; } } + +.footer-links { + color: #EEE; + text-align: left; + width: 500px; + float: left; + a { + color: #e7e8a8; } } + +.powered-link { + width: 500px; + float: left; + text-align: left; + a { + color: #8ebcc7; } } + +.copyright { + color: #616161; + width: 450px; + float: right; + text-align: right; + a { + color: #8ebcc7; } + img.license-logo { + margin: 6px 0px 20px 10px; + float: right; } } + +.notify-me { + float: left; } + +span { + &.text-counter { + margin-right: 20px; } + &.form-error { + color: #990000; + font-weight: normal; + margin-left: 5px; } } + +p.form-item { + margin: 0px; } + +.deleted { + background: #F4E7E7 none repeat scroll 0 0; } + +.form-row { + line-height: 25px; } + +table { + &.form-as-table { + margin-top: 5px; + ul { + list-style-type: none; + display: inline; } + li { + display: inline; } + td { + text-align: right; } + th { + text-align: left; + font-weight: normal; } } + &.ab-subscr-form, &.ab-tag-filter-form { + width: 45em; } } + +.submit-row { + line-height: 30px; + padding-top: 10px; + display: block; + clear: both; } + +.errors { + line-height: 20px; + color: red; } + +.error { + color: darkred; + margin: 0; + font-size: 10px; } + +label.retag-error { + color: darkred; + padding-left: 5px; + font-size: 10px; } + +.fieldset { + border: none; + margin-top: 10px; + padding: 10px; } + +span.form-error { + color: #990000; + font-size: 90%; + font-weight: normal; + margin-left: 5px; } + +.favorites-empty { + width: 32px; + height: 45px; + float: left; } + +.user-info-table { + margin-bottom: 10px; + border-spacing: 0; } + +.user-stats-table .narrow { + width: 660px; } + +.narrow .summary h3 { + padding: 0px; + margin: 0px; } + +.relativetime { + font-weight: bold; + text-decoration: none; } + +.narrow .tags { + float: left; } + +.user-action-1 { + font-weight: bold; + color: #333; } + +.user-action-2 { + font-weight: bold; + color: #CCC; } + +.user-action-3, .user-action-4 { + color: #333; } + +.user-action-5, .user-action-6 { + color: darkred; } + +.user-action-7 { + color: #333; } + +.user-action-8 { + padding: 3px; + font-weight: bold; + background-color: #CCC; + color: #763333; } + +.revision-summary { + background-color: #FFFE9B; + padding: 2px; } + +.question-title-link a { + font-weight: bold; + color: #0077CC; } + +.answer-title-link a { + color: #333; } + +.post-type-1 a, .post-type-3 a, .post-type-5 a { + font-weight: bold; } + +.post-type-2 a, .post-type-4 a, .post-type-6 a, .post-type-8 a { + color: #333; } + +.hilite, .hilite1 { + background-color: #ff0; } + +.hilite2 { + background-color: #f0f; } + +.hilite3 { + background-color: #0ff; } + +.gold, .badge1 { + color: #FFCC00; } + +.silver, .badge2 { + color: #CCCCCC; } + +.bronze, .badge3 { + color: #CC9933; } + +.score { + font-weight: 800; + color: #333; } + +a { + &.comment { + background: #EEE; + color: #993300; + padding: 5px; } + &.offensive { + color: #999; } } + +.message { + h1 { + padding-top: 0px; + font-size: 15px; } + p { + margin-bottom: 0px; } } + +p.space-above { + margin-top: 10px; } + +.warning { + color: red; } + +button::-moz-focus-inner { + padding: 0; + border: none; } + +.submit { + cursor: pointer; + background-color: #D4D0C8; + height: 30px; + border: 1px solid #777777; + font-weight: bold; + font-size: 120%; + &:hover { + text-decoration: underline; } + &.small { + margin-right: 5px; + height: 20px; + font-weight: normal; + font-size: 12px; + padding: 1px 5px; + &:hover { + text-decoration: none; } } } + +.question-page a.submit { + display: -moz-inline-stack; + display: inline-block; + line-height: 30px; + padding: 0 5px; + *display: inline; } + +.noscript { + position: fixed; + top: 0px; + left: 0px; + width: 100%; + z-index: 100; + padding: 5px 0; + text-align: center; + font-family: sans-serif; + font-size: 120%; + font-weight: Bold; + color: #FFFFFF; + background-color: #AE0000; } + +.big { + font-size: 14px; } + +.strong { + font-weight: bold; } + +.orange { + color: #d64000; + font-weight: bold; } + +.grey { + color: #808080; } + +.about div { + padding: 10px 5px 10px 5px; + border-top: 1px dashed #aaaaaa; } + +.highlight { + background-color: #FFF8C6; } + +.nomargin { + margin: 0; } + +.margin-bottom { + margin-bottom: 10px; } + +.margin-top { + margin-top: 10px; } + +.inline-block { + display: inline-block; } + +.action-status { + margin: 0; + border: none; + text-align: center; + line-height: 10px; + font-size: 12px; + padding: 0; + span { + padding: 3px 5px 3px 5px; + background-color: #fff380; + font-weight: normal; + -moz-border-radius: 5px; + -khtml-border-radius: 5px; + -webkit-border-radius: 5px; } } + +.list-table td { + vertical-align: top; } + +table.form-as-table { + .errorlist { + display: block; + margin: 0; + padding: 0 0 0 5px; + text-align: left; + font-size: 10px; + color: darkred; } + input { + display: inline; + margin-left: 4px; } + th { + vertical-align: bottom; + padding-bottom: 4px; } } + +.form-row-vertical { + margin-top: 8px; + display: block; + label { + margin-bottom: 3px; + display: block; } } + +.text-align-right { + text-align: center; } + +ul.form-horizontal-rows { + list-style: none; + margin: 0; + li { + position: relative; + height: 40px; } + label { + display: inline-block; } + ul.errorlist { + list-style: none; + color: darkred; + font-size: 10px; + line-height: 10px; + position: absolute; + top: 2px; + left: 180px; + text-align: left; + margin: 0; + li { + height: 10px; } } + label { + position: absolute; + left: 0px; + bottom: 6px; + margin: 0px; + line-height: 12px; + font-size: 12px; } + li input { + position: absolute; + bottom: 0px; + left: 180px; + margin: 0px; } } + +.narrow .summary { + float: left; } + +.user-profile-tool-links { + font-weight: bold; + vertical-align: top; } + +ul { + &.post-tags { + margin-left: 3px; + li { + margin-top: 4px; + margin-bottom: 3px; } } + &.post-retag { + margin-bottom: 0px; + margin-left: 5px; } } + +#question-controls .tags { + margin: 0 0 3px 0; } + +#tagSelector { + padding-bottom: 2px; + margin-bottom: 0; } + +#related-tags { + padding-left: 3px; } + +#hideIgnoredTagsControl { + margin: 5px 0 0 0; + label { + font-size: 12px; + color: #666; } } + +#hideIgnoredTagsCb { + margin: 0 2px 0 1px; } + +#recaptcha_widget_div { + width: 318px; + float: left; + clear: both; } + +p.signup_p { + margin: 20px 0px 0px 0px; } + +.simple-subscribe-options ul { + list-style: none; + list-style-position: outside; + margin: 0; } + +.wmd-preview { + a { + color: #1b79bd; } + li { + margin-bottom: 7px; + font-size: 14px; } } + +.search-result-summary { + font-weight: bold; + font-size: 18px; + line-height: 22px; + margin: 0px 0px 0px 0px; + padding: 2px 0 0 0; + float: left; } + +.faq-rep-item { + text-align: right; + padding-right: 5px; } + +.user-info-table .gravatar { + margin: 0; } + +#responses { + clear: both; + line-height: 18px; + margin-bottom: 15px; + div.face { + float: left; + text-align: center; + width: 54px; + padding: 3px; + overflow: hidden; } } + +.response-parent { + margin-top: 18px; + strong { + font-size: 20px; } } + +.re { + min-height: 57px; + clear: both; + margin-top: 10px; } + +#responses input { + float: left; } + +#re_tools { + margin-bottom: 10px; } + +#re_sections { + margin-bottom: 6px; + .on { + font-weight: bold; } } + +.avatar-page { + ul { + list-style: none; } + li { + display: inline; } } + +.user-profile-page { + .avatar p { + margin-bottom: 0px; } + .tabBar a#stats { + margin-left: 0; } + img.gravatar { + margin: 2px 0 3px 0; } + h3 { + padding: 0; + margin-top: -3px; } } + +.userList { + font-size: 13px; } + +img.flag { + border: 1px solid #eee; + vertical-align: text-top; } + +.main-page img.flag { + vertical-align: text-bottom; } + +a.edit { + padding-left: 3px; + color: #145bff; } + +.str { + color: #080; } + +.kwd { + color: #008; } + +.com { + color: #800; } + +.typ { + color: #606; } + +.lit { + color: #066; } + +.pun { + color: #660; } + +.pln { + color: #000; } + +.tag { + color: #008; } + +.atn { + color: #606; } + +.atv { + color: #080; } + +.dec { + color: #606; } + +pre.prettyprint { + clear: both; + padding: 3px; + border: 0px solid #888; } + +@media print { + .str { + color: #060; } + .kwd { + color: #006; + font-weight: bold; } + .com { + color: #600; + font-style: italic; } + .typ { + color: #404; + font-weight: bold; } + .lit { + color: #044; } + .pun { + color: #440; } + .pln { + color: #000; } + .tag { + color: #006; + font-weight: bold; } + .atn { + color: #404; } + .atv { + color: #060; } } + diff --git a/sass/_base.scss b/sass/_base.scss index a1c643af3d..db8b718fb7 100644 --- a/sass/_base.scss +++ b/sass/_base.scss @@ -11,14 +11,15 @@ h2 { text-transform: uppercase; } -h3 { - -} - p { margin-bottom: $body-line-height; } +em { + font-style: italic; + font-family: Georgia, serif; +} + #{$all-text-inputs}, textarea { @include box-shadow(0 -1px 0 #fff); @include linear-gradient(#eee, #fff); diff --git a/sass/_discussion.scss b/sass/_discussion.scss index b6c4c49c19..2ae7ea7004 100644 --- a/sass/_discussion.scss +++ b/sass/_discussion.scss @@ -1,3 +1,108 @@ -secondaryHeader { +.secondary-nav { @extend .topbar; + margin: 0; + padding: 15px 0; + + nav { + @extend .clearfix; + @extend .wrapper; + @include box-sizing(border-box); + padding: 0 $body-line-height; + + div { + float: left; + + &.question-filter { + font-size:16px; + margin-top: 4px; + width: grid-width(4); + + ul { + @include border-radius(35px); + background: darken(#F6EFD4, 20%); + display: inline; + margin: 0 0 0 10px; + padding: $body-line-height/4 20px; + + li { + display: inline-block; + list-style: none; + margin-right: 10px; + + &:last-child { + margin-right: 0; + } + + a { + text-transform: capitalize; + text-shadow: none; + font-size: 14px; + + &.on { + font-weight: bold; + } + } + } + } + } + + &.search-box { + margin-left:2%; + text-align:right; + width: grid-width(8); + } + + } + } +} + +.content-wrapper { + @extend .clearfix; + @extend .wrapper; + @include box-shadow(0 1px 0 #fff); + @include box-sizing(border-box); + background: #fff; + border: 1px solid #ccc; + border-top: 0; + + .discussion-content { + /*@extend .content;*/ + @include box-sizing(border-box); + display: table-cell; + padding: $gw-gutter; + vertical-align: top; + width: grid-width(9); + } + + aside { + @extend .sidebar; + width: grid-width(2.5); + padding: $gw-gutter; + + h2 { + font-size: 16px; + } + + h3 { + border-bottom: 0; + box-shadow: none; + } + + input[type="text"] { + width: 68%; + } + + #displayTagFilterControl { + margin-top: 10px; + } + } +} + +.footer-wrapper { + @extend .clearfix; + @extend .wrapper; + @include box-shadow(0 1px 0 #fff); + @include box-sizing(border-box); + border-top: 0; + padding: 0 $gw-gutter/2; } diff --git a/sass/_fancybox.scss b/sass/_fancybox.scss index 4ea9b3aba9..17dd52621e 100644 --- a/sass/_fancybox.scss +++ b/sass/_fancybox.scss @@ -4,6 +4,7 @@ div#fancybox-overlay { div#fancybox-wrap { width: auto !important; + div#fancybox-outer { background: none; max-width: 600px; @@ -26,7 +27,6 @@ div#fancybox-wrap { h1 { font-size: 24px; margin-top: 0; - font-family: "Oswald"; padding-bottom: lh(); border-bottom: 1px solid #eee; margin-bottom: lh(); @@ -35,28 +35,40 @@ div#fancybox-wrap { form { text-align: left; - div#enroll_error { - padding-bottom: lh(); - color: #DF8B2C; + div#enroll_error, div#login_error { + margin-bottom: lh(); + background-color: #F50200; + color: #fff; text-transform: uppercase; letter-spacing: 1px; font-weight: bold; + -webkit-font-smoothing: antialiased; + padding: lh(.2); + + &:empty { + padding: 0; + } + } + + label { + display: block; + font-weight: bold; + } + + #{$all-text-inputs} { + width: 100%; + @include box-sizing(border-box); + } + + input[type="checkbox"] { + margin-right: 10px; } ol { li { margin-bottom: lh(); - width: grid-width(6); - float: left; - - &:nth-child(odd) { - margin-right: $gw-gutter; - } &.terms, &.remember { - float: none; - width: auto; - clear: both; padding-top: lh(); border-top: 1px solid #eee; } @@ -66,18 +78,18 @@ div#fancybox-wrap { float: none; } - label { - display: block; - font-weight: bold; - } - #{$all-text-inputs} { - width: 100%; - @include box-sizing(border-box); - } + ul { + list-style: disc outside none; + margin: lh(.5) 0 lh() lh(); - input[type="checkbox"] { - margin-right: 10px; + li { + list-style: disc outside none; + margin-bottom: lh(.5); + color: #666; + font-size: 14px; + float: none; + } } } } @@ -89,6 +101,7 @@ div#fancybox-wrap { } } + div#login { min-width: 300px; @@ -106,11 +119,22 @@ div#fancybox-wrap { a { color: #999; + &:hover { color: #444; } } } + + div#pwd_reset { + p { + margin-bottom: lh(); + } + + input[type="email"] { + margin-bottom: lh(); + } + } } } } diff --git a/sass/_help.scss b/sass/_help.scss new file mode 100644 index 0000000000..3e65a78b53 --- /dev/null +++ b/sass/_help.scss @@ -0,0 +1,19 @@ +section.help.main-content { + padding: lh(); + + p { + max-width: 700px; + } + + dl { + margin-bottom: lh(); + + dd, dt { + margin-bottom: lh(.5); + } + + dt { + font-weight: bold; + } + } +} diff --git a/sass/_index-variables.scss b/sass/_index-variables.scss index ad365b9457..80b1512232 100644 --- a/sass/_index-variables.scss +++ b/sass/_index-variables.scss @@ -24,4 +24,6 @@ $header-font-family: "Open Sans", Helvetica, Arial, sans-serif; $lh: golden-ratio($body-font-size, 1); +// Colors $mit-red: #990000; +$cream: #F6EFD4; diff --git a/sass/_index.scss b/sass/_index.scss index 71fdd34cde..7703412cb4 100644 --- a/sass/_index.scss +++ b/sass/_index.scss @@ -5,6 +5,13 @@ src: local('Open Sans'), local('OpenSans'), url('http://themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3bO3LdcAZYWl9Si6vvxL-qU.woff') format('woff'); } +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 400; + src: local('Open Sans Italic'), local('OpenSans-Italic'), url('http://themes.googleusercontent.com/static/fonts/opensans/v6/xjAJXh38I15wypJXxuGMBrrIa-7acMAeDBVuclsi6Gc.woff') format('woff'); +} + @font-face { font-family: 'Open Sans'; font-style: normal; @@ -12,8 +19,12 @@ src: local('Open Sans Extrabold'), local('OpenSans-Extrabold'), url('http://themes.googleusercontent.com/static/fonts/opensans/v6/EInbV5DfGHOiMmvb1Xr-hqRDOzjiPcYnFooOUGCOsRk.woff') format('woff'); } - - +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 800; + src: local('Open Sans Extrabold Italic'), local('OpenSans-ExtraboldItalic'), url('http://themes.googleusercontent.com/static/fonts/opensans/v6/PRmiXeptR36kaC0GEAetxsBo4hlZyBvkZICS3KpNonM.woff') format('woff'); +} // Extends //---------------------------------------- // .wrapper { @@ -25,6 +36,37 @@ width: flex-grid(12); } +.subpage { + @extend .clearfix; + @extend .wrapper; + + > div { + padding-left: flex-grid(4) + flex-gutter(); + + p { + margin-bottom: lh(); + } + + h1 { + margin-bottom: lh(.5); + } + + h2 { + font: 18px $header-font-family; + color: #000; + margin-bottom: lh(.5); + } + + ul { + list-style: disc outside none; + + li { + list-style: disc outside none; + } + } + } +} + .clearfix:after { content: "."; display: block; @@ -43,6 +85,8 @@ margin: lh() 0 lh(.5); padding: lh(.25) lh(.5); text-decoration: none; + font-style: normal; + -webkit-font-smoothing: antialiased; &:hover { background-color: darken($mit-red, 10%); @@ -54,40 +98,63 @@ } } - body { background-color: #fff; color: #444; font: $body-font-size $body-font-family; -#{$all-text-inputs}, textarea { - @include box-shadow(0 -1px 0 #fff); - @include linear-gradient(#eee, #fff); - border: 1px solid #999; - font: $body-font-size $body-font-family; - padding: 4px; - width: 100%; - - &:focus { - border-color: $mit-red; + h1 { + font: 800 24px $header-font-family; + } + + li { + margin-bottom: lh(); + } + + em { + font-style: italic; + } + + a { + color: $mit-red; + font-style: italic; + text-decoration: none; + + &:hover, &:focus { + color: darken($mit-red, 10%); + } + } + + #{$all-text-inputs}, textarea { + @include box-shadow(0 -1px 0 #fff); + @include linear-gradient(#eee, #fff); + border: 1px solid #999; + font: $body-font-size $body-font-family; + padding: 4px; + width: 100%; + + &:focus { + border-color: $mit-red; + } } -} } header.announcement { - color: #fff; + // @include background-size(cover); + background: #333; border-bottom: 1px solid #000; - background: #e3e3e3; - @include background-size(cover); + color: #fff; + -webkit-font-smoothing: antialiased; &.home { + background: #e3e3e3 url("/static/images/marketing/shot-1-medium.jpg"); + @media screen and (min-width: 1200px) { background: #e3e3e3 url("/static/images/marketing/shot-1-large.jpg"); } - @media screen and (max-width: 1199px) { - background: #e3e3e3 url("/static/images/marketing/shot-1-medium.jpg"); - } + // @media screen and (max-width: 1199px) { + // } div { padding: lh(10) lh() lh(3); @@ -95,6 +162,7 @@ header.announcement { } &.course { + background: #e3e3e3 url("/static/images/marketing/course-bg-small.jpg"); @media screen and (min-width: 1200px) { background: #e3e3e3 url("/static/images/marketing/course-bg-large.jpg"); @@ -102,12 +170,6 @@ header.announcement { @media screen and (max-width: 1199px) and (min-width: 700px) { background: #e3e3e3 url("/static/images/marketing/course-bg-medium.jpg"); - @include background-size(cover); - } - - @media screen and (max-width: 699px) { - background: #e3e3e3 url("/static/images/marketing/course-bg-small.jpg"); - @include background-size(cover); } div { @@ -124,6 +186,7 @@ header.announcement { top: 0; right: lh(); @include border-radius(0 0 3px 3px); + background: #333; background: rgba(#000, .7); padding: lh(.5); @@ -132,7 +195,7 @@ header.announcement { margin-right: lh(); a { - font: 800 18px $header-font-family; + font: italic 800 18px $header-font-family; color: #fff; text-decoration: none; } @@ -142,6 +205,7 @@ header.announcement { text-decoration: none; color: #fff; font-size: 12px; + font-style: normal; &:hover { color: rgba(#fff, .6); @@ -267,6 +331,7 @@ section.index-content { p { width: auto; + clear: both; strong { font-family: "Open sans"; @@ -326,6 +391,8 @@ section.index-content { } ul { + list-style: none; + li { img { float: left; @@ -399,6 +466,10 @@ section.index-content { } } +section.copyright, section.tos, section.privacy-policy, section.honor-code { + @extend .subpage; +} + footer { @extend .wrapper; @extend .clearfix; diff --git a/sass/_layout.scss b/sass/_layout.scss index ff82cabc80..f1fd1d4395 100644 --- a/sass/_layout.scss +++ b/sass/_layout.scss @@ -29,6 +29,11 @@ html { float: left; color: #000; text-shadow: 0 1px 0 lighten($mit-red, 10%); + + em { + @include inline-block(); + padding-right: lh(); + } } nav { @@ -44,7 +49,7 @@ html { margin: 0; li { - margin-right: $body-line-height; + margin-right: lh(); display: inline-block; margin-bottom: 0; diff --git a/sass/_reset.scss b/sass/_reset.scss index d1f752f88e..726fccc466 100644 --- a/sass/_reset.scss +++ b/sass/_reset.scss @@ -1,47 +1,102 @@ -html, body, div, span, applet, object, iframe, +/* +html5doctor.com Reset Stylesheet +v1.6.1 +Last Updated: 2010-09-17 +Author: Richard Clark - http://richclarkdesign.com +Twitter: @rich_clark +*/ + +html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, -a, abbr, acronym, address, big, cite, code, -del, dfn, em, font, img, ins, kbd, q, s, samp, -small, strike, strong, sub, sup, tt, var, +abbr, address, cite, code, +del, dfn, em, img, ins, kbd, q, samp, +small, strong, sub, sup, var, +b, i, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td { - margin: 0; - padding: 0; - border: 0; - outline: 0; - font-weight: inherit; - font-style: inherit; - font-size: 100%; - font-family: inherit; - vertical-align: baseline; -} -/* remember to define focus styles! */ -:focus { - outline: 0; -} -body { - line-height: 1; - color: black; - background: white; -} -ol, ul { - list-style: none; -} -/* tables still need 'cellspacing="0"' in the markup */ -table { - border-collapse: separate; - border-spacing: 0; -} -caption, th, td { - text-align: left; - font-weight: normal; -} -blockquote:before, blockquote:after, -q:before, q:after { - content: ""; -} -blockquote, q { - quotes: "" ""; +table, caption, tbody, tfoot, thead, tr, th, td, +article, aside, canvas, details, figcaption, figure, +footer, header, hgroup, menu, nav, section, summary, +time, mark, audio, video { + margin:0; + padding:0; + border:0; + outline:0; + font-size:100%; + vertical-align:baseline; + background:transparent; } +body { + line-height:1; +} + +article,aside,details,figcaption,figure, +footer,header,hgroup,menu,nav,section { + display:block; +} + +nav ul { + list-style:none; +} + +blockquote, q { + quotes:none; +} + +blockquote:before, blockquote:after, +q:before, q:after { + content:''; + content:none; +} + +a { + margin:0; + padding:0; + font-size:100%; + vertical-align:baseline; + background:transparent; +} + +/* change colours to suit your needs */ +ins { + background-color:#ff9; + color:#000; + text-decoration:none; +} + +/* change colours to suit your needs */ +mark { + background-color:#ff9; + color:#000; + font-style:italic; + font-weight:bold; +} + +del { + text-decoration: line-through; +} + +abbr[title], dfn[title] { + border-bottom:1px dotted; + cursor:help; +} + +table { + border-collapse:collapse; + border-spacing:0; +} + +/* change border colour to suit your needs */ +hr { + display:block; + height:1px; + border:0; + border-top:1px solid #cccccc; + margin:1em 0; + padding:0; +} + +input, select { + vertical-align:middle; +} diff --git a/sass/_wiki.scss b/sass/_wiki.scss index 095dd0bd9e..d05f466048 100644 --- a/sass/_wiki.scss +++ b/sass/_wiki.scss @@ -129,6 +129,5 @@ div.wiki-wrapper { p { line-height: 1.6em; } - } } diff --git a/sass/application.scss b/sass/application.scss index c3b53d00da..cd7267791b 100644 --- a/sass/application.scss +++ b/sass/application.scss @@ -13,7 +13,8 @@ @import "profile"; @import "wiki-create", "wiki"; @import "activation"; -@import "discussion"; +@import "help"; +@import "discussion", "askbot-original"; // left over @import "theme"; diff --git a/simplewiki_base.html b/simplewiki_base.html index a4f792b825..cc33a52d42 100644 --- a/simplewiki_base.html +++ b/simplewiki_base.html @@ -84,7 +84,7 @@ if (wiki_article is not UNDEFINED): baseURL = reverse("wiki_view", args=[wiki_article.get_url()]) else: - baseURL = reverse("wiki_view", args=[""]) + baseURL = reverse("wiki_view", args=["/"]) %>
      @@ -113,14 +113,14 @@
      <% - theaction = "this.wiki_article_name.value.replace(/([^a-zA-Z0-9\-])/g, '')+'/_create/'" + theaction = "this.wiki_article_name.value.replace(/([^a-zA-Z0-9\-])/g, '')" if (wiki_article is not UNDEFINED): - baseURL = reverse("wiki_view", args=[wiki_article.get_url()]) + baseURL = reverse("wiki_create", args=[wiki_article.get_url()]) else: - baseURL = reverse("wiki_view", args=[""]) + baseURL = reverse("wiki_create", args=["/"]) %> -
      +
      diff --git a/simplewiki_edit.html b/simplewiki_edit.html index fc35c48b30..fbb4b143a3 100644 --- a/simplewiki_edit.html +++ b/simplewiki_edit.html @@ -14,6 +14,7 @@ ${ wiki_article.title } ${wiki_form} - + + diff --git a/simplewiki_error.html b/simplewiki_error.html index eb78521fb0..91721abfc5 100644 --- a/simplewiki_error.html +++ b/simplewiki_error.html @@ -18,85 +18,66 @@ ${wiki_error} %endif %if wiki_err_notfound is not UNDEFINED: -%if wiki_url is not UNDEFINED: -

      -The page you requested could not be found. -Click here to create it. -

      -%else: -

      -Or maybe rather: Congratulations! It seems that there's no root -article, which is probably because you just installed simple-wiki -and your installation is working. Now you can create the root article. -Click here to create it. -

      -%endif + %if wiki_url is not UNDEFINED: +

      + The page you requested could not be found. + Click here to create it. +

      + %else: +

      + Or maybe rather: Congratulations! It seems that there's no root + article, which is probably because you just installed simple-wiki + and your installation is working. Now you can create the root article. + Click here to create it. +

      + %endif %else: %if wiki_err_noparent is not UNDEFINED: -

      -You cannot create this page, because its parent -does not exist. Click here -to create it. -

      +

      + You cannot create this page, because its parent + does not exist. Click here + to create it. +

      %else: - -%if wiki_err_keyword is not UNDEFINED: -

      -The page you're trying to create ${wiki_url} starts with _, which is reserved for internal use. -

      +%if wiki_err_keyword is not UNDEFINED and wiki_err_keyword: +

      + The page you're trying to create ${wiki_url} starts with _, which is reserved for internal use. +

      +%elif wiki_err_locked is not UNDEFINED and wiki_err_locked: +

      + The article you are trying to modify is locked. +

      +%elif wiki_err_noread is not UNDEFINED and wiki_err_noread: +

      + You do not have access to read this article. +

      +%elif wiki_err_nowrite is not UNDEFINED and wiki_err_nowrite: +

      + You do not have access to edit this article. +

      +%elif wiki_err_noanon is not UNDEFINED and wiki_err_noanon: +

      + Anonymous attachments are not allowed. Try logging in. +

      +%elif wiki_err_create is not UNDEFINED and wiki_err_create: +

      + You do not have access to create this article. +

      +%elif wiki_err_encode is not UNDEFINED and wiki_err_encode: +

      + The url you requested could not be handled by the wiki. + Probably you used a bad character in the URL. + Only use digits, English letters, underscore and dash. For instance + /wiki/An_Article-1 +

      +%elif wiki_err_deleted is not UNDEFINED and wiki_err_deleted: +

      + The article you tried to access has been deleted. You may be able to restore it to an earlier version in its history, or create a new version. +

      %else: - -%if wiki_err_locked is not UNDEFINED: -

      -The article you are trying to modify is locked. -

      -%else: - -%if wiki_err_noread is not UNDEFINED: -

      -You do not have access to read this article. -

      -%else: - -%if wiki_err_nowrite is not UNDEFINED: -

      -You do not have access to edit this article. -

      -%else: - -%if wiki_err_noanon is not UNDEFINED: -

      -Anonymous attachments are not allowed. Try logging in. -

      -%else: - -%if wiki_err_create is not UNDEFINED: -

      -You do not have access to create this article. -

      -%else: - -%if wiki_err_encode is not UNDEFINED: -

      -The url you requested could not be handled by the wiki. -Probably you used a bad character in the URL. -Only use digits, English letters, underscore and dash. For instance -/wiki/An_Article-1 -

      - - -%else: -

      -An error has occured. -

      - - -%endif -%endif -%endif -%endif -%endif -%endif +

      + An error has occured. +

      %endif %endif %endif diff --git a/simplewiki_history.html b/simplewiki_history.html index 936459354b..c5c873ed3b 100644 --- a/simplewiki_history.html +++ b/simplewiki_history.html @@ -27,30 +27,32 @@ ${ wiki_article.title } <% loopCount = 0 %> %for revision in wiki_history: - <% loopCount += 1 %> - - - - - - - ${ revision.revision_text if revision.revision_text else "None" } - - %for x in revision.get_diff(): - ${x|h}
      - %endfor - ${revision.get_user} -
      - ${revision.revision_date.strftime("%b %d, %Y, %I:%M %p")} - - + %if revision.deleted < 2 or show_delete_revision: + <% loopCount += 1 %> + + + + + + + ${ revision.revision_text if revision.revision_text else "None" } + + %for x in revision.get_diff(): + ${x|h}
      + %endfor + ${revision.get_user()} +
      + ${revision.revision_date.strftime("%b %d, %Y, %I:%M %p")} + + + %endif %endfor %if wiki_prev_page or wiki_next_page: @@ -68,10 +70,16 @@ ${ wiki_article.title } %endif - +%if show_delete_revision: + + + + +%endif diff --git a/simplewiki_searchresults.html b/simplewiki_searchresults.html index a96a7a1a97..88b70c3b7e 100644 --- a/simplewiki_searchresults.html +++ b/simplewiki_searchresults.html @@ -16,11 +16,8 @@ <%block name="wiki_body"> %for article in wiki_search_results: - %if article is not UNDEFINED: - ${article.get_url()}
      - %else: - /
      - %endif + <% article_deleted = not article.current_revision.deleted == 0 %> + ${article.get_url()} ${'(Deleted)' if article_deleted else ''}
      %endfor %if not wiki_search_results: diff --git a/simplewiki_view.html b/simplewiki_view.html index 31511e5d92..d939e3e1d8 100644 --- a/simplewiki_view.html +++ b/simplewiki_view.html @@ -3,7 +3,7 @@ <%inherit file="simplewiki_base.html"/> <%block name="wiki_page_title"> - ${ wiki_article.title } + ${ wiki_article.title } ${'- Deleted Revision!' if wiki_current_revision_deleted else ''} <%block name="wiki_body"> diff --git a/tos.html b/tos.html index 94feac75e2..50350735b5 100644 --- a/tos.html +++ b/tos.html @@ -1,8 +1,9 @@ <%inherit file="marketing.html" /> -
      +
      @@ -13,18 +14,13 @@
      -
      - -

      Terms of Service

      - - - - - - -
      Videos and Ungraded Exercises Creative Commons License
      The videos on this page are licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License.
      Graded ExercisesGraded exercises are All Rights Reserved until the due date. Past the due date, they are licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License.
      TextbookTextbook is All Rights Reserved Elsevier. We are using it with permission. We apologize for the inclusion of proprietary work.
      Student-generated contentDue to privacy concerns, all forum posts, wiki etc, and other student-created works are All Rights Reserved until released otherwise by MIT.
      Source CodeSource code is All Rights Reserved during the beta offering. We expect to release it under a free and open license shortly thereafter.
      - -

      MIT and MITx are trademarks of the Massachusetts Instititute of -Technology, and may not be used without permission. +

      +
      +

      MITx Terms of Service

      +

      Welcome to MITx. You must read and agree to these Terms of Service ("TOS") prior to using any portion of this site (”Site“), including accessing any chat room, mailing list, or other electronic service. These TOS, MITx’s Privacy Policy [link] and Honor Code [link] are an agreement between you and the Massachusetts Institute of Technology ("MIT"). By registering for, accessing, browsing, or using any portion of the Site, you acknowledge that you have read, understood and agree to be bound by these TOS, the Privacy Policy and Honor Code.

      +

      MITx reserves the right to modify these TOS at any time and will publish notice of any such modifications online on the Site’s homepage for a reasonable period of time following such modifications, and by changing the effective date of these TOS. By continuing to access the Site after notice of such modifications has been published, you signify your agreement to be bound by them.

      +

      Description of MITx

      +

      MITx offers online courses, professor-to-student and student-to-student interactivity, individual assessment of a student&rsqyo;s work, and the opportunity for students who demonstrate their mastery of subjects to earn a certificate or credential awarded by MITx.

      +