Skip to content

Commit

Permalink
Merge f0bfab3 into bb89fd2
Browse files Browse the repository at this point in the history
  • Loading branch information
bricesanchez committed Jan 20, 2015
2 parents bb89fd2 + f0bfab3 commit c8eca05
Show file tree
Hide file tree
Showing 5 changed files with 141 additions and 101 deletions.
Binary file modified core/app/assets/images/refinery/logo-site-bar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 0 additions & 5 deletions core/app/assets/javascripts/refinery/site_bar.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
$(function() {
$logo = $('#site_bar_content #site_bar_refinery_cms_logo');
$logo.css('left', ($('#site_bar_content').width() / 2) - ($logo.width() / 2));

$switch_anchor = $('#editor_switch a').not('.ie7 #editor_switch a, .ie6 #editor_switch a');

$('#editor_switch a').appendTo($('<span></span>').prependTo('#editor_switch'));
});
32 changes: 12 additions & 20 deletions core/app/assets/stylesheets/refinery/layout.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ body {
margin: 0;
padding: 0;
font-family: Arial, sans-serif;
font-size: 13px;
line-height: 1.5em;
color: #41403C;
background: #303030 image_url('refinery/page_bg.png') repeat;
Expand All @@ -35,9 +34,19 @@ acronym {
label[for] {
cursor: pointer;
}
#admin_container, #login_container, #site_bar_content {
#admin_container, #login_container {
font-size: 13px;
margin: 0px auto 15px auto;
text-align: left;

a {
color: #41403C;
text-decoration: none;
}
a:hover {
color: #000;
border-bottom: 1px solid #727272;
}
}
#admin_container, #login_container {
@include rounded($standard_rounding);
Expand All @@ -62,9 +71,6 @@ label[for] {
float: left;
width: $admin_width - $menu_width;
}
#site_bar_content {
margin-bottom: 0px;
}
#content .field, #content .form-actions {
position: relative;
}
Expand Down Expand Up @@ -214,14 +220,7 @@ noscript .flash.flash_alert a, noscript .flash.flash_alert a:hover {
right: 9px;
top: 7px;
}
a {
color: #41403C;
text-decoration: none;
}
a:hover {
color: #000;
border-bottom: 1px solid #727272;
}

#content .visual_editor_box a, #content .ui-tabs a {
border-bottom: 0px none;
}
Expand Down Expand Up @@ -272,9 +271,6 @@ a:hover {
.less-important {
color: #727272;
}
a#site_bar_refinery_cms_logo {
left: 448px;
}
#content {
background-color: white;
}
Expand Down Expand Up @@ -992,10 +988,6 @@ body.dialog form {
ul#menu.reordering_menu li a {
cursor: move;
}
#site_bar {
background: #22a7f2;
border-bottom: 0px none;
}
#search {
border: 1px solid #b3b3b3;
line-height: 18px;
Expand Down
196 changes: 124 additions & 72 deletions core/app/assets/stylesheets/refinery/site_bar.css.scss
Original file line number Diff line number Diff line change
@@ -1,85 +1,137 @@
@import '_mixins';

#site_bar_content {
height:47px;
position: relative;
margin: 0px auto 10px auto;
text-align: left;
width: 1000px;
}
$standard_rounding: 0px;

#site_bar {
background: #22a7f2;
border-bottom: 0px none;
}
a#site_bar_refinery_cms_logo {
left: 448px;
}
#site_bar, #site_bar * {
color: white;
font-family: Arial;
font-size: 14px;
font-weight: normal;
}
#editor_switch, #site_bar_branding, a#site_bar_refinery_cms_logo { position: absolute; }
#editor_switch {
left: 0px;
a, a:hover {

#site_bar_content {
color: white;
background: #e7682c image_url('refinery/orange_button.png') repeat-x;
border-bottom: 0px none;
padding: 4px 14px;
border: 1px solid #fca87f;
height: 24px;
line-height: 24px;
cursor: pointer;
}
span {
border: 1px solid #0280c7;
height: 26px;
line-height: 26px;
margin-top: 9px;
display: block;
cursor: pointer;
}
}
#site_bar {
height: 47px;
padding: 0px;
* {
line-height: 47px;
}
a {
text-decoration: none;
}
#site_bar_branding {
right: 0px;
font-family: Arial;
font-size: 0.9em;
font-weight: normal;
overflow: auto;
margin: 0 auto;
max-width: 960px;
padding: 0.8em;

a {
font-weight: normal;
&#logout {
margin-left: 12px;
color: white;
text-decoration: none;

&:hover {
text-decoration: underline;
}
}

#editor_switch {
text-align: center;

@media screen and (min-width: 37.5em) {
text-align: left;
}

span {
}

a {
background: #ff8951;
background: -moz-linear-gradient(top, #ff8951 0%, #d14808 100%);
background: -webkit-gradient(left top, left bottom, color-stop(0%, #ff8951), color-stop(100%, #d14808));
background: -webkit-linear-gradient(top, #ff8951 0%, #d14808 100%);
background: -o-linear-gradient(top, #ff8951 0%, #d14808 100%);
background: -ms-linear-gradient(top, #ff8951 0%, #d14808 100%);
background: linear-gradient(to bottom, #ff8951 0%, #d14808 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff8951', endColorstr='#d14808', GradientType=0 );
border: 1px solid #fca87f;
border-bottom: 0px none;
display: inline-block;
margin-right: 0.3em;
padding: 0.15em 1em 0.25em;
@include rounded($standard_rounding);

&:hover {
background: #d14908;
text-decoration: none;
}
}
}

#site_bar_refinery_cms_logo {
background: image_url('refinery/logo-site-bar.png') no-repeat 0 0;
display: none;
height: 29px;
overflow: hidden;
margin-top: -2px;
position: relative;
width: 96px;

@media screen and (min-width: 58em) {
display: block;
}

span {
position: absolute;
left: -1000em;
}

&:hover {
background-position: 0 100%;
}
}

#site_bar_branding {
display: block;
text-align: center;
margin-top: 0.9em;

@media screen and (min-width: 37.5em) {
margin-top: 0.25em;
text-align: right;
}

#site_bar_company_name {
font-weight: bold;
}

#logout {
margin-left: 0.9em;
}
}
}
#site_bar_company_name {
font-weight: bold;
}
}
a#site_bar_refinery_cms_logo {
left: 44.5%;
border-bottom: none;
line-height: 29px;
height: 29px;
margin-top: 9px;
overflow: hidden;
&:hover {
border-bottom: none;
opacity: 1;
img {
margin-top: -29px;

@media screen and (min-width: 37.5em) {
#site_bar {
#site_bar_content {
#editor_switch {
float: left;
width: 60%;
}

#site_bar_branding {
float: left;
width: 40%;
}
}
}
}
.ie7 #site_bar #editor_switch a {
height: 26px;
line-height: 26px;
}

@media screen and (min-width: 58em) {
#site_bar {
#site_bar_content {
#editor_switch {
width: 52%;
}

#site_bar_branding {
width: 36%;
}

#site_bar_refinery_cms_logo {
float: left;
width: 12%;
}
}
}
}
9 changes: 5 additions & 4 deletions core/app/views/refinery/_site_bar.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@
<% end -%>
<div id='site_bar'>
<div id='site_bar_content' class='clearfix'>
<div id='editor_switch'>
<%= site_bar_switch_link -%>
<%= site_bar_edit_link -%>
</div>
<%= link_to image_tag("refinery/logo-site-bar.png", :alt => "Refinery CMS™"),
'http://refinerycms.com',
:target => '_blank',
:id => 'site_bar_refinery_cms_logo' %>
<%= link_to 'http://refinerycms.com', :id => 'site_bar_refinery_cms_logo', :target => '_blank' do %>
<span>Refinery CMS™</span>
<% end %>
<div id='site_bar_branding'>
<span id='site_bar_company_name'>
Expand Down

0 comments on commit c8eca05

Please sign in to comment.