From 8195154b8094fa70f65ab41ca61a37fa344937cf Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Wed, 20 Mar 2013 21:43:59 -0400 Subject: [PATCH] fixes in the user menu and the footer --- os/media/sass/extra.scss | 12 +++-- os/media/style/extra.css | 85 +++++++++++++++++--------------- os/templates/widgets/footer.html | 4 +- 3 files changed, 53 insertions(+), 48 deletions(-) diff --git a/os/media/sass/extra.scss b/os/media/sass/extra.scss index 80753ff..54e8c29 100644 --- a/os/media/sass/extra.scss +++ b/os/media/sass/extra.scss @@ -105,7 +105,8 @@ h1.section-title, top: 22px; li { line-height: 1.7; - padding-left: 13px; + padding: 0 0 0 13px; + margin: 0; img { margin-bottom: 3px; } @@ -113,16 +114,14 @@ h1.section-title, li:hover { display: block !important; background: white !important; - margin: 0; - padding: 0; - width: 100% !important; } a { margin: 0; padding: 0; } a:hover { - text-decoration: underline; + background: inherit; + text-decoration: none; } } } @@ -282,6 +281,9 @@ input[type="submit"].link { font-size: 12px; line-height: 18px; } + p { + margin-top: 14px; + } h3 { color: #de0000; font-size: 16px; diff --git a/os/media/style/extra.css b/os/media/style/extra.css index c1e18fa..aa38366 100644 --- a/os/media/style/extra.css +++ b/os/media/style/extra.css @@ -131,50 +131,49 @@ h1.section-title, /* line 106, ../sass/extra.scss */ #metaNav .dropdown-menu li { line-height: 1.7; - padding-left: 13px; + padding: 0 0 0 13px; + margin: 0; } -/* line 109, ../sass/extra.scss */ +/* line 110, ../sass/extra.scss */ #metaNav .dropdown-menu li img { margin-bottom: 3px; } -/* line 113, ../sass/extra.scss */ +/* line 114, ../sass/extra.scss */ #metaNav .dropdown-menu li:hover { display: block !important; background: white !important; - margin: 0; - padding: 0; - width: 100% !important; } -/* line 120, ../sass/extra.scss */ +/* line 118, ../sass/extra.scss */ #metaNav .dropdown-menu a { margin: 0; padding: 0; } -/* line 124, ../sass/extra.scss */ +/* line 122, ../sass/extra.scss */ #metaNav .dropdown-menu a:hover { - text-decoration: underline; + background: inherit; + text-decoration: none; } -/* line 129, ../sass/extra.scss */ +/* line 128, ../sass/extra.scss */ #header.with-logo #userToolsNav { bottom: 19px; right: -100px; } -/* line 133, ../sass/extra.scss */ +/* line 132, ../sass/extra.scss */ #secondaryHeader { background: #fff; border: none; margin-bottom: 7px; } -/* line 138, ../sass/extra.scss */ +/* line 137, ../sass/extra.scss */ .scope-selector { font-size: 16px; height: 37px; border-bottom: 3px solid white; } -/* line 143, ../sass/extra.scss */ +/* line 142, ../sass/extra.scss */ .scope-selector.on, .scope-selector:hover { background: none; border-bottom: 3px solid; @@ -185,33 +184,33 @@ h1.section-title, -o-transition: 0.07s, ease; transition: 0.07s, ease; } -/* line 150, ../sass/extra.scss */ +/* line 149, ../sass/extra.scss */ .scope-selector:hover { color: #264D69; } -/* line 153, ../sass/extra.scss */ +/* line 152, ../sass/extra.scss */ .scope-selector:first-child { margin-left: 0; } -/* line 158, ../sass/extra.scss */ +/* line 157, ../sass/extra.scss */ #askButton, #homeButton { display: none; } -/* line 161, ../sass/extra.scss */ +/* line 160, ../sass/extra.scss */ .tabBar { background: none; } -/* line 164, ../sass/extra.scss */ +/* line 163, ../sass/extra.scss */ #logo img { height: 56px; margin-left: -10px; } -/* line 168, ../sass/extra.scss */ +/* line 167, ../sass/extra.scss */ #searchBar { -webkit-box-shadow: inset #eeeeee 1px 1px 2px 1px; -moz-box-shadow: inset #eeeeee 1px 1px 2px 1px; @@ -220,12 +219,12 @@ h1.section-title, margin-top: -33px; } -/* line 173, ../sass/extra.scss */ +/* line 172, ../sass/extra.scss */ .search-drop-menu { margin-left: 255px; } -/* line 176, ../sass/extra.scss */ +/* line 175, ../sass/extra.scss */ .search-drop-menu .footer button { padding: 2px 6px 3px; background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(5%, #f3f3f3), color-stop(100%, #f5850c)); @@ -239,30 +238,30 @@ h1.section-title, text-shadow: 0 0 0; } -/* line 185, ../sass/extra.scss */ +/* line 184, ../sass/extra.scss */ body.anon #searchBar, body.anon .search-drop-menu { margin-left: 158px; } -/* line 189, ../sass/extra.scss */ +/* line 188, ../sass/extra.scss */ #ContentRight { margin-top: -56px; margin-bottom: 56px; } -/* line 193, ../sass/extra.scss */ +/* line 192, ../sass/extra.scss */ #ContentLeft { padding-bottom: 0; } -/* line 199, ../sass/extra.scss */ +/* line 198, ../sass/extra.scss */ .box h2, .box .contributorback { background: none; text-align: left; } -/* line 207, ../sass/extra.scss */ +/* line 206, ../sass/extra.scss */ .box .inputs #interestingTagInput, .box .inputs #ignoredTagInput, .box .inputs #subscribedTagInput, @@ -272,7 +271,7 @@ body.anon .search-drop-menu { line-height: 23px; } -/* line 216, ../sass/extra.scss */ +/* line 215, ../sass/extra.scss */ input[type="submit"].searchBtn, input.cancelSearchBtn { border: 0; @@ -283,7 +282,7 @@ input.cancelSearchBtn { right: -500px; } -/* line 228, ../sass/extra.scss */ +/* line 227, ../sass/extra.scss */ button, input[type="submit"], input[type="button"], @@ -316,46 +315,46 @@ input[type="reset"], border-left-color: #bababa !important; } -/* line 248, ../sass/extra.scss */ +/* line 247, ../sass/extra.scss */ .comments input[type="submit"], .comments .controls a.button { color: #4b4b4b !important; border: none !important; } -/* line 251, ../sass/extra.scss */ +/* line 250, ../sass/extra.scss */ .comments input[type="submit"]:hover, .comments .controls a.button:hover { text-decoration: underline; } -/* line 255, ../sass/extra.scss */ +/* line 254, ../sass/extra.scss */ .comments input[type="submit"] { color: #1b71bd; } -/* line 259, ../sass/extra.scss */ +/* line 258, ../sass/extra.scss */ input[type="submit"].link { border: none !important; color: 4b4b4b !important; } -/* line 264, ../sass/extra.scss */ +/* line 263, ../sass/extra.scss */ #footer { margin-top: 10px; } -/* line 267, ../sass/extra.scss */ +/* line 266, ../sass/extra.scss */ #footer .span-4, #footer .span-8 { margin: 0; } -/* line 270, ../sass/extra.scss */ +/* line 269, ../sass/extra.scss */ #footer .span-4 { width: 17%; } -/* line 273, ../sass/extra.scss */ +/* line 272, ../sass/extra.scss */ #footer .span-8 { width: 32%; } -/* line 280, ../sass/extra.scss */ +/* line 279, ../sass/extra.scss */ #footer a, #footer a:active, #footer a:hover, @@ -365,26 +364,30 @@ input[type="submit"].link { font-size: 12px; line-height: 18px; } -/* line 285, ../sass/extra.scss */ +/* line 284, ../sass/extra.scss */ +#footer p { + margin-top: 14px; +} +/* line 287, ../sass/extra.scss */ #footer h3 { color: #de0000; font-size: 16px; margin: 0 0 8px 0; padding: 0; } -/* line 291, ../sass/extra.scss */ +/* line 293, ../sass/extra.scss */ #footer ul { list-style: none; margin: 0; } -/* line 295, ../sass/extra.scss */ +/* line 297, ../sass/extra.scss */ #footer textarea { display: block; margin: 12px 0 10px; width: 80%; } -/* line 302, ../sass/extra.scss */ +/* line 304, ../sass/extra.scss */ .pager, .paginator { margin-bottom: 0; diff --git a/os/templates/widgets/footer.html b/os/templates/widgets/footer.html index d86229b..4174497 100644 --- a/os/templates/widgets/footer.html +++ b/os/templates/widgets/footer.html @@ -1,14 +1,14 @@