From 2f519e97eb4624ddace665de0ae30a42cc124f32 Mon Sep 17 00:00:00 2001 From: Zak Rogoff Date: Fri, 16 Jan 2015 15:49:40 -0500 Subject: [PATCH] Various stylistic changes, primarily cutting down the amount of green by replacing green links with black links with green underlines. --- 2015/assets/css/custom.css | 181 ++++++++++++++++------------------ 2015/program/index.html | 2 - server/2015/banner.html | 2 +- server/2015/program-menu.html | 13 +-- 4 files changed, 90 insertions(+), 108 deletions(-) diff --git a/2015/assets/css/custom.css b/2015/assets/css/custom.css index d45ec2ab..ac40a4a2 100644 --- a/2015/assets/css/custom.css +++ b/2015/assets/css/custom.css @@ -1,3 +1,5 @@ +/* General */ + body { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 14px; @@ -5,7 +7,7 @@ body { color: #333333; } -h3 { +h2, h3 { color: rgb(88, 208, 121); } @@ -13,11 +15,52 @@ h2 small, h2 .small, h3 small, h3 .small { color: rgb(60, 142, 83); } - h3 { font-size: 20px; } +a:hover, +a:focus { + color: rgb(38, 208, 61); + text-decoration: none; +} + +a { + color: inherit; + text-decoration: underline; + -moz-text-decoration-color: rgb(88, 208, 121); + text-decoration-color: rgb(88, 208, 121); +} + +hr { + margin-top: 20px; + margin-bottom: 20px; + border: 0; + border-top: 1px solid #bababa; +} + +#lp-panel { + max-width: 32%; + margin-left: 0.3em; + float: right; +} + +#lp-panel ul { + list-style: square; + padding-left: 0.4em; +} + +#lp-panel li { + margin-bottom: 0.5em; +} + +#lp-updates { + max-width: 35%; + margin-left: 0.3em; +} + +/* Header */ + .lp-banner { box-shadow: 0px 1px 5px rgba(255, 255, 255, 0.7); margin-bottom: 20px; @@ -33,24 +76,48 @@ h3 { margin: -0.79em 0 0.001em -4em; } -#lp-panel { - max-width: 32%; - margin-left: 0.3em; - float: right; +.lp-signup { + margin-right: 10px; + margin-left: 10px; } -#lp-panel ul { - list-style: square; - padding-left: 0.4em; +.lp-banner .container { + padding-right: 5px; + padding-left: 5px; + margin-right: auto; + margin-left: auto; } -#lp-panel li { - margin-bottom: 0.5em; +.btn-register { + margin-top: 0.5em; + margin-bottom: 0.3em; + color: #ffffff; + text-shadow: 0px 0px 0px #ffffff; + background-color: rgba(58, 208, 61, 0.6); + background-color: rgba(58, 208, 61, 0.6); + text-decoration: none; } -#lp-updates { - max-width: 35%; - margin-left: 0.3em; +.btn-register:hover, +.btn-register:focus, +.btn-register:active, +.btn-register.active, +.open .dropdown-toggle.btn-register { + color: #ffffff; + background-color: rgba(74, 161, 74, 0.9); + border-color: rgba(57, 132, 57, 0.2); +} + +.btn-register:active, +.btn-register.active, +.open .dropdown-toggle.btn-register { + background-image: none; +} + +.page-header { + padding-bottom: 9px; + margin: 40px 0 20px; + border-bottom: none; } @media (max-width:551px) { @@ -120,45 +187,6 @@ h3 { } } -.lp-signup { - margin-right: 10px; - margin-left: 10px; -} - -.lp-banner .container { - padding-right: 5px; - padding-left: 5px; - margin-right: auto; - margin-left: auto; -} - - -.btn-register-lp14 { - margin-top: 0.5em; - margin-bottom: 0.3em; - color: #ffffff; - text-shadow: 0px 0px 0px #ffffff; - background-color: rgba(58, 208, 61, 0.6); - background-color: rgba(58, 208, 61, 0.6); -} - -.btn-register-lp14:hover, -.btn-register-lp14:focus, -.btn-register-lp14:active, -.btn-register-lp14.active, -.open .dropdown-toggle.btn-register-lp14 { - color: #ffffff; - background-color: rgba(74, 161, 74, 0.9); - border-color: rgba(57, 132, 57, 0.2); -} - -.btn-register-lp14:active, -.btn-register-lp14.active, -.open .dropdown-toggle.btn-register-lp14 { - background-image: none; -} - - @media (min-width:1280px) { .btn-block { display: block; @@ -196,13 +224,6 @@ h3 { } } -.page-header { - padding-bottom: 9px; - margin: 40px 0 20px; - border-bottom: none; -} - - .form-control:-moz-placeholder { color: #777777; } @@ -315,6 +336,10 @@ h3 { border-color: rgba(88, 208, 121, 0.2); } +.lp-home a { + text-decoration: none; +} + @media (min-width:768px) { .nav { padding-left: 0; @@ -346,6 +371,7 @@ h3 { position: relative; display: block; padding: 10px 15px; + text-decoration: none; background-color: rgba(145, 145, 145, 0.8); transition: background-color 1s; } @@ -357,7 +383,6 @@ h3 { .nav > li > a:hover, .nav > li > a:focus { - text-decoration: none; background-color: rgba(88, 208, 121, 1.0); } @@ -493,23 +518,7 @@ h3 { } } -a { - color: rgb(88, 208, 121); - text-decoration: none; -} -a:hover, -a:focus { - color: rgb(38, 208, 61); - text-decoration: none; -} - -hr { - margin-top: 20px; - margin-bottom: 20px; - border: 0; - border-top: 1px solid #bababa; -} .margin-top { margin-top: 22px; @@ -540,24 +549,6 @@ hr { word-break: break-all; } -/* Program */ - -.session { - margin-bottom: 30px; -} - -.session h4 { - margin-bottom: 5px; -} - -.session .room { - font-weight: bold; -} - -.session .speakers { - font-style: italic; -} - /* Footer - adapted from -------------------------------------------------- */ diff --git a/2015/program/index.html b/2015/program/index.html index 46361ce2..e7105af3 100755 --- a/2015/program/index.html +++ b/2015/program/index.html @@ -9,8 +9,6 @@ - - - Register now diff --git a/server/2015/program-menu.html b/server/2015/program-menu.html index afaca180..7bfd8de0 100644 --- a/server/2015/program-menu.html +++ b/server/2015/program-menu.html @@ -1,15 +1,8 @@
-     Sessions / Schedule / Speakers - - +
+

Sessions / Schedule / Speakers

+
-- 2.25.1