GitBlixt
teagles/comfortable-mexican-sofa

moving css around

Oleg committed Feb 01, 2011
commit ad601a9bfdf13437abe1b3da4daa7958782d7189
Showing 7 changed files with 71 additions and 71 deletions
app/views/cms_admin/pages/_form.html.erb +1 -1
@@ @@ -29,7 +29,7 @@
<%= render :partial => 'form_blocks' %>
- <%= form.simple_field nil, nil, :class => 'form_save' do %>
+ <%= form.simple_field nil, nil, :class => 'submit_element' do %>
<%= form.check_box :is_published, :disable_builder => true %>
<%= form.label_for :is_published, :label => 'Published' %>
<%= form.submit @cms_page.new_record?? 'Create Page' : 'Update Page', :disable_builder => true %>
config/initializers/comfortable_mexican_sofa.rb +1 -1
@@ @@ -1,6 +1,6 @@
ComfortableMexicanSofa.configure do |config|
# Title of the admin area
- config.cms_title = 'ComfortableMexicanSofa'
+ config.cms_title = 'ComfortableMexicanSofa MicroCMS'
# Module responsible for authentication. You can replace it with your own.
# It simply needs to have #authenticate method. See http_auth.rb for reference.
comfortable_mexican_sofa/form_builder.rb b/lib/comfortable_mexican_sofa/form_builder.rb +1 -5
@@ @@ -50,11 +50,7 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
def submit(value, options = {}, &block)
return super if options.delete(:disable_builder)
extra_content = @template.capture(&block) if block_given?
- %(
- <div class='form_element submit_element'>
- #{super(value, options)} #{extra_content}
- </div>
- ).html_safe
+ simple_field(nil, "#{super(value, options)} #{extra_content}", :class => 'submit_element')
end
# -- Tag Field Fields -----------------------------------------------------
public/stylesheets/comfortable_mexican_sofa/content.css +53 -0
@@ @@ -0,0 +1,53 @@
+ #page_save button {
+ float: right;
+ }
+ #page_save label {
+ line-height: 20px;
+ padding-left: 5px;
+ }
+ #page_save input {
+ margin-right: 5px;
+ }
+
+ #file_uploads .actions {
+ overflow: hidden;
+ }
+ #file_uploads .actions button {
+ float: right;
+ }
+ #file_uploads #uploaded_files {
+ max-height: 500px;
+ overflow-y: auto;
+ }
+ #file_uploads #uploaded_files .file {
+ position: relative;
+ overflow: hidden;
+ font-size: 11px;
+ background-color: #252525;
+ margin-top: 2px;
+ padding: 0px 3px;
+ opacity: 0.5;
+ border-radius: 2px;
+ -moz-border-radius: 2px;
+ }
+ #file_uploads #uploaded_files .file.pending {
+ opacity: 0.3;
+ }
+ #file_uploads #uploaded_files .file:hover {
+ opacity: 1;
+ }
+ #file_uploads #uploaded_files .file a {
+ color: #fff;
+ }
+ #file_uploads #uploaded_files .file a.delete {
+ position: absolute;
+ display: block;
+ right: 0px;
+ top: 0px;
+ height: 13px;
+ width: 13px;
+ font-weight: bold;
+ }
+ #file_uploads #uploaded_files .file:hover a.delete {
+ color: #9e0b0f;
+ }
\ No newline at end of file
public/stylesheets/comfortable_mexican_sofa/form.css +8 -8
@@ @@ -32,14 +32,11 @@
.form_element .value textarea {
height: 300px;
}
- .form_element.submit_element {
- margin-left: 150px;
- }
.form_element.check_box_element input {
width: auto;
}
.page_form_extras {
- margin-bottom: 25px;
+ margin-bottom: 10px;
}
.form_element.cms_tag_field_datetime .label,
.form_element.cms_tag_field_integer .label,
@@ @@ -70,13 +67,16 @@
font-size: 11px;
color: #9e0b0f;
}
- .form_element.form_save {
- background-color: #E0E0E0;
+ .form_element.submit_element {
+ margin-top: 10px;
+ }
+ .form_element.submit_element .value {
+ background-color: #f1f1f1;
border-radius: 3px;
-moz-border-radius: 3px;
- padding: 5px 0px;
+ padding: 5px;
}
- .form_element.form_save label {
+ .form_element.submit_element label {
margin: 0px 5px;
}
.form_element .desc {
public/stylesheets/comfortable_mexican_sofa/structure.css +6 -55
@@ @@ -15,7 +15,7 @@ html, body {
min-height: 100%;
overflow: hidden;
background-color: #D8D8D8;
- border-left: 1px solid #484844;
+ border-left: 1px solid #484848;
border-right: 1px solid #484848;
}
.center_column_content {
@@ @@ -45,8 +45,8 @@ html, body {
-moz-border-radius-topleft: 4px;
-moz-border-radius-bottomleft: 4px;
background: #2D2D2D;
- background: -moz-linear-gradient(left, #2D2D2D 0%, #3A3A3A 100%);
- background: -webkit-gradient(linear, left top, right top, color-stop(0%,#2D2D2D), color-stop(100%,#3A3A3A));
+ background: -moz-linear-gradient(left, #2D2D2D 0%, #484848 100%);
+ background: -webkit-gradient(linear, left top, right top, color-stop(0%,#2D2D2D), color-stop(100%,#484848));
color: #fff;
opacity: 0.3;
}
@@ @@ -55,64 +55,15 @@ html, body {
color: #fff;
opacity: 1;
}
- /* -- Right Column ------------------------------------------------------- */
+
.right_column_content .box {
- background-color: #ececec;
+ background-color: #484848;
padding: 5px;
border-radius: 3px;
-moz-border-radius: 3px;
margin-bottom: 10px;
overflow: hidden;
- }
- #page_save button {
- float: right;
- }
- #page_save label {
- line-height: 20px;
- padding-left: 5px;
- }
- #page_save input {
- margin-right: 5px;
- }
-
- #file_uploads .actions {
- overflow: hidden;
- }
- #file_uploads .actions button {
- float: right;
- }
- #file_uploads #uploaded_files {
- max-height: 500px;
- overflow-y: auto;
- }
- #file_uploads #uploaded_files .file {
- position: relative;
- overflow: hidden;
- font-size: 11px;
- background-color: #fff;
- margin-top: 2px;
- opacity: 0.8;
- }
- #file_uploads #uploaded_files .file.pending {
- opacity: 0.3;
- }
- #file_uploads #uploaded_files .file:hover {
- opacity: 1;
- }
- #file_uploads #uploaded_files .file:hover a {
- color: #000;
- }
- #file_uploads #uploaded_files .file a.delete {
- position: absolute;
- display: block;
- right: 0px;
- top: 0px;
- height: 13px;
- width: 13px;
- font-weight: bold;
- }
- #file_uploads #uploaded_files .file:hover a.delete {
- color: #9e0b0f;
+ color: #fff;
}
/* -- Common Elements ---------------------------------------------------- */
public/stylesheets/comfortable_mexican_sofa/typography.css +1 -1
@@ @@ -8,7 +8,7 @@ h1 {
padding-bottom: 5px;
color: #1C1F22;
text-shadow: #fff 1px 1px;
- border-bottom: 2px groove #ccc;
+ border-bottom: 2px solid #9f9f9f;
}
a {
text-decoration: none;