GitBlixt
teagles/comfortable-mexican-sofa

more css adjustments

Oleg committed Feb 02, 2011
commit 089a539a3a8a8ddd2ca3bea97bfb2a8e086da2e8
Showing 12 changed files with 161 additions and 149 deletions
app/views/cms_admin/layouts/_index_branch.html.erb +1 -5
@@ @@ -2,11 +2,7 @@
<li id='cms_layout_<%= cms_layout.id %>'>
<div class='item'>
- <div class='icon'>
- <% if cms_layout.siblings.size > 0 %>
- <div class='dragger'></div>
- <% end %>
- </div>
+ <div class='icon'></div>
<div class='action_links'>
<%= link_to 'Add Child Layout', new_cms_admin_layout_path(:parent_id => cms_layout.id) %>
<%= link_to 'Edit', edit_cms_admin_layout_path(cms_layout) %>
app/views/cms_admin/layouts/index.html.erb +1 -1
@@ @@ -1,4 +1,4 @@
- <%= link_to span_tag('Create New Layout'), new_cms_admin_layout_path, :class => 'big_button' %>
+ <%= link_to span_tag('Create New Layout'), new_cms_admin_layout_path, :class => 'big button' %>
<h1>Layouts</h1>
<ul class='list'>
app/views/cms_admin/pages/_form.html.erb +1 -1
@@ @@ -4,7 +4,7 @@
<input type='checkbox'/>
Published
</label>
- <button></button>
+ <a class='big button' href='#'></a>
</div>
<%= render :partial => 'cms_admin/uploads/index' %>
<% end %>
app/views/cms_admin/pages/form_blocks.js.erb +2 -1
@@ @@ -1 +1,2 @@
- $('#form_blocks').replaceWith('<%= escape_javascript(render(:partial => "form_blocks")) %>');
\ No newline at end of file
+ $('#form_blocks').replaceWith('<%= escape_javascript(render(:partial => "form_blocks")) %>');
+ $.CMS.enable_codemirror();
\ No newline at end of file
app/views/cms_admin/pages/index.html.erb +1 -1
@@ @@ -1,4 +1,4 @@
- <%= link_to span_tag('Create New Page'), new_cms_admin_page_path, :class => 'big_button' %>
+ <%= link_to span_tag('Create New Page'), new_cms_admin_page_path, :class => 'big button' %>
<h1>Pages</h1>
<ul class='list sortable'>
app/views/cms_admin/sites/index.html.erb +1 -1
@@ @@ -1,4 +1,4 @@
- <%= link_to span_tag('Create New Site'), new_cms_admin_site_path, :class => 'big_button' %>
+ <%= link_to span_tag('Create New Site'), new_cms_admin_site_path, :class => 'big button' %>
<h1>Sites</h1>
<ul class='list'>
app/views/cms_admin/snippets/index.html.erb +1 -1
@@ @@ -1,4 +1,4 @@
- <%= link_to span_tag('Create New Snippet'), new_cms_admin_snippet_path, :class => 'big_button' %>
+ <%= link_to span_tag('Create New Snippet'), new_cms_admin_snippet_path, :class => 'big button' %>
<h1>Snippets</h1>
<ul class='list'>
app/views/cms_admin/uploads/_index.html.erb +1 -1
@@ @@ -1,6 +1,6 @@
<div id='file_uploads' class='box'>
<div class='actions'>
- <button id="uploader_button" href="#">Upload Files</button>
+ <a id='uploader_button' href='#' class='big button'>Upload Files</a>
</div>
<div id='uploaded_files'>
<% CmsUpload.order('file_file_name').all.each do |file| %>
app/views/layouts/cms_admin.html.erb +1 -1
@@ @@ -9,7 +9,7 @@
<%= yield :head %>
<%= cms_hook :html_head %>
</head>
- <body id='cms_admin'>
+ <body class='c_<%= params[:controller].idify %> a_<%= params[:action].idify %>'>
<div class='body_wrapper'>
<div class='left_column'>
<div class='left_column_content'>
public/javascripts/comfortable_mexican_sofa/cms.js +4 -6
@@ @@ -15,8 +15,6 @@ $.CMS = function(){
if($('form.new_cms_page, form.edit_cms_page').get(0)) $.CMS.enable_page_save_form();
if($('#page_save').get(0)) $.CMS.enable_page_save_widget();
if($('#uploader_button').get(0)) $.CMS.enable_uploader();
- }).ajaxSuccess(function(){
- $.CMS.enable_codemirror();
});
return {
@@ @@ -147,15 +145,15 @@ $.CMS = function(){
enable_page_save_widget : function(){
$('#page_save input').attr('checked', $('input#cms_page_is_published').is(':checked'));
- $('#page_save button').html($('input#cms_page_submit').val());
+ $('#page_save a').html($('input#cms_page_submit').val());
- $('#page_save input').bind('click', function(){
+ $('#page_save a').bind('click', function(){
$('input#cms_page_is_published').attr('checked', $(this).is(':checked'));
})
$('input#cms_page_is_published').bind('click', function(){
- $('#page_save input').attr('checked', $(this).is(':checked'));
+ $('#page_save a').attr('checked', $(this).is(':checked'));
})
- $('#page_save button').bind('click', function(){
+ $('#page_save a').bind('click', function(){
$('input#cms_page_submit').click();
})
},
public/stylesheets/comfortable_mexican_sofa/content.css +126 -1
@@ @@ -1,3 +1,4 @@
+ /* -- Page saving widget ------------------------------------------------- */
#page_save button {
float: right;
}
@@ @@ -9,10 +10,11 @@
margin-right: 5px;
}
+ /* -- File Upload widget ------------------------------------------------- */
#file_uploads .actions {
overflow: hidden;
}
- #file_uploads .actions button {
+ #file_uploads .actions a.button {
float: right;
}
#file_uploads #uploaded_files {
@@ @@ -50,4 +52,127 @@
}
#file_uploads #uploaded_files .file:hover a.delete {
color: #9e0b0f;
+ }
+
+ /* -- Listings ----------------------------------------------------------- */
+ ul.list li .item {
+ overflow: hidden;
+ padding: 5px;
+ background-color: #f1f1f1;
+ border-radius: 3px;
+ -moz-border-radius: 3px;
+ margin-bottom: 5px;
+ }
+ ul.list li .item .toggle {
+ float: left;
+ height: 28px;
+ width: 28px;
+ }
+ ul.list li .item .toggle a {
+ display: block;
+ height: 28px;
+ width: 28px;
+ background: url(/images/comfortable_mexican_sofa/arrow_right.gif) center center no-repeat;
+ }
+ ul.list li .item .toggle a span {
+ display: none;
+ }
+ ul.list li .item .toggle.open a {
+ background-image: url(/images/comfortable_mexican_sofa/arrow_bottom.gif);
+ }
+ ul.list li .item .icon {
+ float: left;
+ width: 28px;
+ height: 28px;
+ background: url(/images/comfortable_mexican_sofa/icon_regular.gif);
+ }
+ ul.list li .item .icon .dragger {
+ width: 28px;
+ height: 28px;
+ background: url(/images/comfortable_mexican_sofa/icon_move.gif);
+ display: none;
+ }
+ ul.list li .item .icon:hover .dragger {
+ display: block;
+ }
+ ul.list li .item .icon .dragger span {
+ display: none;
+ }
+ ul.list li .item .label {
+ margin-left: 60px;
+ font-size: 14px;
+ font-weight: bold;
+ }
+ ul.list li .item .label .sublabel {
+ font-size: 10px;
+ font-weight: normal;
+ }
+ ul.list li ul {
+ margin-left: 28px;
+ }
+ ul.list li .action_links {
+ float: right;
+ opacity: 0.2;
+ }
+ table.formatted td.action_links a {
+ opacity: 0.2;
+ }
+ ul.list li .item:hover .action_links,
+ table.formatted tr:hover td.action_links a {
+ opacity: 1;
+ }
+ ul.list li .item:hover,
+ table.formatted tr:hover td {
+ background-color: #fff;
+ }
+ table.formatted {
+ clear: both;
+ }
+ table.formatted th {
+ background: url(/images/comfortable_mexican_sofa/body_bg.jpg);
+ color: #ececec;
+ text-transform: uppercase;
+ font-size: 10px;
+ letter-spacing: 1px;
+ }
+ table.formatted th,
+ table.formatted td {
+ white-space: nowrap;
+ vertical-align: top;
+ padding: 5px;
+ border-bottom: 1px solid #fff;
+ }
+ table.formatted th.main,
+ table.formatted td.main {
+ width: 100%;
+ white-space: normal;
+ }
+ .pagination {
+ margin: 10px 0px;
+ }
+ .pagination span,
+ .pagination em,
+ .pagination a {
+ padding: 2px 5px;
+ margin-right: 2px;
+ background-color: #fff;
+ border-radius: 3px;
+ -moz-border-radius: 3px;
+ }
+ .pagination span {
+ color: #ececec;
+ }
+ .pagination em {
+ background-color: #1C1F22;
+ color: #fff;
+ }
+ form.search {
+ float: right;
+ margin: 5px 0px;
+ }
+
+ /* -- Page Specific stuff ------------------------------------------------ */
+ .c_cms_admin_layouts.a_index ul.list li .item .label,
+ .c_cms_admin_snippets.a_index ul.list li .item .label {
+ margin-left: 32px;
}
\ No newline at end of file
public/stylesheets/comfortable_mexican_sofa/structure.css +21 -129
@@ @@ -66,7 +66,7 @@ html, body {
color: #fff;
}
- /* -- Common Elements ---------------------------------------------------- */
+ /* -- Flash Messages ----------------------------------------------------- */
.flash {
text-align: center;
line-height: 25px;
@@ @@ -77,85 +77,20 @@ html, body {
.flash.error {
background-color: #9e0b0f;
}
- .big_button {
- float: right;
- padding: 4px 10px;
- font-size: 10px;
- font-weight: bold;
- text-transform: uppercase;
- border-radius: 3px;
- -moz-border-radius: 3px;
- border: 1px solid #9f9f9f;
- background: -moz-linear-gradient(top, #F9F9F9 0%, #D5D5D5 34%, #B4B4B4 100%);
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#F9F9F9), color-stop(34%,#D5D5D5), color-stop(100%,#B4B4B4));
- text-shadow: #f5f5f5 1px 1px;
- letter-spacing: 0.5px;
- color: #1b1b1b;
- }
- /* -- Listings ----------------------------------------------------------- */
- ul.list li .item {
- overflow: hidden;
- padding: 5px;
- background-color: #f1f1f1;
- border-radius: 3px;
- -moz-border-radius: 3px;
- margin-bottom: 5px;
- }
- ul.list li .item .toggle {
- float: left;
- height: 28px;
- width: 28px;
- }
- ul.list li .item .toggle a {
- display: block;
- height: 28px;
- width: 28px;
- background: url(/images/comfortable_mexican_sofa/arrow_right.gif) center center no-repeat;
- }
- ul.list li .item .toggle a span {
- display: none;
- }
- ul.list li .item .toggle.open a {
- background-image: url(/images/comfortable_mexican_sofa/arrow_bottom.gif);
- }
- ul.list li .item .icon {
- float: left;
- width: 28px;
- height: 28px;
- background: url(/images/comfortable_mexican_sofa/icon_regular.gif);
- }
- ul.list li .item .icon .dragger {
- width: 28px;
- height: 28px;
- background: url(/images/comfortable_mexican_sofa/icon_move.gif);
- display: none;
- }
- ul.list li .item .icon:hover .dragger {
- display: block;
- }
- ul.list li .item .icon .dragger span {
- display: none;
- }
- ul.list li .item .label {
- margin-left: 60px;
- font-size: 14px;
- font-weight: bold;
- }
- ul.list li .item .label .sublabel {
- font-size: 10px;
- font-weight: normal;
- }
- ul.list li ul {
- margin-left: 28px;
- }
+ /* -- Buttons ------------------------------------------------------------ */
+ a.button,
+ input[type='button'],
+ input[type='submit'],
+ input[type='reset'],
+ input[type='file'],
ul.list .action_links a,
table.formatted td.action_links a {
margin-left: 3px;
background-color: #b4b4b4;
color: #1b1b1b;
padding: 3px 5px;
- font-size: 9px;
+ font: 9px Arial, sans-serif;
text-transform: uppercase;
border-radius: 3px;
-moz-border-radius: 3px;
@@ @@ -164,6 +99,11 @@ table.formatted td.action_links a {
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#F9F9F9), color-stop(34%,#D5D5D5), color-stop(100%,#B4B4B4));
text-shadow: #f5f5f5 1px 1px;
}
+ a.button:hover,
+ input[type='button']:hover,
+ input[type='submit']:hover,
+ input[type='reset']:hover,
+ input[type='file']:hover,
ul.list .action_links a:hover,
table.formatted td.action_links a:hover {
box-shadow: inset 0px 0px 5px #aaa;
@@ @@ -171,63 +111,15 @@ table.formatted td.action_links a:hover {
-webkit-box-shadow: inset 0px 0px 5px #aaa;
border-color: #484848;
}
- ul.list li .action_links {
- float: right;
- opacity: 0.2;
- }
- table.formatted td.action_links a {
- opacity: 0.2;
- }
- ul.list li .item:hover .action_links,
- table.formatted tr:hover td.action_links a {
- opacity: 1;
- }
- ul.list li .item:hover,
- table.formatted tr:hover td {
- background-color: #fff;
- }
- table.formatted {
- clear: both;
- }
- table.formatted th {
- background: url(/images/comfortable_mexican_sofa/body_bg.jpg);
- color: #ececec;
- text-transform: uppercase;
+ a.button.big,
+ input[type='button'],
+ input[type='submit'],
+ input[type='reset'],
+ input[type='file'] {
+ padding: 3px 10px;
font-size: 10px;
- letter-spacing: 1px;
- }
- table.formatted th,
- table.formatted td {
- white-space: nowrap;
- vertical-align: top;
- padding: 5px;
- border-bottom: 1px solid #fff;
- }
- table.formatted th.main,
- table.formatted td.main {
- width: 100%;
- white-space: normal;
- }
- .pagination {
- margin: 10px 0px;
- }
- .pagination span,
- .pagination em,
- .pagination a {
- padding: 2px 5px;
- margin-right: 2px;
- background-color: #fff;
- border-radius: 3px;
- -moz-border-radius: 3px;
- }
- .pagination span {
- color: #ececec;
- }
- .pagination em {
- background-color: #1C1F22;
- color: #fff;
+ letter-spacing: 0.5px;
}
- form.search {
+ a.button.big {
float: right;
- margin: 5px 0px;
}
\ No newline at end of file