diff options
-rw-r--r-- | askbot/media/js/live_search.js | 2 | ||||
-rw-r--r-- | askbot/media/style/style.css | 736 | ||||
-rw-r--r-- | askbot/media/style/style.less | 52 | ||||
-rw-r--r-- | askbot/templates/widgets/search_bar.html | 7 | ||||
-rw-r--r-- | askbot/templates/widgets/secondary_header.html | 6 |
5 files changed, 192 insertions, 611 deletions
diff --git a/askbot/media/js/live_search.js b/askbot/media/js/live_search.js index 99ffade4..4817431f 100644 --- a/askbot/media/js/live_search.js +++ b/askbot/media/js/live_search.js @@ -581,7 +581,7 @@ FullTextSearch.prototype.reset = function() { FullTextSearch.prototype.refreshXButton = function() { if(this.getSearchQuery().length > 0){ if (this._query.hasClass('searchInput')){ - $('#searchBar').attr('class', 'cancelable'); + $('#searchBar').addClass('cancelable'); this._xButton.show(); } } else { diff --git a/askbot/media/style/style.css b/askbot/media/style/style.css index 5e07a0ed..243701aa 100644 --- a/askbot/media/style/style.css +++ b/askbot/media/style/style.css @@ -3,21 +3,6 @@ /* Variables for Colors*/ /* Variables for fonts*/ /* "Trebuchet MS", sans-serif;*/ -/* Buttons */ -.button-style-hover { - background-color: #cde5e9; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cde5e9), color-stop(25%, #cde5e9), to(#94b3ba)); - background-image: -webkit-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - background-image: -moz-linear-gradient(top, #cde5e9, #cde5e9 25%, #94b3ba); - background-image: -ms-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - background-image: -o-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - background-image: linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - text-decoration: none; - text-shadow: 0px 1px 0px #c6d9dd; - -moz-text-shadow: 0px 1px 0px #c6d9dd; - -webkit-text-shadow: 0px 1px 0px #c6d9dd; -} /* General styles for gradients */ /* Receive exactly positions for background Sprite */ /* CSS3 Elements */ @@ -67,6 +52,9 @@ select { font-family: Trebuchet MS, "segoe ui", Helvetica, Tahoma, Verdana, MingLiu, PMingLiu, Arial, sans-serif; margin-left: 0px; } +select { + width: 100%; +} input[type="text"].prompt, input[type="password"].prompt, input.tipped-input.blank { @@ -214,7 +202,7 @@ body.user-messages { } .wait-icon-box { text-align: center; - margin-bottom: 8px; + margin: 5px 0 8px; } #closeNotify { position: absolute; @@ -421,6 +409,9 @@ body.user-messages { #homeButton:hover { background: -51px -36px url(../images/sprites.png) no-repeat; } +#scopeNav { + height: 41px; +} .scope-selector { display: block; float: left; @@ -474,9 +465,9 @@ body.user-messages { width: 100%; margin: 8px 0 6px 0; padding: 0; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; + -webkit-box-shadow: 0 0 0 #929292; + -moz-box-shadow: 0 0 0 #929292; + box-shadow: 0 0 0 #929292; } #searchBar div.input-tool-tip { margin-top: -40px; @@ -521,10 +512,10 @@ body.user-messages { } .search-drop-menu .footer { text-align: center; - padding-bottom: 10px; + padding: 9px 0 10px 0; } .search-drop-menu.empty ul { - padding: 5px; + padding: 1px; margin: 0; } .input-tool-tip { @@ -542,9 +533,17 @@ input[type="submit"].searchBtn { line-height: 22px; text-align: center; float: right; - margin: 7px 28px 0 0; + margin: -33px 28px 0 0; width: 48px; - background: -98px -36px url(../images/sprites.png) no-repeat; + background: -98px -37px url(../images/sprites.png) no-repeat; + border-radius: 0; + -ms-border-radius: 0; + -moz-border-radius: 0; + -webkit-border-radius: 0; + -khtml-border-radius: 0; + -webkit-box-shadow: 0 0 0 #929292; + -moz-box-shadow: 0 0 0 #929292; + box-shadow: 0 0 0 #929292; cursor: pointer; position: relative; z-index: 10001; @@ -564,8 +563,14 @@ input[type="submit"].searchBtn { .ask-page .search-drop-menu.empty ul { padding: 0; } -.searchBtn:hover { - background: -146px -36px url(../images/sprites.png) no-repeat; +input[type="submit"].searchBtn:hover { + background-image: none; + background-image: none; + background-image: none; + background-image: none; + background-image: none; + background-image: none; + background: -146px -37px url(../images/sprites.png) no-repeat; } .cancelSearchBtn { font-size: 30px; @@ -575,34 +580,37 @@ input[type="submit"].searchBtn { line-height: 42px; border: 0px; border-left: #deded0 1px solid; + -webkit-box-shadow: 0 0 0 #929292; + -moz-box-shadow: 0 0 0 #929292; + box-shadow: 0 0 0 #929292; text-align: center; width: 35px; cursor: pointer; float: right; - margin-top: 7px; + margin: 7px 0 0 0; position: relative; z-index: 10001; } .cancelSearchBtn:hover { color: #d84040; } -#askButton { - /* check blocks/secondary_header.html and widgets/ask_button.html*/ - - line-height: 44px; - margin-top: 6px; - float: right; - text-transform: uppercase; - height: 42px; - font-size: 20px; - text-align: center; - text-decoration: none; +button, +input[type="submit"], +input[type="button"], +input[type="reset"], +.button { cursor: pointer; color: #4a757f; + height: 27px; font-family: 'Open Sans Condensed', Arial, sans-serif; + font-size: 14px; + font-weight: bold; + text-align: center; + text-decoration: none; text-shadow: 0px 1px 0px #c6d9dd; -moz-text-shadow: 0px 1px 0px #c6d9dd; -webkit-text-shadow: 0px 1px 0px #c6d9dd; + border: 0 !important; border-top: #eaf2f3 1px solid; background-color: #d1e2e5; background-repeat: no-repeat; @@ -620,11 +628,20 @@ input[type="submit"].searchBtn { -webkit-box-shadow: 1px 1px 2px #636363; -moz-box-shadow: 1px 1px 2px #636363; box-shadow: 1px 1px 2px #636363; - width: 200px; - /* to match width of sidebar */ - } -#askButton:hover { +button.large, +input[type="submit"].large, +input[type="button"].large, +input[type="reset"].large, +.button.large { + font-size: 20px; + height: 35px; + line-height: 35px; + padding: 0 10px; +} +button:hover, +input[type="submit"]:hover, +.button:hover { background-color: #cde5e9; background-repeat: no-repeat; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cde5e9), color-stop(25%, #cde5e9), to(#94b3ba)); @@ -638,6 +655,31 @@ input[type="submit"].searchBtn { -moz-text-shadow: 0px 1px 0px #c6d9dd; -webkit-text-shadow: 0px 1px 0px #c6d9dd; } +input[type="submit"].link { + -webkit-box-shadow: 0 0 0 #929292; + -moz-box-shadow: 0 0 0 #929292; + box-shadow: 0 0 0 #929292; + text-shadow: 0 0 0 #929292; + -moz-text-shadow: 0 0 0 #929292; + -webkit-text-shadow: 0 0 0 #929292; + font-weight: normal; +} +input[type="submit"].link:hover { + text-decoration: underline; +} +#askButton { + /* check blocks/secondary_header.html and widgets/ask_button.html*/ + + float: right; + font-size: 20px; + height: 42px; + line-height: 44px; + margin-top: -35px; + text-transform: uppercase; + width: 200px; + /* to match width of sidebar */ + +} /* Put the secondary navigation together: 1) raise the search bar by 55px @@ -658,11 +700,19 @@ input[type="submit"].searchBtn { body.anon.ask-page .search-drop-menu { margin: 0; } -body.anon #searchBar, -body.anon .search-drop-menu { - margin-left: 227px; - /* we don't have the "followed" scope */ - +#searchBar.scopes-True-True-False { + margin-left: 228px; +} +#searchBar.scopes-True-False-True { + margin-left: 203px; +} +#searchBar.scopes-False-True-True { + margin-left: 286px; +} +#searchBar.scopes-True-False-False, +#searchBar.scopes-False-True-False, +#searchBar.scopes-False-False-True { + margin-left: 52px; } #searchBar.cancelable { padding-right: 82px; @@ -686,7 +736,7 @@ body.anon .search-drop-menu { /* ----- Sidebar Widgets Box, check main_page/sidebar.html or question/sidebar.html ----- */ .box { background: #fff; - padding: 4px 0px 10px 0px; + padding: 4px 0px 10px 1px; width: 200px; overflow: hidden; /* widgets for question template */ @@ -786,56 +836,7 @@ body.anon .search-drop-menu { .box .inputs #subscribedTagAdd, .box .inputs #ab-tag-search-add { border: 0; - font-weight: bold; margin-top: -2px; - height: 27px; - font-size: 14px; - text-align: center; - text-decoration: none; - cursor: pointer; - color: #4a757f; - font-family: 'Open Sans Condensed', Arial, sans-serif; - text-shadow: 0px 1px 0px #c6d9dd; - -moz-text-shadow: 0px 1px 0px #c6d9dd; - -webkit-text-shadow: 0px 1px 0px #c6d9dd; - border-top: #eaf2f3 1px solid; - background-color: #d1e2e5; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#d1e2e5), color-stop(25%, #d1e2e5), to(#a9c2c7)); - background-image: -webkit-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -moz-linear-gradient(top, #d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -ms-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -o-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - 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; - border-radius: 4px; - -ms-border-radius: 4px; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - -khtml-border-radius: 4px; -} -.box .inputs #interestingTagAdd:hover, -.box .inputs #ignoredTagAdd:hover, -.box .inputs #ab-tag-search-add:hover { - background-color: #cde5e9; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cde5e9), color-stop(25%, #cde5e9), to(#94b3ba)); - background-image: -webkit-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - background-image: -moz-linear-gradient(top, #cde5e9, #cde5e9 25%, #94b3ba); - background-image: -ms-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - background-image: -o-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - background-image: linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - text-decoration: none; - text-shadow: 0px 1px 0px #c6d9dd; - -moz-text-shadow: 0px 1px 0px #c6d9dd; - -webkit-text-shadow: 0px 1px 0px #c6d9dd; } .box .inputs #ab-tag-search-add { width: 47px; @@ -845,60 +846,17 @@ body.anon .search-drop-menu { } .box a.followed, .box a.follow { + height: 34px; + font-size: 21px; line-height: 34px; border: 0; font-weight: normal; margin-top: 3px; display: block; - height: 34px; - font-size: 21px; - text-align: center; - text-decoration: none; - cursor: pointer; - color: #4a757f; - font-family: 'Open Sans Condensed', Arial, sans-serif; - text-shadow: 0px 1px 0px #c6d9dd; - -moz-text-shadow: 0px 1px 0px #c6d9dd; - -webkit-text-shadow: 0px 1px 0px #c6d9dd; - border-top: #eaf2f3 1px solid; - background-color: #d1e2e5; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#d1e2e5), color-stop(25%, #d1e2e5), to(#a9c2c7)); - background-image: -webkit-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -moz-linear-gradient(top, #d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -ms-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -o-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - 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; width: 130px; } -.box a.followed:hover, -.box a.follow:hover { - background-color: #cde5e9; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cde5e9), color-stop(25%, #cde5e9), to(#94b3ba)); - background-image: -webkit-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - background-image: -moz-linear-gradient(top, #cde5e9, #cde5e9 25%, #94b3ba); - background-image: -ms-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - background-image: -o-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - background-image: linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - text-decoration: none; - text-shadow: 0px 1px 0px #c6d9dd; - -moz-text-shadow: 0px 1px 0px #c6d9dd; - -webkit-text-shadow: 0px 1px 0px #c6d9dd; - text-shadow: 0px 1px 0px #c6d9dd; - -moz-text-shadow: 0px 1px 0px #c6d9dd; - -webkit-text-shadow: 0px 1px 0px #c6d9dd; -} .box a.followed div.unfollow { display: none; } @@ -1342,7 +1300,7 @@ ul.tags.marked-tags, ul#related-tags { list-style: none; margin: 0; - padding: 0; + padding: 0 0 0 1px; line-height: 170%; display: block; } @@ -1361,9 +1319,7 @@ ul.tags.marked-tags li, margin-bottom: 5px; } #tagSelector div.inputs { - clear: both; - float: none; - margin-bottom: 10px; + margin: 6px 0 12px 0; } .tags-page ul.tags li, ul#ab-user-tags li { @@ -1671,40 +1627,7 @@ ul#related-tags li { .add-groups, .add-users { border: 0; - font-weight: bold; margin-top: -2px; - height: 27px; - font-size: 14px; - text-align: center; - text-decoration: none; - cursor: pointer; - color: #4a757f; - font-family: 'Open Sans Condensed', Arial, sans-serif; - text-shadow: 0px 1px 0px #c6d9dd; - -moz-text-shadow: 0px 1px 0px #c6d9dd; - -webkit-text-shadow: 0px 1px 0px #c6d9dd; - border-top: #eaf2f3 1px solid; - background-color: #d1e2e5; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#d1e2e5), color-stop(25%, #d1e2e5), to(#a9c2c7)); - background-image: -webkit-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -moz-linear-gradient(top, #d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -ms-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -o-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - 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; - border-radius: 4px; - -ms-border-radius: 4px; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - -khtml-border-radius: 4px; } .share-input-col { width: 160px; @@ -1717,20 +1640,6 @@ ul#related-tags li { padding: 0 10px; height: 25px; } -.add-groups:hover { - background-color: #cde5e9; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cde5e9), color-stop(25%, #cde5e9), to(#94b3ba)); - background-image: -webkit-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - background-image: -moz-linear-gradient(top, #cde5e9, #cde5e9 25%, #94b3ba); - background-image: -ms-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - background-image: -o-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - background-image: linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - text-decoration: none; - text-shadow: 0px 1px 0px #c6d9dd; - -moz-text-shadow: 0px 1px 0px #c6d9dd; - -webkit-text-shadow: 0px 1px 0px #c6d9dd; -} #id_user, #id_user_author { border: #cce6ec 3px solid; @@ -1750,40 +1659,7 @@ ul#related-tags li { .add-groups, .add-users { border: 0; - font-weight: bold; margin-top: -2px; - height: 27px; - font-size: 14px; - text-align: center; - text-decoration: none; - cursor: pointer; - color: #4a757f; - font-family: 'Open Sans Condensed', Arial, sans-serif; - text-shadow: 0px 1px 0px #c6d9dd; - -moz-text-shadow: 0px 1px 0px #c6d9dd; - -webkit-text-shadow: 0px 1px 0px #c6d9dd; - border-top: #eaf2f3 1px solid; - background-color: #d1e2e5; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#d1e2e5), color-stop(25%, #d1e2e5), to(#a9c2c7)); - background-image: -webkit-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -moz-linear-gradient(top, #d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -ms-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -o-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - 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; - border-radius: 4px; - -ms-border-radius: 4px; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - -khtml-border-radius: 4px; } .add-everyone-group { text-align: center; @@ -1791,20 +1667,6 @@ ul#related-tags li { display: block; padding: 0 10px; } -.add-groups:hover { - background-color: #cde5e9; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cde5e9), color-stop(25%, #cde5e9), to(#94b3ba)); - background-image: -webkit-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - background-image: -moz-linear-gradient(top, #cde5e9, #cde5e9 25%, #94b3ba); - background-image: -ms-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - background-image: -o-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - background-image: linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - text-decoration: none; - text-shadow: 0px 1px 0px #c6d9dd; - -moz-text-shadow: 0px 1px 0px #c6d9dd; - -webkit-text-shadow: 0px 1px 0px #c6d9dd; -} #id_user, #id_user_author { border: #cce6ec 3px solid; @@ -1831,55 +1693,11 @@ ul#related-tags li { .edit-question-page input.submit { float: left; font-weight: normal; + height: 35px; + font-size: 20px; margin-top: 3px; - height: 34px; - font-size: 21px; - text-align: center; - text-decoration: none; - cursor: pointer; - color: #4a757f; - font-family: 'Open Sans Condensed', Arial, sans-serif; - text-shadow: 0px 1px 0px #c6d9dd; - -moz-text-shadow: 0px 1px 0px #c6d9dd; - -webkit-text-shadow: 0px 1px 0px #c6d9dd; - border-top: #eaf2f3 1px solid; - background-color: #d1e2e5; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#d1e2e5), color-stop(25%, #d1e2e5), to(#a9c2c7)); - background-image: -webkit-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -moz-linear-gradient(top, #d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -ms-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -o-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - 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 { - background-color: #cde5e9; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cde5e9), color-stop(25%, #cde5e9), to(#94b3ba)); - background-image: -webkit-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - background-image: -moz-linear-gradient(top, #cde5e9, #cde5e9 25%, #94b3ba); - background-image: -ms-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - background-image: -o-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - background-image: linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - text-decoration: none; - text-shadow: 0px 1px 0px #c6d9dd; - -moz-text-shadow: 0px 1px 0px #c6d9dd; - -webkit-text-shadow: 0px 1px 0px #c6d9dd; - text-shadow: 0px 1px 0px #c6d9dd; - -moz-text-shadow: 0px 1px 0px #c6d9dd; - -webkit-text-shadow: 0px 1px 0px #c6d9dd; -} .wmd-container { border: #cce6ec 3px solid; } @@ -1887,7 +1705,7 @@ ul#related-tags li { border: none; } .users-page .wmd-container { - width: 200px; + width: auto; } .ask-page .wmd-container, .question-page .wmd-container, @@ -1924,7 +1742,7 @@ ul#related-tags li { border: 0; } .users-page #editor { - width: 192px; + width: 187px; } #id_title { width: 100%; @@ -2392,14 +2210,21 @@ ul#related-tags li { margin: 3px 0 20px 5px; } .question-page .comments .controls a { + border: none; color: #988e4c; - padding: 0 3px 2px 22px; + padding: 0 3px 5px 22px; font-family: Arial; font-size: 13px; + font-weight: normal; background: url(../images/comment.png) no-repeat center left; + -webkit-box-shadow: 0 0 0 #929292; + -moz-box-shadow: 0 0 0 #929292; + box-shadow: 0 0 0 #929292; + text-shadow: 0 0 0 #929292; + -moz-text-shadow: 0 0 0 #929292; + -webkit-text-shadow: 0 0 0 #929292; } .question-page .comments .controls a:hover { - background-color: #f5f0c9; text-decoration: none; } .question-page .comments .button { @@ -2414,24 +2239,22 @@ ul#related-tags li { 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; + padding: 6px 6px 7px 42px; + border-bottom: 1px solid #edeeeb; + margin-bottom: 0; } .question-page .comments textarea { - height: 42px; - width: 100%; - margin: 7px 0 5px 1px; + box-sizing: border-box; + border: #cce6ec 3px solid; font-family: Arial; + font-size: 13px; + height: 54px; + line-height: 1.3; + margin: -1px 0 7px 1px; outline: none; overflow: auto; - font-size: 12px; - line-height: 140%; - padding-left: 2px; - padding-top: 3px; - border: #cce6ec 3px solid; + padding: 0px 19px 2px 3px; + width: 100%; } .question-page .comments input { margin-left: 10px; @@ -2439,52 +2262,11 @@ ul#related-tags li { vertical-align: top; width: 100px; } -.question-page .comments button { - line-height: 25px; - margin-bottom: 5px; - height: 27px; - font-size: 12px; - text-align: center; - text-decoration: none; - cursor: pointer; - color: #4a757f; - font-family: 'Open Sans Condensed', Arial, sans-serif; - text-shadow: 0px 1px 0px #c6d9dd; - -moz-text-shadow: 0px 1px 0px #c6d9dd; - -webkit-text-shadow: 0px 1px 0px #c6d9dd; - border-top: #eaf2f3 1px solid; - background-color: #d1e2e5; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#d1e2e5), color-stop(25%, #d1e2e5), to(#a9c2c7)); - background-image: -webkit-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -moz-linear-gradient(top, #d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -ms-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -o-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - 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; - font-family: Arial; - font-weight: bold; -} -.question-page .comments button:hover { - background-color: #cde5e9; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cde5e9), color-stop(25%, #cde5e9), to(#94b3ba)); - background-image: -webkit-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - background-image: -moz-linear-gradient(top, #cde5e9, #cde5e9 25%, #94b3ba); - background-image: -ms-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - background-image: -o-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - background-image: linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - text-decoration: none; - text-shadow: 0px 1px 0px #c6d9dd; - -moz-text-shadow: 0px 1px 0px #c6d9dd; - -webkit-text-shadow: 0px 1px 0px #c6d9dd; +.question-page .comments button.submit { + height: 26px; + line-height: 26px; + padding: 0 8px; + margin-right: 6px; } .question-page .comments .counter { display: inline-block; @@ -2500,18 +2282,11 @@ ul#related-tags li { 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: #ffffff 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; @@ -2568,12 +2343,19 @@ ul#related-tags li { padding: 0px; color: #1B79BD; border: none; + height: 13px; width: auto; font-family: Arial; - line-height: 14px; - margin-left: 6px; font-size: 13px; - box-shadow: none; + font-weight: normal; + line-height: 13px; + margin: 0 0 0 8px; + -webkit-box-shadow: 0 0 0 #929292; + -moz-box-shadow: 0 0 0 #929292; + box-shadow: 0 0 0 #929292; + text-shadow: 0 0 0 #929292; + -moz-text-shadow: 0 0 0 #929292; + -webkit-text-shadow: 0 0 0 #929292; } .question-page .comments .comment-body .convert-comment input:hover { text-decoration: underline; @@ -2855,52 +2637,6 @@ ul#related-tags li { .user-profile-page input.submit { font-weight: normal; margin: 5px 0px; - height: 26px; - font-size: 15px; - text-align: center; - text-decoration: none; - cursor: pointer; - color: #4a757f; - font-family: 'Open Sans Condensed', Arial, sans-serif; - text-shadow: 0px 1px 0px #c6d9dd; - -moz-text-shadow: 0px 1px 0px #c6d9dd; - -webkit-text-shadow: 0px 1px 0px #c6d9dd; - border-top: #eaf2f3 1px solid; - background-color: #d1e2e5; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#d1e2e5), color-stop(25%, #d1e2e5), to(#a9c2c7)); - background-image: -webkit-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -moz-linear-gradient(top, #d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -ms-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -o-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - 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; - font-family: Arial; -} -.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-color: #cde5e9; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cde5e9), color-stop(25%, #cde5e9), to(#94b3ba)); - background-image: -webkit-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - background-image: -moz-linear-gradient(top, #cde5e9, #cde5e9 25%, #94b3ba); - background-image: -ms-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - background-image: -o-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - background-image: linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - text-decoration: none; - text-shadow: 0px 1px 0px #c6d9dd; - -moz-text-shadow: 0px 1px 0px #c6d9dd; - -webkit-text-shadow: 0px 1px 0px #c6d9dd; } .openid-signin .cancel, .meta .cancel, @@ -2925,6 +2661,15 @@ ul#related-tags li { float: left; width: 960px; } +.user-profile-page.inbox-group-join-requests form { + margin-bottom: 0; +} +.user-profile-page.inbox-group-join-requests table { + margin-bottom: 13px; +} +.user-profile-page.inbox-group-join-requests td { + padding-right: 10px; +} .inbox-flags.user-profile-page .re { width: 810px; } @@ -2966,59 +2711,6 @@ ul#related-tags li { border: #cce6ec 3px solid; width: 200px; } -#email-input-fs .submit-b, -#local_login_buttons .submit-b, -#password-fs .submit-b, -#openid-fs .submit-b { - height: 24px; - font-size: 15px; - text-align: center; - text-decoration: none; - cursor: pointer; - color: #4a757f; - font-family: 'Open Sans Condensed', Arial, sans-serif; - text-shadow: 0px 1px 0px #c6d9dd; - -moz-text-shadow: 0px 1px 0px #c6d9dd; - -webkit-text-shadow: 0px 1px 0px #c6d9dd; - border-top: #eaf2f3 1px solid; - background-color: #d1e2e5; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#d1e2e5), color-stop(25%, #d1e2e5), to(#a9c2c7)); - background-image: -webkit-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -moz-linear-gradient(top, #d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -ms-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -o-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - 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; - font-family: Arial; - font-weight: bold; - padding-right: 10px; - border: 0; -} -#email-input-fs .submit-b:hover, -#local_login_buttons .submit-b:hover, -#password-fs .submit-b:hover, -#openid-fs .submit-b:hover { - background-color: #cde5e9; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cde5e9), color-stop(25%, #cde5e9), to(#94b3ba)); - background-image: -webkit-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - background-image: -moz-linear-gradient(top, #cde5e9, #cde5e9 25%, #94b3ba); - background-image: -ms-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - background-image: -o-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - background-image: linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - text-decoration: none; - text-shadow: 0px 1px 0px #c6d9dd; - -moz-text-shadow: 0px 1px 0px #c6d9dd; - -webkit-text-shadow: 0px 1px 0px #c6d9dd; -} .openid-input { background: url(../images/openid.gif) no-repeat; padding-left: 15px; @@ -3127,64 +2819,6 @@ a:hover.medal { margin-top: 10px; margin-bottom: 10px; } -.user-profile-page .inputs input[type='submit'] { - height: 26px; - font-size: 15px; - text-align: center; - text-decoration: none; - cursor: pointer; - color: #4a757f; - font-family: 'Open Sans Condensed', Arial, sans-serif; - text-shadow: 0px 1px 0px #c6d9dd; - -moz-text-shadow: 0px 1px 0px #c6d9dd; - -webkit-text-shadow: 0px 1px 0px #c6d9dd; - border-top: #eaf2f3 1px solid; - background-color: #d1e2e5; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#d1e2e5), color-stop(25%, #d1e2e5), to(#a9c2c7)); - background-image: -webkit-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -moz-linear-gradient(top, #d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -ms-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -o-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - 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; -} -.user-profile-page input[type='submit'].select-language { - height: 26px; - font-size: 15px; - text-align: center; - text-decoration: none; - cursor: pointer; - color: #4a757f; - font-family: 'Open Sans Condensed', Arial, sans-serif; - text-shadow: 0px 1px 0px #c6d9dd; - -moz-text-shadow: 0px 1px 0px #c6d9dd; - -webkit-text-shadow: 0px 1px 0px #c6d9dd; - border-top: #eaf2f3 1px solid; - background-color: #d1e2e5; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#d1e2e5), color-stop(25%, #d1e2e5), to(#a9c2c7)); - background-image: -webkit-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -moz-linear-gradient(top, #d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -ms-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -o-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - 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; -} .user-profile-page select { margin-bottom: 12px; } @@ -3205,54 +2839,17 @@ a:hover.medal { .user-about p { font-size: 13px; } +.follow-toggle { + height: auto; +} .follow-toggle, .submit { - border: 0 !important; font-weight: bold; line-height: 26px; margin-top: -2px; - height: 26px; - font-size: 14px; - text-align: center; - text-decoration: none; - cursor: pointer; - color: #4a757f; - font-family: 'Open Sans Condensed', Arial, sans-serif; - text-shadow: 0px 1px 0px #c6d9dd; - -moz-text-shadow: 0px 1px 0px #c6d9dd; - -webkit-text-shadow: 0px 1px 0px #c6d9dd; - border-top: #eaf2f3 1px solid; - background-color: #d1e2e5; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#d1e2e5), color-stop(25%, #d1e2e5), to(#a9c2c7)); - background-image: -webkit-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -moz-linear-gradient(top, #d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -ms-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -o-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - 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; } .follow-toggle:hover, .submit:hover { - background-color: #cde5e9; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cde5e9), color-stop(25%, #cde5e9), to(#94b3ba)); - background-image: -webkit-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - background-image: -moz-linear-gradient(top, #cde5e9, #cde5e9 25%, #94b3ba); - background-image: -ms-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - background-image: -o-linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - background-image: linear-gradient(#cde5e9, #cde5e9 25%, #94b3ba); - text-decoration: none; - text-shadow: 0px 1px 0px #c6d9dd; - -moz-text-shadow: 0px 1px 0px #c6d9dd; - -webkit-text-shadow: 0px 1px 0px #c6d9dd; text-decoration: none !important; } .follow-toggle .follow { @@ -4571,35 +4168,6 @@ textarea.tipped-input { border-spacing: 10px; border-collapse: separate; } -.tag-subscriptions button { - height: 27px; - font-size: 14px; - text-align: center; - text-decoration: none; - cursor: pointer; - color: #4a757f; - font-family: 'Open Sans Condensed', Arial, sans-serif; - text-shadow: 0px 1px 0px #c6d9dd; - -moz-text-shadow: 0px 1px 0px #c6d9dd; - -webkit-text-shadow: 0px 1px 0px #c6d9dd; - border-top: #eaf2f3 1px solid; - background-color: #d1e2e5; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#d1e2e5), color-stop(25%, #d1e2e5), to(#a9c2c7)); - background-image: -webkit-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -moz-linear-gradient(top, #d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -ms-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: -o-linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - background-image: linear-gradient(#d1e2e5, #d1e2e5 25%, #a9c2c7); - 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; -} .tag-subscriptions form { display: inline-block; margin-bottom: 0; diff --git a/askbot/media/style/style.less b/askbot/media/style/style.less index bd3299cd..667d0ec7 100644 --- a/askbot/media/style/style.less +++ b/askbot/media/style/style.less @@ -621,20 +621,20 @@ input[type="submit"].searchBtn:hover { .sprites(-98px-48,-37px); } -.cancelSearchBtn { - font-size: 30px; - color: #ce8888; - background:#fff; - height: 41px; - line-height: 42px; - border:0px; - border-left:#deded0 1px solid; +input[type="button"].cancelSearchBtn { + font-size: 30px !important; + color: #aaa; + background: #fff !important; + height: 37px !important; + line-height: 37px; + border: 0px; .box-shadow(0, 0, 0); + .rounded-corners(0); text-align: center; - width: 35px; + width: 35px !important; cursor:pointer; float: right; - margin: 7px 0 0 0; + margin: -34px 0 0 0; position: relative; z-index: 10001; } @@ -722,19 +722,31 @@ input[type="submit"].link:hover { body.anon.ask-page .search-drop-menu { margin: 0; } -#searchBar.scopes-True-True-False { - margin-left: 228px; +.scopes-True-True-False { + #searchBar, + .search-drop-menu { + margin-left: 228px; + } } -#searchBar.scopes-True-False-True { - margin-left: 203px; +.scopes-True-False-True { + #searchBar, + .search-drop-menu { + margin-left: 203px; + } } -#searchBar.scopes-False-True-True { - margin-left: 286px; +.scopes-False-True-True { + #searchBar, + .search-drop-menu { + margin-left: 286px; + } } -#searchBar.scopes-True-False-False, -#searchBar.scopes-False-True-False, -#searchBar.scopes-False-False-True { - margin-left: 52px; +.scopes-True-False-False, +.scopes-False-True-False, +.scopes-False-False-True { + #searchBar, + .search-drop-menu { + margin-left: 52px; + } } #searchBar.cancelable { diff --git a/askbot/templates/widgets/search_bar.html b/askbot/templates/widgets/search_bar.html index d1e9e531..3e7785e8 100644 --- a/askbot/templates/widgets/search_bar.html +++ b/askbot/templates/widgets/search_bar.html @@ -1,13 +1,8 @@ {% if active_tab != "ask" %} {% spaceless %} -{% set enabled_scopes_class = 'scopes-' + - '%s'|format(settings.ALL_SCOPE_ENABLED) + '-' + - '%s'|format(settings.UNANSWERED_SCOPE_ENABLED) + '-' + - '%s'|format((request.user.is_authenticated() and settings.FOLLOWED_SCOPE_ENABLED)) -%} <div id="searchBar" - class="{% if query %}cancelable{% endif %} {{ enabled_scopes_class }}" + class="{% if query %}cancelable{% endif %}" > {# url action depends on which tab is active #} {% if active_tab == "tags" %} diff --git a/askbot/templates/widgets/secondary_header.html b/askbot/templates/widgets/secondary_header.html index defd7148..58a2254e 100644 --- a/askbot/templates/widgets/secondary_header.html +++ b/askbot/templates/widgets/secondary_header.html @@ -2,6 +2,11 @@ <div id="secondaryHeader"> <div class="content-wrapper"> {# form is wrapping search buttons and the search bar inputs #} + {% set enabled_scopes_class = 'scopes-' + + '%s'|format(settings.ALL_SCOPE_ENABLED) + '-' + + '%s'|format(settings.UNANSWERED_SCOPE_ENABLED) + '-' + + '%s'|format((request.user.is_authenticated() and settings.FOLLOWED_SCOPE_ENABLED)) + %} <form {% if active_tab == "tags" %} action="{% url tags %}" @@ -10,6 +15,7 @@ {% else %} action="{% url questions %}" id="searchForm" {% endif %} + class="{{ enabled_scopes_class }}" method="get"> <div> {# |