Merge remote-tracking branch 'origin/feature/development' into merge-branch

Change-Id: I1b5f0c4f558edd47d669328809efcfcec4fd4f51
This commit is contained in:
Marton Kiss 2015-08-07 14:43:09 +02:00
commit df55a54257
4 changed files with 235 additions and 189 deletions

View File

@ -47,6 +47,38 @@ h1.section-title,
.post-update-info .user-info { .post-update-info .user-info {
margin-top: 0px; margin-top: 0px;
} }
.user-profile-page ul.avatars .avatar-delete {
line-height: 7px;
padding: 8px;
}
.user-info-table .js-avatar {
height: 128px;
width: 128px;
}
.js-avatar {
height: 48px;
width: 48px;
}
.inbox .js-avatar {
height: 16px;
width: 16px;
}
.user-card {
.js-avatar-box {
margin-right: 10px;
}
.js-avatar {
height: 32px;
width: 32px;
}
}
.users-page .user-card .js-avatar-box {
margin: 3px 6px 0 0;
}
.comment-controls .js-avatar {
height: 16px;
width: 16px;
}
#header { #header {
background: #e4eef1; background: #e4eef1;
border-top: 3px solid #255e6e; border-top: 3px solid #255e6e;
@ -61,7 +93,7 @@ h1.section-title,
#metaNav { #metaNav {
position: absolute; position: absolute;
left: 200px; left: 200px;
bottom: 22px; bottom: 25px;
width: 750px; width: 750px;
a { a {
@ -138,7 +170,7 @@ h1.section-title,
left: 26px; left: 26px;
top: 22px; top: 22px;
li { li {
line-height: 1.7; line-height: 1.9;
padding: 0 0 0 13px; padding: 0 0 0 13px;
margin: 0; margin: 0;
img { img {
@ -146,17 +178,26 @@ h1.section-title,
} }
} }
li:hover { li:hover {
background: white !important; background: #666 !important;
a {
color: lighten(#255e6e, 50%);
}
} }
a { a {
margin: 0; margin: 0;
padding: 0; padding: 0;
@include text-shadow(none);
} }
a:hover { a:hover {
background: inherit; background: inherit;
text-decoration: none; text-decoration: none;
color: lighten(#255e6e, 50%);
@include text-shadow(none);
} }
} }
}
#userToolsNav {
.lang-nav { .lang-nav {
float: right; float: right;
color: #255e6e; color: #255e6e;
@ -165,23 +206,35 @@ h1.section-title,
height: 30px; height: 30px;
position: absolute !important; position: absolute !important;
right: 0; right: 0;
@include text-shadow(#fff 0 1px 1px); ul, li {
li { background: #e4eef1;
}
a {
color: #255e6e;
background: transparent; background: transparent;
&:hover {
color: lighten(#255e6e, 50%);
}
} }
.dropdown-menu li:hover { .dropdown-menu li:hover {
background: transparent !important; background: transparent !important;
} }
} }
} }
#metaNav a:hover {
color: #255e6e;
}
#header.with-logo #userToolsNav { #header.with-logo #userToolsNav {
bottom: 19px; bottom: 19px;
right: -100px;
} }
#secondaryHeader { #secondaryHeader {
background: #fff; background: #fff;
border: none; border: none;
margin-bottom: 7px; margin-bottom: 7px;
td.search-bar {
padding-right: 62px;
}
} }
.scope-selector { .scope-selector {
font-size: 16px; font-size: 16px;
@ -210,9 +263,10 @@ h1.section-title,
display: none; display: none;
} }
#askButton { #askButton {
height: 34px; height: 42px;
line-height: 34px; font-size: 15px;
font-size: 16px; line-height: 42px;
padding: 0;
width: 168px; width: 168px;
@include box-shadow(0 0 0); @include box-shadow(0 0 0);
} }
@ -231,6 +285,7 @@ h1.section-title,
bottom: -42px; bottom: -42px;
&.waiting { &.waiting {
bottom: -42px; bottom: -42px;
height: 25px;
} }
.footer button { .footer button {
padding: 2px 6px 3px; padding: 2px 6px 3px;

View File

@ -13,7 +13,7 @@ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations License for the specific language governing permissions and limitations
under the License. under the License.
*/ */
/* line 24, ../sass/extra.scss */ /* line 20, ../sass/extra.scss */
body, body,
p, p,
.short-summary .counts, .short-summary .counts,
@ -22,7 +22,7 @@ p,
font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
} }
/* line 39, ../sass/extra.scss */ /* line 27, ../sass/extra.scss */
#secondaryHeader, #secondaryHeader,
#questionCount, #questionCount,
#header, #header,
@ -50,66 +50,107 @@ h1.section-title,
} }
/* line 50, ../sass/extra.scss */ /* line 50, ../sass/extra.scss */
.user-profile-page ul.avatars .avatar-delete {
line-height: 7px;
padding: 8px;
}
/* line 54, ../sass/extra.scss */
.user-info-table .js-avatar {
height: 128px;
width: 128px;
}
/* line 58, ../sass/extra.scss */
.js-avatar {
height: 48px;
width: 48px;
}
/* line 62, ../sass/extra.scss */
.inbox .js-avatar {
height: 16px;
width: 16px;
}
/* line 67, ../sass/extra.scss */
.user-card .js-avatar-box {
margin-right: 10px;
}
/* line 70, ../sass/extra.scss */
.user-card .js-avatar {
height: 32px;
width: 32px;
}
/* line 75, ../sass/extra.scss */
.users-page .user-card .js-avatar-box {
margin: 3px 6px 0 0;
}
/* line 78, ../sass/extra.scss */
.comment-controls .js-avatar {
height: 16px;
width: 16px;
}
/* line 82, ../sass/extra.scss */
#header { #header {
background: #e4eef1; background: #e4eef1;
border-top: 3px solid #255e6e; border-top: 3px solid #255e6e;
-webkit-box-shadow: 1px 1px 1px 1px #cccccc; -moz-box-shadow: 1px 1px 1px 1px #ccc;
-moz-box-shadow: 1px 1px 1px 1px #cccccc; -webkit-box-shadow: 1px 1px 1px 1px #ccc;
box-shadow: 1px 1px 1px 1px #cccccc; box-shadow: 1px 1px 1px 1px #ccc;
} }
/* line 56, ../sass/extra.scss */ /* line 88, ../sass/extra.scss */
.openid-signin #metaNav a.signin { .openid-signin #metaNav a.signin {
background: none; background: none;
-webkit-box-shadow: 0 0 0 0;
-moz-box-shadow: 0 0 0 0; -moz-box-shadow: 0 0 0 0;
-webkit-box-shadow: 0 0 0 0;
box-shadow: 0 0 0 0; box-shadow: 0 0 0 0;
} }
/* line 61, ../sass/extra.scss */ /* line 93, ../sass/extra.scss */
#metaNav { #metaNav {
position: absolute; position: absolute;
left: 200px; left: 200px;
bottom: 22px; bottom: 25px;
width: 750px; width: 750px;
} }
/* line 67, ../sass/extra.scss */ /* line 99, ../sass/extra.scss */
#metaNav a { #metaNav a {
color: #255e6e; color: #255e6e;
font-size: 16px; font-size: 16px;
line-height: 16px; line-height: 16px;
height: 16px; height: 16px;
text-shadow: white 0 1px 1px; text-shadow: #fff 0 1px 1px;
} }
/* line 75, ../sass/extra.scss */ /* line 107, ../sass/extra.scss */
#metaNav a.signin { #metaNav a.signin {
background: #e8d895; background: #e8d895;
padding: 5px 8px; padding: 5px 8px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
-ms-border-radius: 4px; -webkit-border-radius: 4px;
-o-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
-webkit-box-shadow: 0 0 2px 2px white;
-moz-box-shadow: 0 0 2px 2px white; -moz-box-shadow: 0 0 2px 2px white;
-webkit-box-shadow: 0 0 2px 2px white;
box-shadow: 0 0 2px 2px white; box-shadow: 0 0 2px 2px white;
} }
/* line 82, ../sass/extra.scss */ /* line 114, ../sass/extra.scss */
#metaNav a.on { #metaNav a.on {
font-weight: normal; font-weight: normal;
color: #e4eef1; color: #e4eef1;
background: #255e6e !important; background: #255e6e !important;
-webkit-border-radius: 5px;
-moz-border-radius: 5px; -moz-border-radius: 5px;
-ms-border-radius: 5px; -webkit-border-radius: 5px;
-o-border-radius: 5px;
border-radius: 5px; border-radius: 5px;
text-shadow: 0 0 0; text-shadow: 0 0 0;
-webkit-box-shadow: 0 0 2px 2px white;
-moz-box-shadow: 0 0 2px 2px white; -moz-box-shadow: 0 0 2px 2px white;
-webkit-box-shadow: 0 0 2px 2px white;
box-shadow: 0 0 2px 2px white; box-shadow: 0 0 2px 2px white;
} }
/* line 95, ../sass/extra.scss */ /* line 123, ../sass/extra.scss */
#metaNav #navTags, #metaNav #navTags,
#metaNav #navBadges, #metaNav #navBadges,
#metaNav #navUsers, #metaNav #navUsers,
@ -119,7 +160,7 @@ h1.section-title,
padding: 3px 10px 6px 10px; padding: 3px 10px 6px 10px;
margin: 0 0 0 30px; margin: 0 0 0 30px;
} }
/* line 102, ../sass/extra.scss */ /* line 133, ../sass/extra.scss */
#metaNav .dropdown, #metaNav .dropdown,
#metaNav a { #metaNav a {
display: inline; display: inline;
@ -127,23 +168,23 @@ h1.section-title,
padding: 0; padding: 0;
margin: 5px 0 0 0; margin: 5px 0 0 0;
} }
/* line 108, ../sass/extra.scss */ /* line 140, ../sass/extra.scss */
#metaNav span.dropdown-toggle { #metaNav span.dropdown-toggle {
padding: 10px; padding: 10px;
border-left: 1px solid #e4eef1; border-left: 1px solid #e4eef1;
/*background: url(../images/sprites.png) no-repeat -7px -242px;*/ /*background: url(../images/sprites.png) no-repeat -7px -242px;*/
position: relative; position: relative;
} }
/* line 113, ../sass/extra.scss */ /* line 145, ../sass/extra.scss */
#metaNav span.dropdown-toggle.lang-nav { #metaNav span.dropdown-toggle.lang-nav {
padding: 0; padding: 0;
} }
/* line 117, ../sass/extra.scss */ /* line 149, ../sass/extra.scss */
#metaNav span.dropdown-toggle:hover { #metaNav span.dropdown-toggle:hover {
background: #e4eef1; background: #e4eef1;
/*background: url(../images/sprites.png) no-repeat -7px -274px;*/ /*background: url(../images/sprites.png) no-repeat -7px -274px;*/
} }
/* line 120, ../sass/extra.scss */ /* line 152, ../sass/extra.scss */
#metaNav span.dropdown-toggle:hover .dropdown-menu { #metaNav span.dropdown-toggle:hover .dropdown-menu {
background: #e4eef1; background: #e4eef1;
border-left: 1px solid #e4eef1; border-left: 1px solid #e4eef1;
@ -152,44 +193,52 @@ h1.section-title,
padding: 4px 0 10px 0; padding: 4px 0 10px 0;
top: 36px; top: 36px;
} }
/* line 129, ../sass/extra.scss */ /* line 161, ../sass/extra.scss */
#metaNav span.dropdown-toggle:hover.lang-nav .dropdown-menu { #metaNav span.dropdown-toggle:hover.lang-nav .dropdown-menu {
left: -14px; left: -14px;
min-width: auto !important; min-width: auto !important;
top: 27px; top: 27px;
} }
/* line 136, ../sass/extra.scss */ /* line 168, ../sass/extra.scss */
#metaNav .dropdown-menu { #metaNav .dropdown-menu {
background: #e4eef1; background: #e4eef1;
left: 26px; left: 26px;
top: 22px; top: 22px;
} }
/* line 140, ../sass/extra.scss */ /* line 172, ../sass/extra.scss */
#metaNav .dropdown-menu li { #metaNav .dropdown-menu li {
line-height: 1.7; line-height: 1.9;
padding: 0 0 0 13px; padding: 0 0 0 13px;
margin: 0; margin: 0;
} }
/* line 144, ../sass/extra.scss */ /* line 176, ../sass/extra.scss */
#metaNav .dropdown-menu li img { #metaNav .dropdown-menu li img {
margin-bottom: 3px; margin-bottom: 3px;
} }
/* line 148, ../sass/extra.scss */ /* line 180, ../sass/extra.scss */
#metaNav .dropdown-menu li:hover { #metaNav .dropdown-menu li:hover {
background: white !important; background: #666 !important;
} }
/* line 151, ../sass/extra.scss */ /* line 182, ../sass/extra.scss */
#metaNav .dropdown-menu li:hover a {
color: #aed8e4;
}
/* line 186, ../sass/extra.scss */
#metaNav .dropdown-menu a { #metaNav .dropdown-menu a {
margin: 0; margin: 0;
padding: 0; padding: 0;
text-shadow: none;
} }
/* line 155, ../sass/extra.scss */ /* line 191, ../sass/extra.scss */
#metaNav .dropdown-menu a:hover { #metaNav .dropdown-menu a:hover {
background: inherit; background: inherit;
text-decoration: none; text-decoration: none;
color: #aed8e4;
text-shadow: none;
} }
/* line 160, ../sass/extra.scss */
#metaNav .lang-nav { /* line 201, ../sass/extra.scss */
#userToolsNav .lang-nav {
float: right; float: right;
color: #255e6e; color: #255e6e;
font-size: 16px; font-size: 16px;
@ -197,143 +246,161 @@ h1.section-title,
height: 30px; height: 30px;
position: absolute !important; position: absolute !important;
right: 0; right: 0;
text-shadow: white 0 1px 1px;
} }
/* line 169, ../sass/extra.scss */ /* line 209, ../sass/extra.scss */
#metaNav .lang-nav li { #userToolsNav .lang-nav ul, #userToolsNav .lang-nav li {
background: #e4eef1;
}
/* line 212, ../sass/extra.scss */
#userToolsNav .lang-nav a {
color: #255e6e;
background: transparent; background: transparent;
} }
/* line 172, ../sass/extra.scss */ /* line 215, ../sass/extra.scss */
#metaNav .lang-nav .dropdown-menu li:hover { #userToolsNav .lang-nav a:hover {
color: #aed8e4;
}
/* line 219, ../sass/extra.scss */
#userToolsNav .lang-nav .dropdown-menu li:hover {
background: transparent !important; background: transparent !important;
} }
/* line 177, ../sass/extra.scss */ /* line 225, ../sass/extra.scss */
#header.with-logo #userToolsNav { #metaNav a:hover {
bottom: 19px; color: #255e6e;
right: -100px;
} }
/* line 181, ../sass/extra.scss */ /* line 228, ../sass/extra.scss */
#header.with-logo #userToolsNav {
bottom: 19px;
}
/* line 231, ../sass/extra.scss */
#secondaryHeader { #secondaryHeader {
background: #fff; background: #fff;
border: none; border: none;
margin-bottom: 7px; margin-bottom: 7px;
} }
/* line 235, ../sass/extra.scss */
#secondaryHeader td.search-bar {
padding-right: 62px;
}
/* line 186, ../sass/extra.scss */ /* line 239, ../sass/extra.scss */
.scope-selector { .scope-selector {
font-size: 16px; font-size: 16px;
height: 37px; height: 37px;
border-bottom: 3px solid white; border-bottom: 3px solid white;
} }
/* line 191, ../sass/extra.scss */ /* line 243, ../sass/extra.scss */
.scope-selector.on, .scope-selector:hover { .scope-selector.on, .scope-selector:hover {
background: none; background: none;
border-bottom: 3px solid; border-bottom: 3px solid;
color: #cf2f19; color: #cf2f19;
text-decoration: none; text-decoration: none;
-webkit-transition: 0.07s, ease;
-moz-transition: 0.07s, ease; -moz-transition: 0.07s, ease;
-o-transition: 0.07s, ease; -o-transition: 0.07s, ease;
-webkit-transition: 0.07s, ease;
transition: 0.07s, ease; transition: 0.07s, ease;
} }
/* line 198, ../sass/extra.scss */ /* line 251, ../sass/extra.scss */
.scope-selector:hover { .scope-selector:hover {
color: #264D69; color: #264D69;
} }
/* line 201, ../sass/extra.scss */ /* line 254, ../sass/extra.scss */
.scope-selector.ask-message:hover { .scope-selector.ask-message:hover {
color: #7a7a6b; color: #7a7a6b;
border: none; border: none;
} }
/* line 205, ../sass/extra.scss */ /* line 258, ../sass/extra.scss */
.scope-selector:first-child { .scope-selector:first-child {
margin-left: 0; margin-left: 0;
} }
/* line 209, ../sass/extra.scss */ /* line 262, ../sass/extra.scss */
#homeButton { #homeButton {
display: none; display: none;
} }
/* line 212, ../sass/extra.scss */ /* line 265, ../sass/extra.scss */
#askButton { #askButton {
height: 34px; height: 42px;
line-height: 34px; font-size: 15px;
font-size: 16px; line-height: 42px;
padding: 0;
width: 168px; width: 168px;
-webkit-box-shadow: 0 0 0;
-moz-box-shadow: 0 0 0; -moz-box-shadow: 0 0 0;
-webkit-box-shadow: 0 0 0;
box-shadow: 0 0 0; box-shadow: 0 0 0;
} }
/* line 219, ../sass/extra.scss */ /* line 273, ../sass/extra.scss */
.tabBar { .tabBar {
background: none; background: none;
} }
/* line 222, ../sass/extra.scss */ /* line 276, ../sass/extra.scss */
#logo img { #logo img {
height: 56px; height: 56px;
margin-left: -10px; margin-left: -10px;
} }
/* line 226, ../sass/extra.scss */ /* line 280, ../sass/extra.scss */
#searchBar { #searchBar {
-webkit-box-shadow: inset #eeeeee 1px 1px 2px 1px; -moz-box-shadow: inset #eee 1px 1px 2px 1px;
-moz-box-shadow: inset #eeeeee 1px 1px 2px 1px; -webkit-box-shadow: inset #eee 1px 1px 2px 1px;
box-shadow: inset #eeeeee 1px 1px 2px 1px; box-shadow: inset #eee 1px 1px 2px 1px;
} }
/* line 229, ../sass/extra.scss */ /* line 283, ../sass/extra.scss */
.search-drop-menu { .search-drop-menu {
position: relative; position: relative;
bottom: -42px; bottom: -42px;
} }
/* line 232, ../sass/extra.scss */ /* line 286, ../sass/extra.scss */
.search-drop-menu.waiting { .search-drop-menu.waiting {
bottom: -42px; bottom: -42px;
height: 25px;
} }
/* line 235, ../sass/extra.scss */ /* line 290, ../sass/extra.scss */
.search-drop-menu .footer button { .search-drop-menu .footer button {
padding: 2px 6px 3px; padding: 2px 6px 3px;
background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iNSUiIHN0b3AtY29sb3I9IiNmM2YzZjMiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmNTg1MGMiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2dyYWQpIiAvPjwvc3ZnPiA=');
background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(5%, #f3f3f3), color-stop(100%, #f5850c)); background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(5%, #f3f3f3), color-stop(100%, #f5850c));
background: -webkit-linear-gradient(#ffffff, #f3f3f3 5%, #f5850c);
background: -moz-linear-gradient(#ffffff, #f3f3f3 5%, #f5850c); background: -moz-linear-gradient(#ffffff, #f3f3f3 5%, #f5850c);
background: -o-linear-gradient(#ffffff, #f3f3f3 5%, #f5850c); background: -webkit-linear-gradient(#ffffff, #f3f3f3 5%, #f5850c);
background: linear-gradient(#ffffff, #f3f3f3 5%, #f5850c); background: linear-gradient(#ffffff, #f3f3f3 5%, #f5850c);
-webkit-box-shadow: 0 0 2px 2px white;
-moz-box-shadow: 0 0 2px 2px white; -moz-box-shadow: 0 0 2px 2px white;
-webkit-box-shadow: 0 0 2px 2px white;
box-shadow: 0 0 2px 2px white; box-shadow: 0 0 2px 2px white;
text-shadow: 0 0 0; text-shadow: 0 0 0;
} }
/* line 243, ../sass/extra.scss */ /* line 298, ../sass/extra.scss */
#ContentRight { #ContentRight {
margin-top: -58px; margin-top: -58px;
margin-bottom: 58px; margin-bottom: 58px;
} }
/* line 249, ../sass/extra.scss */ /* line 304, ../sass/extra.scss */
.main-page #ContentRight, .main-page #ContentRight,
.question-page #ContentRight { .question-page #ContentRight {
background: white; background: white;
padding-top: 2px; padding-top: 2px;
} }
/* line 254, ../sass/extra.scss */ /* line 309, ../sass/extra.scss */
#ContentLeft { #ContentLeft {
padding-bottom: 0; padding-bottom: 0;
} }
/* line 260, ../sass/extra.scss */ /* line 314, ../sass/extra.scss */
.box h2, .box h2,
.box .contributorback { .box .contributorback {
background: none; background: none;
text-align: left; text-align: left;
} }
/* line 268, ../sass/extra.scss */ /* line 320, ../sass/extra.scss */
.box .inputs #interestingTagInput, .box .inputs #interestingTagInput,
.box .inputs #ignoredTagInput, .box .inputs #ignoredTagInput,
.box .inputs #subscribedTagInput, .box .inputs #subscribedTagInput,
@ -343,7 +410,7 @@ h1.section-title,
line-height: 23px; line-height: 23px;
} }
/* line 277, ../sass/extra.scss */ /* line 331, ../sass/extra.scss */
input[type="submit"].searchBtn, input[type="submit"].searchBtn,
input.cancelSearchBtn { input.cancelSearchBtn {
border: 0; border: 0;
@ -354,7 +421,7 @@ input.cancelSearchBtn {
right: -500px; right: -500px;
} }
/* line 285, ../sass/extra.scss */ /* line 340, ../sass/extra.scss */
#searchBar input[type="button"].cancelSearchBtn { #searchBar input[type="button"].cancelSearchBtn {
right: 8px; right: 8px;
border: none !important; border: none !important;
@ -366,7 +433,7 @@ input.cancelSearchBtn {
width: 32px !important; width: 32px !important;
} }
/* line 299, ../sass/extra.scss */ /* line 350, ../sass/extra.scss */
button, button,
input[type="submit"], input[type="submit"],
input[type="button"], input[type="button"],
@ -380,65 +447,63 @@ input[type="reset"],
text-decoration: none !important; text-decoration: none !important;
font-size: 12.5px; font-size: 12.5px;
background: #FFFFFF; background: #FFFFFF;
background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iNTAlIiBzdG9wLWNvbG9yPSIjZjNmM2YzIi8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjZWJlYmViIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g');
background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(50%, #f3f3f3), color-stop(100%, #ebebeb)); background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(50%, #f3f3f3), color-stop(100%, #ebebeb));
background: -webkit-linear-gradient(#ffffff 0%, #f3f3f3 50%, #ebebeb 100%);
background: -moz-linear-gradient(#ffffff 0%, #f3f3f3 50%, #ebebeb 100%); background: -moz-linear-gradient(#ffffff 0%, #f3f3f3 50%, #ebebeb 100%);
background: -o-linear-gradient(#ffffff 0%, #f3f3f3 50%, #ebebeb 100%); background: -webkit-linear-gradient(#ffffff 0%, #f3f3f3 50%, #ebebeb 100%);
background: linear-gradient(#ffffff 0%, #f3f3f3 50%, #ebebeb 100%); background: linear-gradient(#ffffff 0%, #f3f3f3 50%, #ebebeb 100%);
-webkit-box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
-moz-box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5); -moz-box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
-webkit-box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5); box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
text-shadow: white 0px 1px 1px; text-shadow: #fff 0px 1px 1px;
-webkit-border-radius: 3px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
-ms-border-radius: 3px; -webkit-border-radius: 3px;
-o-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
border-bottom-color: #a0a0a0 !important; border-bottom-color: #a0a0a0 !important;
border-right-color: #bababa !important; border-right-color: #bababa !important;
border-left-color: #bababa !important; border-left-color: #bababa !important;
} }
/* line 319, ../sass/extra.scss */ /* line 373, ../sass/extra.scss */
.comments input[type="submit"], .comments input[type="submit"],
.comments .controls a.button { .comments .controls a.button {
color: #4b4b4b !important; color: #4b4b4b !important;
border: none !important; border: none !important;
} }
/* line 322, ../sass/extra.scss */ /* line 377, ../sass/extra.scss */
.comments input[type="submit"]:hover, .comments input[type="submit"]:hover,
.comments .controls a.button:hover { .comments .controls a.button:hover {
text-decoration: underline; text-decoration: underline;
} }
/* line 326, ../sass/extra.scss */ /* line 381, ../sass/extra.scss */
.comments input[type="submit"] { .comments input[type="submit"] {
color: #1b71bd; color: #1b71bd;
} }
/* line 330, ../sass/extra.scss */ /* line 385, ../sass/extra.scss */
input[type="submit"].link { input[type="submit"].link {
border: none !important; border: none !important;
color: 4b4b4b !important; color: 4b4b4b !important;
} }
/* line 335, ../sass/extra.scss */ /* line 390, ../sass/extra.scss */
#footer { #footer {
margin-top: 10px; margin-top: 10px;
} }
/* line 338, ../sass/extra.scss */ /* line 392, ../sass/extra.scss */
#footer .span-4, #footer .span-4,
#footer .span-8 { #footer .span-8 {
margin: 0; margin: 0;
} }
/* line 341, ../sass/extra.scss */ /* line 396, ../sass/extra.scss */
#footer .span-4 { #footer .span-4 {
width: 17%; width: 17%;
} }
/* line 344, ../sass/extra.scss */ /* line 399, ../sass/extra.scss */
#footer .span-8 { #footer .span-8 {
width: 32%; width: 32%;
} }
/* line 351, ../sass/extra.scss */ /* line 402, ../sass/extra.scss */
#footer a, #footer a,
#footer a:active, #footer a:active,
#footer a:hover, #footer a:hover,
@ -448,47 +513,47 @@ input[type="submit"].link {
font-size: 12px; font-size: 12px;
line-height: 18px; line-height: 18px;
} }
/* line 356, ../sass/extra.scss */ /* line 411, ../sass/extra.scss */
#footer p { #footer p {
margin-top: 14px; margin-top: 14px;
} }
/* line 359, ../sass/extra.scss */ /* line 414, ../sass/extra.scss */
#footer h3 { #footer h3 {
color: #de0000; color: #de0000;
font-size: 16px; font-size: 16px;
margin: 0 0 8px 0; margin: 0 0 8px 0;
padding: 0; padding: 0;
} }
/* line 365, ../sass/extra.scss */ /* line 420, ../sass/extra.scss */
#footer ul { #footer ul {
list-style: none; list-style: none;
margin: 0; margin: 0;
} }
/* line 369, ../sass/extra.scss */ /* line 424, ../sass/extra.scss */
#footer textarea { #footer textarea {
display: block; display: block;
margin: 12px 0 10px; margin: 12px 0 10px;
width: 80%; width: 80%;
} }
/* line 376, ../sass/extra.scss */ /* line 430, ../sass/extra.scss */
.pager, .pager,
.paginator { .paginator {
margin-bottom: 0; margin-bottom: 0;
padding-bottom: 0; padding-bottom: 0;
} }
/* line 381, ../sass/extra.scss */ /* line 436, ../sass/extra.scss */
.post-comments .submit { .post-comments .submit {
line-height: inherit; line-height: inherit;
} }
/* line 385, ../sass/extra.scss */ /* line 440, ../sass/extra.scss */
.question-instructions { .question-instructions {
margin-top: -7px; margin-top: -7px;
} }
/* line 397, ../sass/extra.scss */ /* line 449, ../sass/extra.scss */
body.lang-zh_CN .box .inputs #interestingTagInput, body.lang-zh_CN .box .inputs #interestingTagInput,
body.lang-zh_CN .box .inputs #ignoredTagInput, body.lang-zh_CN .box .inputs #ignoredTagInput,
body.lang-zh_CN .box .inputs #subscribedTagInput, body.lang-zh_CN .box .inputs #subscribedTagInput,
@ -503,7 +568,7 @@ body.lang-zh .box .inputs #subscribedTagInput,
body.lang-zh .box .inputs #ab-tag-search { body.lang-zh .box .inputs #ab-tag-search {
width: 121px; width: 121px;
} }
/* line 404, ../sass/extra.scss */ /* line 458, ../sass/extra.scss */
body.lang-zh_CN .scopes-True-True-True #searchBar, body.lang-zh_CN .scopes-True-True-True #searchBar,
body.lang-zh_CN .scopes-True-True-True .search-drop-menu, body.lang-zh_CN .scopes-True-True-True .search-drop-menu,
body.lang-zh-cn .scopes-True-True-True #searchBar, body.lang-zh-cn .scopes-True-True-True #searchBar,
@ -512,7 +577,7 @@ body.lang-zh .scopes-True-True-True #searchBar,
body.lang-zh .scopes-True-True-True .search-drop-menu { body.lang-zh .scopes-True-True-True .search-drop-menu {
margin-left: 185px; margin-left: 185px;
} }
/* line 410, ../sass/extra.scss */ /* line 464, ../sass/extra.scss */
body.lang-zh_CN .scopes-True-True-False #searchBar, body.lang-zh_CN .scopes-True-True-False #searchBar,
body.lang-zh_CN .scopes-True-True-False .search-drop-menu, body.lang-zh_CN .scopes-True-True-False .search-drop-menu,
body.lang-zh-cn .scopes-True-True-False #searchBar, body.lang-zh-cn .scopes-True-True-False #searchBar,

View File

@ -1,71 +0,0 @@
{% load compress %}
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>{% block title %}{% endblock %} - {{ settings.APP_TITLE|escape }}</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=EDGE" />
{% block meta_description %}
<meta name="description" content="{{settings.APP_DESCRIPTION|escape}}" />
{% endblock %}
<meta name="keywords" content="{%block keywords%}{%endblock%},{{settings.APP_KEYWORDS|escape}}" />
{% if settings.GOOGLE_SITEMAP_CODE %}
<meta name="google-site-verification" content="{{settings.GOOGLE_SITEMAP_CODE}}" />
{% endif %}
<meta name="referrer" content="always" />
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
{% if settings.SITE_FAVICON %}
<link rel="shortcut icon" href="{{ settings.SITE_FAVICON|media }}" />
{% endif %}
<link
rel="alternate"
type="application/rss+xml"
title="{% trans site_title=settings.APP_SHORT_NAME %}RSS feed from {{ site_title }}{% endtrans %}"
href="{{ base_url }}{% url "latest_questions_feed" %}"
/>
{% block before_css %}{% endblock %}
{% include "meta/html_head_stylesheets.html" %}
{% include "meta/fonts.html" %} {# may contain external files #}
{% block forestyle %}{% endblock %}
{% include "meta/html_head_javascript.html" %}
{% block forejs %}{% endblock %}
{% if settings.USE_CUSTOM_HTML_HEAD %}
{{ settings.CUSTOM_HTML_HEAD }}
{% endif %}
</head>
<body class="{% block body_class %}{% endblock %}{% if user_messages %} user-messages{% endif %}{% if page_class %} {{page_class}}{% endif %}{% if request.user.is_anonymous() %} anon{% endif %} lang-{{ language_code }}">
{% include "widgets/system_messages.html" %}
{% include "debug_header.html" %}
{% include "custom_header.html" ignore missing %}
{% if settings.CUSTOM_HEADER|trim != '' %}
<div id="custom-header">
{{settings.CUSTOM_HEADER}}
</div>
{% endif %}
{% include "widgets/header.html" %} {# Logo, user tool navigation and meta navitation #}
{% include "widgets/secondary_header.html" %} {# Scope selector, search input and ask button #}
{% if settings.ENABLE_LEADING_SIDEBAR %}
<div id="leading-sidebar">
{{ settings.LEADING_SIDEBAR }}
</div>
{% endif %}
<div class="content-wrapper">
{% block body %}
{% endblock %}
</div>
{% if settings.FOOTER_MODE == 'default' %}
{% include "widgets/footer.html" %}
{% elif settings.FOOTER_MODE == 'customize' %}
{{ settings.CUSTOM_FOOTER }}
{% endif %}
{% include "custom_footer.html" ignore missing %}
{% include "meta/bottom_scripts.html" %}
{% block endjs %}
{% endblock %}
<script type="text/javascript">
for (url_name in askbot['urls']){
askbot['urls'][url_name] = cleanUrl(askbot['urls'][url_name]);
}
</script>
</body>
</html>

View File

@ -137,6 +137,3 @@ under the License.
>{% trans %}badges{% endtrans %}</a> >{% trans %}badges{% endtrans %}</a>
{% endif %} {% endif %}
<a class="help" href="{% url "help" %}" title="{% trans %}help{% endtrans %}">{% trans %}help{% endtrans %}</a> <a class="help" href="{% url "help" %}" title="{% trans %}help{% endtrans %}">{% trans %}help{% endtrans %}</a>
{% if settings.MULTILINGUAL %}
{% include 'widgets/language_nav.html' %}
{% endif %}