| Index: static/css/main.css |
| =================================================================== |
| --- a/static/css/main.css |
| +++ b/static/css/main.css |
| @@ -1,11 +1,11 @@ |
| * |
| { |
| - font-family: Arial, sans; |
| + font-family: sans-serif; |
|
juliandoucette
2017/10/10 17:35:04
Removed from PatchSet
ire
2017/10/11 08:09:01
Acknowledged.
|
| font-size: 16px; |
| } |
| body |
| { |
| margin: 0; |
| line-height: 1.5; |
| } |
| @@ -41,81 +41,301 @@ |
| .sprite |
| { |
| display: inline-block; |
| font-size: 0px; /* fix for IE6 height bug */ |
| background-image: url(../img/sprite-main.png); |
| background-repeat: no-repeat; |
| } |
| -nav ul |
| +/******************************************************************************* |
| + * #navbar |
|
juliandoucette
2017/10/10 17:35:08
Moved this below .content
ire
2017/10/11 08:09:03
Acknowledged.
|
| + ******************************************************************************/ |
| + |
| +#navbar |
| { |
|
juliandoucette
2017/10/10 17:35:06
It's necessary to set height here because overflow
ire
2017/10/11 08:09:04
Acknowledged.
|
| - list-style: none; |
| - margin: 0; |
| - padding: 0; |
| + height: 4em; |
| + background-color: #c70d2c; |
| +} |
| + |
| +#navbar ul |
|
juliandoucette
2017/10/10 17:35:08
This isn't necessary anymore because of website-de
ire
2017/10/11 08:09:03
Acknowledged.
|
| +{ |
| + margin: 0em; |
| + padding: 0em; |
| +} |
| + |
| +#navbar li |
|
juliandoucette
2017/10/10 17:35:05
This isn't necessary anymore because of website-de
ire
2017/10/11 08:09:02
Acknowledged.
|
| +{ |
| + list-style-type: none; |
| } |
| -nav a:link, nav a:visited |
| +#navbar .container |
|
juliandoucette
2017/10/10 17:35:08
I'm torn between changing #navbar .container or cr
ire
2017/10/11 08:09:00
I think I prefer creating a new class because it i
juliandoucette
2017/10/11 11:59:34
Agreed. I'll change it.
|
| +{ |
| + padding: 0em; |
| +} |
| + |
| +@media(max-width: 1199px) |
| { |
| - color: #7d7d7d; |
| + #navbar .container |
| + { |
| + width: 100%; |
| + } |
| +} |
| + |
| +/* #navbar #logo |
| + ******************************************************************************/ |
| + |
| +#logo |
| +{ |
| + padding-left: 1em; |
| + padding-right: 1em; |
| + color: #fff; |
| +} |
| + |
| +#logo:hover, |
| +#logo:active, |
| +#logo:focus |
| +{ |
| + background-color: #AE0013; |
| text-decoration: none; |
|
juliandoucette
2017/10/10 17:35:07
Removed unnecessary text-decoration nullification.
ire
2017/10/11 08:09:00
Acknowledged.
|
| } |
| -nav a:hover |
| -{ |
| - text-decoration: underline; |
| -} |
| - |
| -header |
| +#logo, |
| +#logo > * |
| { |
| display: block; |
| - position: relative; |
| - background: white; |
| - border: 1px solid #d9d9d9; |
| - border-top: none; |
| - box-shadow: 1px 1px 0 0 #d9d9d9; |
| - z-index: 1; |
| + float: left; |
| } |
| -header nav li |
| +[dir="rtl"] #logo, |
| +[dir="rtl"] #logo > * |
| { |
| - padding: 0px 5px; |
| + float: right; |
| +} |
| + |
| +#logo img |
| +{ |
| + height: 4em; |
| + padding-top: 0.5em; |
| + padding-bottom: 0.5em; |
| + margin-right: 1em; |
| } |
| -header nav li.selected |
| +[dir="rtl"] #logo > img |
| { |
| - color: #db1313; |
| - text-shadow: 1px 1px 1px #eee; |
| - cursor: default; |
| + margin-left: 1em; |
| +} |
| + |
| +#logo > span |
|
juliandoucette
2017/10/10 17:35:05
IDK if this looks different on different platforms
|
| +{ |
| + line-height: 2.91em; |
| + font-size: 1.375em; |
| } |
| -header nav li.install-link a |
| +/* #navbar #menu-toggle |
| + ******************************************************************************/ |
| + |
| +#menu-toggle |
| { |
| - color: #048e48; |
| + float: right; |
| + padding: 1em; |
| } |
| -header nav li.install-link .install-link-icon |
| +[dir="rtl"] #menu-toggle |
| { |
| - display: inline-block; |
| - width: 12px; |
| - height: 12px; |
| - background-position: -167px -13px; |
| + float: left; |
| } |
| -.language-entry a |
| +/* show on mobile */ |
| +#menu-toggle, |
| +#menu-toggle > img |
| { |
| display: block; |
| } |
| -#logo |
| +/* hide on desktop */ |
| +@media(min-width: 992px) |
| +{ |
| + #menu-toggle |
| + { |
| + display: none; |
| + } |
| +} |
| + |
| +#menu-toggle > img |
| +{ |
| + height: 2em; |
| +} |
| + |
| +#menu-toggle:hover, |
| +#menu-toggle:active, |
| +#menu-toggle:focus |
| +{ |
| + background-color: #AE0013; |
| +} |
| + |
| +/* #navbar #navbar-menu |
| + ******************************************************************************/ |
| + |
| +#navbar-menu a |
| +{ |
| + color: #fff; |
| + text-decoration: none; |
| +} |
| + |
| +/* #navbar #navbar-menu (desktop) |
| + ******************************************************************************/ |
| + |
| +@media(min-width: 992px) |
| { |
| - position: absolute; |
| - width: 128px; |
| - height: 128px; |
| - background-position: -83px -83px; |
| + #navbar-menu |
| + { |
| + float: right; |
| + } |
| + |
| + [dir="rtl"] #navbar-menu |
| + { |
| + float: left; |
| + } |
| + |
| + #navbar-menu > li, |
| + #navbar-menu > li > a |
| + { |
| + display: inline-block; |
| + } |
| + |
| + #navbar-menu > li > a |
| + { |
| + padding-right: 1em; |
| + padding-left: 1em; |
| + line-height: 4em; |
| + } |
| + |
| + #navbar-menu > li > a:hover, |
| + #navbar-menu > li > a:active, |
| + #navbar-menu > li > a:focus |
| + { |
| + background-color: #AE0013; |
| + } |
| + |
| + /* #navbar #navbar-menu #locale-menu |
| + ****************************************************************************/ |
| + |
| + #locale-menubar |
| + { |
| + position: relative; |
| + } |
| + |
| + #locale-menu |
| + { |
| + position: absolute; |
| + display: none; |
| + min-width: 16em; |
| + max-height: 20em; |
| + max-height: 50vh; |
| + top: 100%; |
| + right: 0px; |
| + overflow: auto; |
| + z-index: 1000; |
| + background-color: #292929; |
| + } |
| + |
| + [dir="rtl"] #locale-menu |
| + { |
| + right: auto; |
| + left: 0px; |
| + } |
| + |
| + #locale-menu.visible |
|
juliandoucette
2017/10/10 17:35:06
Moved this logic above as it now applies to both d
ire
2017/10/11 08:09:00
Acknowledged.
|
| + { |
| + display: block; |
| + } |
| + |
| + #locale-menu > li, |
| + #locale-menu > li > a |
| + { |
| + display: block; |
| + white-space: nowrap; |
| + } |
| + |
| + #locale-menu > li > a |
| + { |
| + padding-left: 1em; |
| + padding-right: 1em; |
| + line-height: 3em; |
|
juliandoucette
2017/10/10 17:35:05
Changed to default line-height and padding: 0.75em
ire
2017/10/11 08:09:02
Acknowledged.
|
| + text-decoration: none; |
|
juliandoucette
2017/10/10 17:35:09
Removed unnecessary text-decoration nullification.
ire
2017/10/11 08:09:01
Acknowledged.
|
| + } |
| + |
| + #locale-menu > li > a:hover, |
| + #locale-menu > li > a:active, |
| + #locale-menu > li > a:focus |
| + { |
| + background-color: #434343; |
| + } |
| + |
| + /* caret */ |
| + #locale-selected::after |
|
juliandoucette
2017/10/10 17:35:05
I think I'll flip this caret on select separately.
ire
2017/10/11 08:09:01
Acknowledged.
|
| + { |
| + display: inline-block; |
| + width: 0; |
| + height: 0; |
| + margin-left: .255em; |
| + vertical-align: .255em; |
| + content: ""; |
| + border-top: .3em solid; |
| + border-right: .3em solid transparent; |
| + border-left: .3em solid transparent; |
| + } |
| +} |
| + |
| +/* #navbar #navbar-menu (mobile) |
| + ******************************************************************************/ |
| + |
| +@media(max-width: 991px) |
| +{ |
| + #navbar-menu |
| + { |
| + display: none; |
| + float: left; |
| + background-color: #292929; |
| + } |
| + |
| + #navbar-menu.visible, |
| + #navbar-menu li, |
| + #navbar-menu li a |
| + { |
| + display: block; |
| + } |
| + |
| + #navbar-menu li a |
| + { |
| + line-height: 3em; |
| + padding-left: 1em; |
| + padding-right: 1em; |
| + } |
| + |
| + #navbar-menu li a:hover, |
| + #navbar-menu li a:active, |
| + #navbar-menu li a:focus |
| + { |
| + background-color: #434343; |
| + } |
| + |
| + /* locales appear inline in mobile menu */ |
| + #locale-menu li, |
| + #locale-menu a |
| + { |
| + display: inline-block; |
| + } |
| + |
| + /* selected locale does not appear in mobile menu */ |
| + #navbar-menu #locale-selected |
| + { |
| + display: none; |
| + } |
| } |
| #adblock-browser-notification |
| { |
| text-align: center; |
| } |
| #adblock-browser-notification a |