Skip to content

Commit

Permalink
Move CSS that shouldn't have been in formatting but in application CS…
Browse files Browse the repository at this point in the history
…S file. Move the page title outside of any content blocks so that it makes more logical sense in terms of positioning. Added new refinery core application.css file.
  • Loading branch information
parndt committed Nov 4, 2009
1 parent 6128bec commit 3fb212c
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 49 deletions.
5 changes: 5 additions & 0 deletions public/stylesheets/application.css
@@ -0,0 +1,5 @@
@import url('refinery/application.css');
/*
Override default refinery application CSS below.
Formatting applies to all frontend.
*/
41 changes: 41 additions & 0 deletions public/stylesheets/refinery/application.css
@@ -0,0 +1,41 @@
#page {
padding: 20px;
width: 1000px;
margin: 0px auto;
}
#body_content_left {
float: left;
width: 600px;
}
#body_content_right {
float: right;
width: 360px;
}

.inquiries form label {
width: 150px;
float: left;
}
.inquiries form input {

}
.inquiries form input, .inquiries form textarea {

}
.inquiries form textarea {

}
.inquiries form .actions {
margin-left: 150px;
}

.inquiries form .actions input {
}

.inquiries .field {
margin: 12px 0px;
}

.inquiries form {
padding-top: 12px;
}
46 changes: 1 addition & 45 deletions public/stylesheets/refinery/formatting.css
Expand Up @@ -50,48 +50,4 @@ Clearfix docs
.clearfix {
display:block;
}
/* End hide from IE Mac */

#page {
background: white;
padding: 20px;
width: 1000px;
margin: 0px auto;
}
#body_content_left {
float: left;
width: 600px;
}
#body_content_right {
float: right;
margin: 0px 12px;
width: 360px;
}

.inquiries form label {
width: 150px;
float: left;
}
.inquiries form input {

}
.inquiries form input, .inquiries form textarea {

}
.inquiries form textarea {

}
.inquiries form .actions {
margin-left: 150px;
}

.inquiries form .actions input {
}

.inquiries .field {
margin: 12px 0px;
}

.inquiries form {
padding-top: 12px;
}
/* End hide from IE Mac */
4 changes: 2 additions & 2 deletions refinerycms.gemspec
@@ -1,10 +1,10 @@
Gem::Specification.new do |s|

s.name = %q{refinerycms}
s.version = "0.9.5.1"
s.version = "0.9.5.2"

s.authors = ["Resolve Digital", "David Jones", "Philip Arndt"]
s.date = %q{2009-11-04}
s.date = %q{2009-11-05}

s.description = %q{A beautiful open source Ruby on Rails content manager for small business. Easy to extend, easy to use, lightweight and all wrapped up in a super slick UI.}
s.summary = %q{A beautiful open source Ruby on Rails content manager for small business.}
Expand Down
2 changes: 1 addition & 1 deletion vendor/plugins/pages/app/views/pages/home.html.erb
@@ -1,6 +1,6 @@
<div id='body_content' class='clearfix'>
<h1 id='body_content_page_title'><%= page_title %></h1>
<div id='body_content_left' class='clearfix'>
<h1><%= page_title %></h1>
<%= @page[:body] %>
</div>
<div id='body_content_right' class='clearfix'>
Expand Down
2 changes: 1 addition & 1 deletion vendor/plugins/pages/app/views/pages/show.html.erb
@@ -1,7 +1,7 @@
<%= render :partial => "/shared/submenu" if RefinerySetting.find_or_set(:show_submenu_on_content_pages, true) %>
<div id='body_content' class='clearfix'>
<h1 id='body_content_page_title'><%= page_title %></h1>
<div id='body_content_left' class='clearfix'>
<h1><%= page_title %></h1>
<%= @page[:body] %>
</div>
<div id='body_content_right' class='clearfix'>
Expand Down

0 comments on commit 3fb212c

Please sign in to comment.