From e36172d3376543b2d96e86f6b564ad2a013ea0be Mon Sep 17 00:00:00 2001 From: Tyrel Souza Date: Fri, 7 Nov 2014 14:59:19 -0500 Subject: [PATCH] work on layout --- app/assets/stylesheets/application.css | 173 +++++++++++++++++++++++++ app/views/layouts/application.html.erb | 58 ++++++++- app/views/projects/index.html.erb | 4 - 3 files changed, 228 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index bcdb41c..46dfd18 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -14,3 +14,176 @@ *= require_self *= require bootstrap */ + + +/* override bootstrap styles */ +@import url('http://fonts.googleapis.com/css?family=Oswald:300,400:latin,latin-ext'); + +.navbar-form input, .form-inline input { + width:auto; +} + +body { + color:#646464; + background-color:#FAFAFA; +} + +h1,h2,h3,.highlight,.navbar a,#masthead h4 { + font-family:'Oswald',arial narrow,sans-serif; +} + +footer { + + margin-top:40px; + padding-top:40px; + padding-bottom:40px; + background-color:#cecece; + +} +#masthead { + min-height:199px; + background-color:#0F63FF; + color:#aaaacc; +} + +#masthead h1 { + font-size: 55px; + line-height: 1; + color:#fefeff; + margin-top:50px; +} + +#masthead .well { + margin-top:31px; + background-color:#0F63FF; + border:none; + -webkit-box-shadow: none; + -moz-box-shadow: none ; + box-shadow: none; + color:#fff; + min-height:127px; +} + +#topPanel { + padding-top:0px; + padding-left:22px; + padding-right:22px; +} +#topPanel .panel-body { + padding-top:0px; +} + +.navbar.affix { + position:fixed; + top:0; + width:100%; +} + +.top-spacer { + background-color:#ffffff; + height:40px; +} + +a,a:hover { + color:#223344; + text-decoration:none; +} + +.icon-bar { + background-color:#fff; +} + +@media screen and (min-width: 768px) { + #masthead h1 { + font-size: 80px; + } +} + +.navbar-bright { + background-color:#111166; + color:#fff; + margin-bottom: 0; + border-width: 0; +} + +.navbar-bright a, .navbar-bright .navbar-brand, #masthead h4 { + color:#ccccdd; + font-size:14px; + text-transform: uppercase; + letter-spacing:.08em; +} + +.navbar-bright li > a:hover { + background-color:#000044; +} + +.dropdown-menu { + min-width: 250px; +} + +.caret { + color:#fff; +} + +.navbar-toggle { + color:#fff; + border-width:0; +} + +.navbar-toggle:hover { + background-color:#fff; +} + +.panel { + margin-top: -45px; + background-color: #fff; + border:3px solid #3AB1FE ! important; + border-radius:0; + padding:15px; +} + +.thumbnail { + margin-bottom:8px; +} + +.img-container { + overflow:hidden; + height:170px; +} + +.img-container img { + min-width:280px; + min-height:180px; + max-width:380px; + max-height:280px; +} + +.txt-container { + overflow:hidden; + height:100px; +} + +.panel .lead { + overflow:hidden; + height:90px; +} + +.label-float{ + margin:0 auto; + position: absolute; + top: 0; + z-index: 1; + width:100%; + opacity:.9; + padding:6px; + color:#fff; +} + +.btn-twitter {background-color:#4099FF;color:#fff;} +.btn-facebook {background-color:#3B5998;color:#fff;} +.btn-google-plus {background-color:#d34836;color:#fff;} + +.btn-twitter:hover {background-color:#3088FF;color:#62BBFF;} +.btn-facebook:hover {background-color:#2A4998;color:#4C6BBA;} +.btn-google-plus:hover {background-color:#C23836;color:#E45A58;} + diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index df270df..00bc729 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -2,14 +2,66 @@ Roadmap - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> <%= csrf_meta_tags %> -<%= yield %> +
+
+
+
+

<%= link_to "Roadmap", root_path %> +

+

+
+
+
+
+
+ <%= link_to 'New Project', new_project_path %> + +
+
+
+
+
+
+ + + +
+ + +
+
+ +
+ +
+
+ + +
+ <%= yield %> + + +
+ + + + +
+
+ + +
+ +
+
+ - + \ No newline at end of file diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb index 48d0106..773790e 100644 --- a/app/views/projects/index.html.erb +++ b/app/views/projects/index.html.erb @@ -1,7 +1,3 @@ -

Roadmap

-

Tech Marketing

- -<%= link_to 'New Project', new_project_path %>
<% if @active_projects.count > 0 %>