From d42e393036718388e5d6291bb41e9e0ed1d1abd3 Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Tue, 31 Jan 2012 16:01:40 -0500 Subject: [PATCH] Merge with default --- css/application.css | 753 +++++++++++++++---------------------------- css/marketing-ie.css | 7 + css/marketing.css | 4 +- 3 files changed, 263 insertions(+), 501 deletions(-) create mode 100644 css/marketing-ie.css diff --git a/css/application.css b/css/application.css index b5308e409c..258f7d9e4a 100644 --- a/css/application.css +++ b/css/application.css @@ -129,7 +129,7 @@ input, select { font-weight: 800; font-style: italic; } -.clearfix:after, .topbar:after, div.course-wrapper section.course-content ol.sequence-nav:after, div.book-wrapper section.book nav:after, div.wiki-wrapper section.wiki-body header:after, body.askbot .secondary-nav nav:after, html body div.header-wrapper header:after, html body div.header-wrapper header nav ul:after, html body section.main-content:after, html footer:after, div.course-wrapper section.course-content ol.vert-mod > li:after, div.book-wrapper section.book nav ul:after, div.wiki-wrapper div#wiki_panel div#wiki_create_form:after, body.askbot footer div.footer-wrapper:after { +.clearfix:after, .topbar:after, div.course-wrapper section.course-content ol.sequence-nav:after, div.book-wrapper section.book nav:after, div.wiki-wrapper section.wiki-body header:after, body.askbot .secondary-nav nav:after, html body div.header-wrapper header:after, html body div.header-wrapper header nav ul:after, html body section.main-content:after, html footer:after, div.course-wrapper section.course-content ol.vert-mod > li:after, section.course-content div.video-wrapper section.video-controls:after, section.course-content div.video-wrapper section.video-controls div#slider:after, div.book-wrapper section.book nav ul:after, div.wiki-wrapper div#wiki_panel div#wiki_create_form:after, body.askbot footer div.footer-wrapper:after { content: "."; display: block; height: 0; @@ -284,25 +284,30 @@ input, select { font-size: 12px; text-shadow: 0 1px 0 #fff; } .topbar a, div.course-wrapper section.course-content ol.sequence-nav a, div.book-wrapper section.book nav a, div.wiki-wrapper section.wiki-body header a, body.askbot .secondary-nav nav a { - -webkit-box-shadow: inset 1px 0 0 #faf7e9; - -moz-box-shadow: inset 1px 0 0 #faf7e9; - -ms-box-shadow: inset 1px 0 0 #faf7e9; - -o-box-shadow: inset 1px 0 0 #faf7e9; - box-shadow: inset 1px 0 0 #faf7e9; - background: #f2e7bf; - border-left: 1px solid #e4d080; - color: #292309; - padding: 16.989px; - text-transform: uppercase; - display: block; } + color: #292309; } .topbar a:hover, div.course-wrapper section.course-content ol.sequence-nav a:hover, div.book-wrapper section.book nav a:hover, div.wiki-wrapper section.wiki-body header a:hover, body.askbot .secondary-nav nav a:hover { color: #7e691a; - text-decoration: none; - background: none; } + text-decoration: none; } + .topbar a.block-link, div.course-wrapper section.course-content ol.sequence-nav a.block-link, div.book-wrapper section.book nav a.block-link, div.wiki-wrapper section.wiki-body header a.block-link, body.askbot .secondary-nav nav a.block-link, .topbar div.course-wrapper section.course-content ol.sequence-nav a, div.course-wrapper section.course-content ol.sequence-nav .topbar a, div.course-wrapper section.course-content ol.sequence-nav a, div.book-wrapper section.book nav div.course-wrapper section.course-content ol.sequence-nav a, div.course-wrapper section.course-content ol.sequence-nav div.book-wrapper section.book nav a, div.wiki-wrapper section.wiki-body header div.course-wrapper section.course-content ol.sequence-nav a, div.course-wrapper section.course-content ol.sequence-nav div.wiki-wrapper section.wiki-body header a, body.askbot .secondary-nav nav div.course-wrapper section.course-content ol.sequence-nav a, div.course-wrapper section.course-content ol.sequence-nav body.askbot .secondary-nav nav a, .topbar div.book-wrapper section.book nav a, div.book-wrapper section.book nav .topbar a, div.course-wrapper section.course-content ol.sequence-nav div.book-wrapper section.book nav a, div.book-wrapper section.book nav div.course-wrapper section.course-content ol.sequence-nav a, div.book-wrapper section.book nav a, div.wiki-wrapper section.wiki-body header div.book-wrapper section.book nav a, div.book-wrapper section.book nav div.wiki-wrapper section.wiki-body header a, body.askbot .secondary-nav div.book-wrapper section.book nav a, div.book-wrapper section.book body.askbot .secondary-nav nav a, .topbar div.wiki-wrapper section.wiki-body header a, div.wiki-wrapper section.wiki-body header .topbar a, div.course-wrapper section.course-content ol.sequence-nav div.wiki-wrapper section.wiki-body header a, div.wiki-wrapper section.wiki-body header div.course-wrapper section.course-content ol.sequence-nav a, div.book-wrapper section.book nav div.wiki-wrapper section.wiki-body header a, div.wiki-wrapper section.wiki-body header div.book-wrapper section.book nav a, div.wiki-wrapper section.wiki-body header a, body.askbot .secondary-nav nav div.wiki-wrapper section.wiki-body header a, div.wiki-wrapper section.wiki-body header body.askbot .secondary-nav nav a { + -webkit-box-shadow: inset 1px 0 0 #faf7e9; + -moz-box-shadow: inset 1px 0 0 #faf7e9; + -ms-box-shadow: inset 1px 0 0 #faf7e9; + -o-box-shadow: inset 1px 0 0 #faf7e9; + box-shadow: inset 1px 0 0 #faf7e9; + background: #f2e7bf; + border-left: 1px solid #e4d080; + padding: 16.989px; + text-transform: uppercase; + display: block; } + .topbar a.block-link:hover, div.course-wrapper section.course-content ol.sequence-nav a.block-link:hover, div.book-wrapper section.book nav a.block-link:hover, div.wiki-wrapper section.wiki-body header a.block-link:hover, body.askbot .secondary-nav nav a.block-link:hover, .topbar div.course-wrapper section.course-content ol.sequence-nav a:hover, div.course-wrapper section.course-content ol.sequence-nav .topbar a:hover, div.course-wrapper section.course-content ol.sequence-nav a:hover, div.book-wrapper section.book nav div.course-wrapper section.course-content ol.sequence-nav a:hover, div.course-wrapper section.course-content ol.sequence-nav div.book-wrapper section.book nav a:hover, div.wiki-wrapper section.wiki-body header div.course-wrapper section.course-content ol.sequence-nav a:hover, div.course-wrapper section.course-content ol.sequence-nav div.wiki-wrapper section.wiki-body header a:hover, body.askbot .secondary-nav nav div.course-wrapper section.course-content ol.sequence-nav a:hover, div.course-wrapper section.course-content ol.sequence-nav body.askbot .secondary-nav nav a:hover, .topbar div.book-wrapper section.book nav a:hover, div.book-wrapper section.book nav .topbar a:hover, div.course-wrapper section.course-content ol.sequence-nav div.book-wrapper section.book nav a:hover, div.book-wrapper section.book nav div.course-wrapper section.course-content ol.sequence-nav a:hover, div.book-wrapper section.book nav a:hover, div.wiki-wrapper section.wiki-body header div.book-wrapper section.book nav a:hover, div.book-wrapper section.book nav div.wiki-wrapper section.wiki-body header a:hover, body.askbot .secondary-nav div.book-wrapper section.book nav a:hover, div.book-wrapper section.book body.askbot .secondary-nav nav a:hover, .topbar div.wiki-wrapper section.wiki-body header a:hover, div.wiki-wrapper section.wiki-body header .topbar a:hover, div.course-wrapper section.course-content ol.sequence-nav div.wiki-wrapper section.wiki-body header a:hover, div.wiki-wrapper section.wiki-body header div.course-wrapper section.course-content ol.sequence-nav a:hover, div.book-wrapper section.book nav div.wiki-wrapper section.wiki-body header a:hover, div.wiki-wrapper section.wiki-body header div.book-wrapper section.book nav a:hover, div.wiki-wrapper section.wiki-body header a:hover, body.askbot .secondary-nav nav div.wiki-wrapper section.wiki-body header a:hover, div.wiki-wrapper section.wiki-body header body.askbot .secondary-nav nav a:hover { + background: none; } :focus { outline-color: #ccc; } +h1 a, h2 a, h3 a, div.wiki-wrapper div#wiki_panel input[type="button"] a, h4 a, h5 a, h6 a { + color: #000; } + h1 { font-size: 1.6em; margin: 20px 0 10px 0; } @@ -346,15 +351,15 @@ html { font: 14px "Open Sans", "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif; text-align: center; margin: 0; - background: #f3f3f3; } + background: #f6f6f6; } html body div.header-wrapper { - -webkit-box-shadow: inset 0 1px 0 #bf4040, 0 1px 1px #cccccc; - -moz-box-shadow: inset 0 1px 0 #bf4040, 0 1px 1px #cccccc; - -ms-box-shadow: inset 0 1px 0 #bf4040, 0 1px 1px #cccccc; - -o-box-shadow: inset 0 1px 0 #bf4040, 0 1px 1px #cccccc; - box-shadow: inset 0 1px 0 #bf4040, 0 1px 1px #cccccc; + -webkit-box-shadow: inset 0 -1px 2px #732626; + -moz-box-shadow: inset 0 -1px 2px #732626; + -ms-box-shadow: inset 0 -1px 2px #732626; + -o-box-shadow: inset 0 -1px 2px #732626; + box-shadow: inset 0 -1px 2px #732626; background: #993333; - border-bottom: 1px solid #732626; } + border-bottom: 1px solid #fff; } html body div.header-wrapper header { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; @@ -382,9 +387,10 @@ html { -webkit-font-smoothing: antialiased; } html body div.header-wrapper header nav h2 { float: left; - margin: 0; - padding: 19px 15px 12px 0; - line-height: 22.652px; } + margin: 0 22.652px 0 0; + padding: 19px 22.652px 12px 0; + line-height: 22.652px; + border-right: 1px solid #862d2d; } html body div.header-wrapper header nav h2 a { color: #fff; } html body div.header-wrapper header nav h2 a:hover { @@ -406,19 +412,27 @@ html { background-color: none; text-decoration: none; } html body section.main-content { - -webkit-box-shadow: 0 1px 0 white; - -moz-box-shadow: 0 1px 0 white; - -ms-box-shadow: 0 1px 0 white; - -o-box-shadow: 0 1px 0 white; - box-shadow: 0 1px 0 white; + -webkit-box-shadow: 0 0 4px #dddddd; + -moz-box-shadow: 0 0 4px #dddddd; + -ms-box-shadow: 0 0 4px #dddddd; + -o-box-shadow: 0 0 4px #dddddd; + box-shadow: 0 0 4px #dddddd; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; -ms-box-sizing: border-box; -o-box-sizing: border-box; box-sizing: border-box; background: #fff; - border: 1px solid #ccc; - border-top: 0; } + border-bottom: 1px solid #bbb; } + @media screen and (min-width: 1400px) { + html body section.main-content { + margin-top: 11.326px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + -ms-border-radius: 3px; + -o-border-radius: 3px; + border-radius: 3px; + border: 1px solid #bbb; } } html body img { max-width: 100%; height: auto; } @@ -652,7 +666,8 @@ div.course-wrapper div#accordion ul.ui-accordion-content { div.course-wrapper div#accordion ul.ui-accordion-content li a { text-decoration: none; margin-bottom: 11.326px; - display: block; } + display: block; + color: #000; } div.course-wrapper div#accordion ul.ui-accordion-content li a:hover { color: #666; } div.course-wrapper div#accordion ul.ui-accordion-content li a p { @@ -796,28 +811,93 @@ section.course-content div.video-wrapper { left: 0; width: 100%; height: 100%; } - section.course-content div.video-wrapper section ul { - display: inline-block; } - section.course-content div.video-wrapper section ul li { - margin-top: 5px; - display: inline-block; - cursor: pointer; - border: 0; - padding: 0; } - section.course-content div.video-wrapper section ul li div:empty { - display: none; } - section.course-content div.video-wrapper section div#slider { - margin: -14px 0 10px 60px; } - section.course-content div.video-wrapper section div#vidtime { - float: left; } - section.course-content div.video-wrapper section div#video_speeds { - float: right; - cursor: pointer; } - section.course-content div.video-wrapper section div#video_speeds span:hover { - color: #993333; } + section.course-content div.video-wrapper section.video-controls { + background: #333; + border: 1px solid #000; + color: #ccc; } + section.course-content div.video-wrapper section.video-controls div#slider { + -webkit-border-radius: 0; + -moz-border-radius: 0; + -ms-border-radius: 0; + -o-border-radius: 0; + border-radius: 0; + -webkit-box-shadow: inset 0 1px 0 #eeeeee, 0 1px 0 #555555; + -moz-box-shadow: inset 0 1px 0 #eeeeee, 0 1px 0 #555555; + -ms-box-shadow: inset 0 1px 0 #eeeeee, 0 1px 0 #555555; + -o-box-shadow: inset 0 1px 0 #eeeeee, 0 1px 0 #555555; + box-shadow: inset 0 1px 0 #eeeeee, 0 1px 0 #555555; + background: #c2c2c2; + border: none; + border-bottom: 1px solid #000; + height: 20px; } + section.course-content div.video-wrapper section.video-controls div#slider a.ui-slider-handle { + -webkit-border-radius: 0; + -moz-border-radius: 0; + -ms-border-radius: 0; + -o-border-radius: 0; + border-radius: 0; + background: #993333 url(/static/images/slider-handle.png) center center no-repeat; + border: 0; + border-right: 1px solid #4d1919; + border-left: 1px solid #4d1919; + cursor: pointer; + height: 20px; + margin: 0; + top: 0; + width: 20px; } + section.course-content div.video-wrapper section.video-controls ul.vcr { + float: left; + margin-right: 22.652px; } + section.course-content div.video-wrapper section.video-controls ul.vcr li { + float: left; } + section.course-content div.video-wrapper section.video-controls ul.vcr li a { + -webkit-box-shadow: 1px 0 0 #555555; + -moz-box-shadow: 1px 0 0 #555555; + -ms-box-shadow: 1px 0 0 #555555; + -o-box-shadow: 1px 0 0 #555555; + box-shadow: 1px 0 0 #555555; + border-right: 1px solid #000; + display: block; + cursor: pointer; + height: 14px; + padding: 16.989px 22.652px; + text-indent: -9999px; + width: 14px; } + section.course-content div.video-wrapper section.video-controls ul.vcr li a.play { + background: url("/static/images/play-icon.png") center center no-repeat; } + section.course-content div.video-wrapper section.video-controls ul.vcr li a.play:hover { + background-color: #444; } + section.course-content div.video-wrapper section.video-controls ul.vcr li a.pause { + background: url("/static/images/pause-icon.png") center center no-repeat; } + section.course-content div.video-wrapper section.video-controls ul.vcr li a.pause:hover { + background-color: #444; } + section.course-content div.video-wrapper section.video-controls div#vidtime { + float: left; + font-weight: bold; + line-height: 46px; + -webkit-font-smoothing: antialiased; } + section.course-content div.video-wrapper section.video-controls div.speeds { + float: right; + line-height: 46px; + margin-right: 22.652px; + -webkit-font-smoothing: antialiased; } + section.course-content div.video-wrapper section.video-controls div.speeds div#video_speeds { + display: -moz-inline-box; + -moz-box-orient: vertical; + display: inline-block; + vertical-align: baseline; + zoom: 1; + *display: inline; + *vertical-align: auto; + font-weight: bold; } + section.course-content div.video-wrapper section.video-controls div.speeds div#video_speeds span { + cursor: pointer; } + section.course-content div.video-wrapper section.video-controls div.speeds div#video_speeds span:hover { + color: #993333; } section.course-content ol.subtitles { float: left; - width: 31.522%; } + width: 31.522%; + min-height: 570px; } section.course-content ol.subtitles li { margin-bottom: 0px; cursor: pointer; @@ -848,7 +928,8 @@ div.book-wrapper ul#booknav { background: none; padding-left: 30px; } div.book-wrapper ul#booknav li div.hitarea { - margin-left: -22px; } + margin-left: -22px; + background-image: url("/static/images/treeview-default.gif"); } div.book-wrapper ul#booknav li div.hitarea:hover { opacity: 0.6; filter: alpha(opacity=60); } @@ -1048,22 +1129,35 @@ form#wiki_revision { display: block; width: 50%; } form#wiki_revision #submit_delete { - float: right; } + -webkit-box-shadow: none; + -moz-box-shadow: none; + -ms-box-shadow: none; + -o-box-shadow: none; + box-shadow: none; + background: none; + border: none; + color: #999; + float: right; + text-decoration: underline; + font-weight: normal; } form#wiki_revision input[type="submit"] { margin-top: 20px; } #wiki_edit_instructions { float: left; - width: 31.522%; } + width: 31.522%; + margin-top: 22.652px; + color: #666; } + #wiki_edit_instructions:hover { + color: #333; } #wiki_edit_instructions .markdown-example { - background-color: #dddddd; + background-color: #e3e3e3; + text-shadow: 0 1px 0 #fff; padding-top: 5px; padding-right: 2px; padding-bottom: 5px; padding-left: 5px; - margin-top: 5px; - margin-bottom: 7px; - margin-left: 5px; + margin: 5px 0 7px; line-height: 1.0; } div.wiki-wrapper { @@ -1978,443 +2072,6 @@ ul#related-tags li { .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; } - .question-page h1 a { - color: #464646; - font-size: 30px; - font-weight: normal; - line-height: 1; } -.question-page p.rss { - float: none; - clear: both; - padding: 3px 0 0 23px; - font-size: 15px; - width: 110px; - background-position: center left; - margin-left: 0px !important; } - .question-page p.rss a { - font-family: 'Yanone Kaffeesatz',sans-serif; - vertical-align: top; } -.question-page .question-content { - float: right; - width: 682px; - margin-bottom: 10px; } -.question-page #question-table { - float: left; - border-top: #f0f0f0 1px solid; - margin: 6px 0 6px 0; - border-spacing: 0px; - width: 670px; - padding-right: 10px; } -.question-page .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; } - .question-page .answer-table td { - width: 20px; - vertical-align: top; } -.question-page #question-table td { - width: 20px; - vertical-align: top; } -.question-page .question-body, .question-page .answer-body { - overflow: auto; - margin-top: 10px; - font-family: Arial; - color: #4b4b4b; } -.question-page .question-body p, .question-page .answer-body p { - margin-bottom: 14px; - line-height: 1.4; - font-size: 14px; - padding: 0px 5px 5px 0px; } -.question-page .question-body a, .question-page .answer-body a { - color: #1b79bd; } -.question-page .question-body li, .question-page .answer-body li { - margin-bottom: 7px; } -.question-page .question-body IMG, .question-page .answer-body IMG { - max-width: 600px; } -.question-page .post-update-info-container { - float: right; - width: 175px; } -.question-page .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; } - .question-page .post-update-info p { - line-height: 13px; - font-size: 11px; - margin: 0 0 2px 1px; - padding: 0; } - .question-page .post-update-info a { - color: #444; } - .question-page .post-update-info .gravatar { - float: left; - margin-right: 4px; } - .question-page .post-update-info p.tip { - color: #444; - line-height: 13px; - font-size: 10px; } -.question-page .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; } - .question-page .post-controls 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; } - .question-page .post-controls a:hover { - background-color: #f5f0c9; - border-radius: 3px; - -ms-border-radius: 3px; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - -khtml-border-radius: 3px; } - .question-page .post-controls .sep { - color: #ccc; - float: right; - height: 18px; - font-size: 18px; } - .question-page .post-controls .question-delete { - background: url(../images/delete.png) no-repeat center left; - padding-left: 16px; } -.question-page .answer-controls .question-delete { - background: url(../images/delete.png) no-repeat center left; - padding-left: 16px; } -.question-page .post-controls .question-flag, .question-page .answer-controls .question-flag { - background: url(../images/flag.png) no-repeat center left; } -.question-page .post-controls .question-edit, .question-page .answer-controls .question-edit { - background: url(../images/edit2.png) no-repeat center left; } -.question-page .post-controls .question-retag, .question-page .answer-controls .question-retag { - background: url(../images/retag.png) no-repeat center left; } -.question-page .post-controls .question-close, .question-page .answer-controls .question-close { - background: url(../images/close.png) no-repeat center left; } -.question-page .post-controls .permant-link, .question-page .answer-controls .permant-link { - background: url(../images/link.png) no-repeat center left; } -.question-page .tabBar { - width: 100%; } -.question-page #questionCount { - float: left; - font-family: 'Yanone Kaffeesatz',sans-serif; - line-height: 15px; } -.question-page .question-img-upvote, .question-page .question-img-downvote, .question-page .answer-img-upvote, .question-page .answer-img-downvote { - width: 25px; - height: 20px; - cursor: pointer; } -.question-page .question-img-upvote, .question-page .answer-img-upvote { - background: url(../images/vote-arrow-up-new.png) no-repeat; } -.question-page .question-img-downvote, .question-page .answer-img-downvote { - background: url(../images/vote-arrow-down-new.png) no-repeat; } -.question-page .question-img-upvote:hover, .question-page .question-img-upvote.on { - background: url(../images/vote-arrow-up-on-new.png) no-repeat; } -.question-page .answer-img-upvote:hover, .question-page .answer-img-upvote.on { - background: url(../images/vote-arrow-up-on-new.png) no-repeat; } -.question-page .question-img-downvote:hover, .question-page .question-img-downvote.on { - background: url(../images/vote-arrow-down-on-new.png) no-repeat; } -.question-page .answer-img-downvote:hover, .question-page .answer-img-downvote.on { - background: url(../images/vote-arrow-down-on-new.png) no-repeat; } -.question-page #fmanswer_button { - margin: 8px 0px; } -.question-page .question-img-favorite:hover { - background: url(../images/vote-favorite-on.png); } -.question-page div.comments { - padding: 0; } -.question-page #comment-title { - font-weight: bold; - font-size: 23px; - color: #7ea9b3; - width: 200px; - float: left; - font-family: 'Yanone Kaffeesatz',sans-serif; } -.question-page .comments { - font-size: 12px; - clear: both; } - .question-page .comments div.controls { - clear: both; - float: left; - width: 100%; - margin: 3px 0 20px 5px; } - .question-page .comments .controls a { - color: #988e4c; - padding: 0 3px 2px 22px; - font-family: Arial; - font-size: 13px; - background: url(../images/comment.png) no-repeat center left; } - .question-page .comments .controls a:hover { - background-color: #f5f0c9; - text-decoration: none; } - .question-page .comments .button, .question-page .comments input[type="submit"], .question-page .comments input[type="button"], .question-page .comments button { - color: #988e4c; - font-size: 11px; - padding: 3px; - cursor: pointer; } - .question-page .comments a { - background-color: inherit; - color: #1b79bd; - padding: 0; } - .question-page .comments form.post-comments { - margin: 3px 26px 0 42px; } - .question-page .comments form.post-comments textarea { - font-size: 13px; - line-height: 1.3; } - .question-page .comments 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; } - .question-page .comments input { - margin-left: 10px; - margin-top: 1px; - vertical-align: top; - width: 100px; } - .question-page .comments 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; } - .question-page .comments button: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; } - .question-page .comments .counter { - display: inline-block; - width: 245px; - float: right; - color: #b6a475 !important; - vertical-align: top; - font-family: Arial; - float: right; - text-align: right; } - .question-page .comments .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; } - .question-page .comments div.comment:hover { - background-color: #efefef; } - .question-page .comments a.author { - background-color: inherit; - color: #1b79bd; - padding: 0; } - .question-page .comments a.author:hover { - text-decoration: underline; } - .question-page .comments span.delete-icon { - background: url(../images/close-small.png) no-repeat; - border: 0; - width: 14px; - height: 14px; } - .question-page .comments span.delete-icon: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; } - .question-page .comments .content, .question-page .comments div.course-wrapper section.course-content, div.course-wrapper .question-page .comments section.course-content, .question-page .comments div.book-wrapper section.book, div.book-wrapper .question-page .comments section.book, .question-page .comments div.wiki-wrapper section.wiki-body, div.wiki-wrapper .question-page .comments section.wiki-body { - margin-bottom: 7px; } - .question-page .comments .comment-votes { - float: left; - width: 37px; - line-height: 130%; - padding: 6px 5px 6px 3px; } - .question-page .comments .comment-body { - line-height: 1.3; - margin: 3px 26px 0 46px; - padding: 5px 3px; - color: #666; - font-size: 13px; } - .question-page .comments .comment-body .edit { - padding-left: 6px; } - .question-page .comments .comment-body p { - font-size: 13px; - line-height: 1.3; - margin-bottom: 3px; - padding: 0; } - .question-page .comments .comment-delete { - float: right; - width: 14px; - line-height: 130%; - padding: 8px 6px; } - .question-page .comments .upvote { - margin: 0px; - padding-right: 17px; - padding-top: 2px; - text-align: right; - height: 20px; - font-size: 13px; - font-weight: bold; - color: #777; } - .question-page .comments .upvote.upvoted { - color: #d64000; } - .question-page .comments .upvote.hover { - background: url(../images/go-up-grey.png) no-repeat; - background-position: right 1px; } - .question-page .comments .upvote:hover { - background: url(../images/go-up-orange.png) no-repeat; - background-position: right 1px; } - .question-page .comments .help-text { - float: right; - text-align: right; - color: gray; - margin-bottom: 0px; - margin-top: 0px; - line-height: 50%; } -.question-page #questionTools { - font-size: 22px; - margin-top: 11px; - text-align: left; } -.question-page .question-status { - margin-top: 10px; - margin-bottom: 15px; - padding: 20px; - background-color: #fef7cc; - text-align: center; - border: #e1c04a 1px solid; } - .question-page .question-status h3, .question-page .question-status div.wiki-wrapper div#wiki_panel input[type="button"], div.wiki-wrapper div#wiki_panel .question-page .question-status input[type="button"] { - font-size: 20px; - color: #707070; - font-weight: normal; } -.question-page .vote-buttons { - float: left; - text-align: center; - padding-top: 2px; - margin: 10px 10px 0px 3px; } - .question-page .vote-buttons IMG { - cursor: pointer; } -.question-page .vote-number { - font-family: 'Yanone Kaffeesatz',sans-serif; - padding: 0px 0 5px 0; - font-size: 25px; - font-weight: bold; - color: #777; } -.question-page .vote-buttons .notify-sidebar { - text-align: left; - width: 120px; } - .question-page .vote-buttons .notify-sidebar label { - vertical-align: top; } -.question-page .tabBar-answer { - margin-bottom: 15px; - padding-left: 7px; - width: 723px; - margin-top: 10px; } -.question-page .answer .vote-buttons { - float: left; } -.question-page .accepted-answer { - background-color: #f7fecc; - border-bottom-color: #9BD59B; } - .question-page .accepted-answer .vote-buttons { - width: 27px; - margin-right: 10px; - margin-top: 10px; } -.question-page .answer .post-update-info a { - color: #444444; } -.question-page .answered { - background: #CCC; - color: #999; } -.question-page .answered-accepted { - background: #DCDCDC; - color: #763333; } - .question-page .answered-accepted strong { - color: #E1E818; } -.question-page .answered-by-owner { - background: #F1F1FF; } - .question-page .answered-by-owner .comments { - background-color: #E6ECFF; } - .question-page .answered-by-owner .comments .button, .question-page .answered-by-owner .comments input[type="submit"], .question-page .answered-by-owner .comments input[type="button"], .question-page .answered-by-owner .comments button { - background-color: #E6ECFF; } - .question-page .answered-by-owner .vote-buttons { - margin-right: 10px; } -.question-page .answer-img-accept:hover { - background: url(../images/vote-accepted-on.png); } -.question-page .answer-body a { - color: #1b79bd; } -.question-page .answer-body li { - margin-bottom: 0.7em; } -.question-page #fmanswer { - color: #707070; - line-height: 1.2; - margin-top: 10px; } - .question-page #fmanswer h2 { - font-family: 'Yanone Kaffeesatz',sans-serif; - color: #7ea9b3; - font-size: 24px; } - .question-page #fmanswer label { - font-size: 13px; } -.question-page .message { - padding: 5px; - margin: 0px 0 10px 0; } - @media screen and (-webkit-min-device-pixel-ratio:0) { textarea { padding-left: 3px !important; } } @@ -3588,8 +3245,6 @@ ul.question-list { font-weight: normal; margin: 0px 0 15px 0; text-transform: none; } - ul.question-list li.single-question div.question-body h2 a { - color: #000; } ul.question-list li.single-question div.question-body div.user-info { display: inline-block; vertical-align: top; } @@ -3641,6 +3296,40 @@ ul.question-list { div.search-tips { display: block; } +div.post-update-info { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + -o-box-sizing: border-box; + box-sizing: border-box; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + -ms-border-radius: 5px; + -o-border-radius: 5px; + border-radius: 5px; + background: #faf7e9; + padding: 10px; } + div.post-update-info a { + color: #993333; } + div.post-update-info div.change-date { + font-size: 12px; + margin-bottom: 10px; } + div.post-update-info div.avatar { + display: inline-block; + float: left; + margin-right: 3px; } + div.post-update-info div.avatar img.gravatar { + background: white; + border: 1px solid #eddfaa; + margin-right: 5px; + padding: 3px; + vertical-align: bottom; } + div.post-update-info div.user-meta { + display: inline-block; + width: 60%; } + div.post-update-info div.user-meta span.user-badges { + display: block; } + ul.tags { list-style: none; } ul.tags li, ul.tags a { @@ -3656,18 +3345,82 @@ ul.tags { display: inline; font-size: 12px; margin-left: 15px; - padding: 5px 10px 5px 5px; } + padding: 3px 10px 5px 5px; } ul.tags li:before { content: ""; position: absolute; top: 0; - left: -12px; + left: -11px; width: 0; height: 0; border-color: transparent #eee transparent transparent; border-style: solid; border-width: 12px 12px 12px 0; } +div.question-header div.vote-buttons { + display: inline-block; + float: left; + width: 8.696%; + margin-right: 2.717%; } + div.question-header div.vote-buttons ul li { + background-position: center; + background-repeat: no-repeat; + cursor: pointer; + font-weight: bold; + height: 20px; + list-style: none; + padding: 10px; + text-align: center; + width: 25px; } + div.question-header div.vote-buttons ul li.question-img-upvote, div.question-header div.vote-buttons ul li.answer-img-upvote { + background-image: url(/static/images/askbot/vote-arrow-up-new.png); + background-color: #F6EFD4; } + div.question-header div.vote-buttons ul li.question-img-upvote:hover, div.question-header div.vote-buttons ul li.question-img-upvote.on, div.question-header div.vote-buttons ul li.answer-img-upvote:hover, div.question-header div.vote-buttons ul li.answer-img-upvote.on { + background-image: url(/static/images/askbot/vote-arrow-up-on-new.png); } + div.question-header div.vote-buttons ul li.question-img-downvote, div.question-header div.vote-buttons ul li.answer-img-downvote { + background-image: url(/static/images/askbot/vote-arrow-down-new.png); } + div.question-header div.vote-buttons ul li.question-img-downvote:hover, div.question-header div.vote-buttons ul li.question-img-downvote.on, div.question-header div.vote-buttons ul li.answer-img-downvote:hover, div.question-header div.vote-buttons ul li.answer-img-downvote.on { + background-image: url(/static/images/askbot/vote-arrow-down-on-new.png); } +div.question-header div.question-container { + display: inline-block; + float: left; + width: 88.587%; } + div.question-header div.question-container h1 { + margin-top: 0; } + div.question-header div.question-container div.meta-bar { + border-bottom: 1px solid #eee; + display: block; + margin: 20px 0 10px; + overflow: hidden; + padding-bottom: 15px; } + div.question-header div.question-container div.meta-bar div.tag-list { + display: inline-block; + float: left; + width: 48.466%; + margin-right: 3.067%; } + div.question-header div.question-container div.meta-bar div.question-actions { + display: inline-block; + float: left; + text-align: right; + width: 48.466%; } + div.question-header div.question-container div.meta-bar div.question-actions a { + color: #a88d23; } + div.question-header div.question-container div.meta-bar div.question-actions a.question-delete { + color: #993333; } + div.question-header div.question-container div.meta-bar div.question-actions span.sep { + color: #eddfaa; } + div.question-header div.question-container div.question-content { + overflow: hidden; } + div.question-header div.question-container div.question-content div.question-body { + display: inline-block; + float: left; + margin-right: 3.067%; + width: 76.81%; } + div.question-header div.question-container div.question-content div.post-update-info { + display: inline-block; + float: left; + width: 20.123%; } + /* ---------------------------------------------------------------------------------------- diff --git a/css/marketing-ie.css b/css/marketing-ie.css new file mode 100644 index 0000000000..cde8e23e36 --- /dev/null +++ b/css/marketing-ie.css @@ -0,0 +1,7 @@ +body { + margin: 0; + padding: 0; } + +.wrapper, .subpage, section.copyright, section.tos, section.privacy-policy, section.honor-code, header.announcement div, section.index-content, footer { + margin: 0; + overflow: hidden; } diff --git a/css/marketing.css b/css/marketing.css index d0dc325665..1bda5d5938 100644 --- a/css/marketing.css +++ b/css/marketing.css @@ -412,6 +412,8 @@ section.index-content section { letter-spacing: 1px; color: #666; margin-bottom: 25.888px; } + section.index-content section.about section.features h2 span { + text-transform: none; } section.index-content section.about section.features p { width: auto; clear: both; } @@ -496,7 +498,7 @@ section.index-content section { margin-right: 3.817%; } section.index-content section.about-course section.requirements { clear: both; - width: auto; + width: 100%; border-top: 1px solid #E5E5E5; padding-top: 25.888px; margin-bottom: 0; }