Cut out more bootstrap

jfyne · Feb 4, 2013 · f67e4f6 · f67e4f6
1 parent 900815e
commit f67e4f6
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 26 deletions.
diff --git a/app/assets/stylesheets/_variables.less b/app/assets/stylesheets/_variables.less
@@ -0,0 +1,10 @@
+/**
+ * Variables in the site
+ *
+ */
+
+@primary: #033F5c;
+@secondary: lighten(@primary, 15%);
+@tertiary: lighten(@secondary, 15%);
+
+@light: #ffffff;
diff --git a/app/assets/stylesheets/main.less b/app/assets/stylesheets/main.less
@@ -1,7 +1,33 @@
+/**
+ * Copyright Accordo Partners 2013
+ *
+ * @author Josh Fyne
+ */
+
+@import "_variables.less";
+
 body {
     font-family: 'Roboto', sans-serif;
+    color: @secondary;
+}
+
+hr {
+    border: 1px solid;
+    margin: 2em;
+}
+
+h1,h2,h3,a {
+    text-transform: uppercase;
+    text-decoration: none;
+    color: @tertiary;
+}
+
+.btn {
+    background-color: @primary;
+    padding:10px;
+    color: @light;
 }
 
-h1,h2,h3 {
-    text-transform:uppercase;
+nav > ul {
+    list-style: none;
 }
diff --git a/app/views/main.scala.html b/app/views/main.scala.html
@@ -17,18 +17,18 @@
         <![endif]-->
     </head>
     <body>
-        <nav>
-            <ul>
-                <li><a href="@routes.Application.index">Home</a></li>
-                <li><a href="@routes.Application.about">About</a></li>
-                <li><a href="@routes.Application.solutions">Solutions</a></li>
-                <li><a href="@routes.Application.experience">Experience</a></li>
-                <li><a href="@routes.Application.expos("Upcoming")">Events</a></li>
-                <li><a href="@routes.Application.contact">Contact</a></li>
-            </ul>
-        </nav>
-
         <header>
+            <nav>
+                <ul>
+                    <li><a href="@routes.Application.index">Home</a></li>
+                    <li><a href="@routes.Application.about">About</a></li>
+                    <li><a href="@routes.Application.solutions">Solutions</a></li>
+                    <li><a href="@routes.Application.experience">Experience</a></li>
+                    <li><a href="@routes.Application.expos("Upcoming")">Events</a></li>
+                    <li><a href="@routes.Application.contact">Contact</a></li>
+                </ul>
+            </nav>
+
             <div class="container">
                 <h2>@title</h2>
                 <p class="lead">@subtitle</p>
@@ -39,9 +39,9 @@ <h2>@title</h2>
 
             @content
 
-            <footer>
-                <p>&copy; Accordo Partners 2013</p>
-            </footer>
         </div>
+        <footer>
+            <p>&copy; Accordo Partners 2013</p>
+        </footer>
     </body>
 </html>