Various stylistic changes, primarily cutting down the amount of green by replacing...

diff --git a/2015/assets/css/custom.css b/2015/assets/css/custom.css
index d45ec2ab7665d054362e887907e2d4282004017f..ac40a4a2dd99f0495157f0cd7eb56f3d7ec9cdaf 100644 (file)
--- 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 <http://getbootstrap.com/examples/sticky-footer/>
 -------------------------------------------------- */
 

diff --git a/2015/program/index.html b/2015/program/index.html
index 46361ce239fc9ac7bb39e750712efe837f32342c..e7105af3007c7dba0e21fe1ff15dc8cf52ddde0f 100755 (executable)
--- a/2015/program/index.html
+++ b/2015/program/index.html
@@ -9,8 +9,6 @@
 
 <!--#include virtual="/server/2015/program-menu.html"-->
 
-<!--Syntax for anchor links on the page: <a name="saturday">-->
-
 <!--<div id="lp-panel" class="panel panel-default margin-top">
 <div class="panel-heading">
 <h2 class="panel-title">

diff --git a/server/2015/banner.html b/server/2015/banner.html
index 7e3ff5607f49af16d0b3e752ff5d23009d3f7a1f..e0c99265953dd93072017e39492f8430ece98557 100644 (file)
--- a/server/2015/banner.html
+++ b/server/2015/banner.html
@@ -81,7 +81,7 @@
 
 
            <div class="col-sm-offset-3 col-sm-3 col-xs-12"> <!-- Start of register button -->
-           <a class="btn btn-register-lp14 btn-lg btn-block"
+           <a class="btn btn-register btn-lg btn-block"
            href="https://my.fsf.org/civicrm/event/register?reset=1&amp;id=20">
            <span class="glyphicon glyphicon-ok"></span>
            Register now

diff --git a/server/2015/program-menu.html b/server/2015/program-menu.html
index afaca180d070a2a9951e74e2005b561930b4563e..7bfd8de073bd765ddd6867b751821ab2e77e8d3c 100644 (file)
--- a/server/2015/program-menu.html
+++ b/server/2015/program-menu.html
@@ -1,15 +1,8 @@
 
 <div class="contain-fluid">
   <div class="row margin-top">
-    &nbsp;&nbsp;&nbsp;&nbsp;<b><a href="index.html">Sessions</a> / <a href="schedule.html">Schedule</a> / <a href="speakers.html">Speakers</a></b>
-
-    <!--<div class="col-sm-offset-2 col-sm-9 col-md-offset-3 col-md-7">
-    </div>
-
-    <ol class="breadcrumb">
-      <li id="p-sessions"><a href="index.html">Sessions</a></li>
-      <li id="p-grid-schedule"><a href="schedule.html">Schedule</a></li>
-      <li id="p-speakers"><a href="speakers.html">Speakers</a></li>
-    </ol>-->
+    <div class="col-sm-9">
+    <h3><a href="index.html">Sessions</a> / <a href="schedule.html">Schedule</a> / <a href="speakers.html">Speakers</a></h3>
   </div>
 </div>
+</div>