Skip to content

Commit

Permalink
Admin styling fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexey Topolyanskiy authored and radar committed Oct 17, 2012
1 parent 6718b7a commit 3232066
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 43 deletions.
2 changes: 1 addition & 1 deletion api/app/views/spree/admin/users/_api_fields.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@
</div>
<% end %>

</fieldset>
</fieldset>
Original file line number Diff line number Diff line change
Expand Up @@ -151,4 +151,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
}
}
}
}
}
41 changes: 6 additions & 35 deletions core/app/assets/stylesheets/admin/components/_sidebar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,51 +2,22 @@
//---------------------------------------------------
#sidebar {
overflow: visible;
border-top: 1px solid $color-border;
border-top: 1px solid $color-border;
margin-top: 17px;

.sidebar-title {
color: $color-2;
text-transform: uppercase;
text-align: center;
text-align: center;
font-size: 14px;
font-weight: 600;

> span {
display: inline;
background: #fff;
padding: 5px 10px;
position: relative;
background: #fff;
padding: 5px 10px;
position: relative;
top: -14px;
}
}

.sidebar-menu {
ul {
list-style: none;

li {
a {
padding: 10px 0;
display: block;
position: relative;
text-align: left;
border: 1px solid transparent;
text-transform: uppercase;
font-weight: 600;
font-size: 90%;
}

&.active a {
color: $color-2;
border-left-width: 0;
border-bottom-color: $color-2;
}

&:hover a {
color: $color-2;
}
}
}
}
}
12 changes: 10 additions & 2 deletions core/app/assets/stylesheets/admin/shared/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ span.info {

li {
display: inline-block;
padding-right: 10px;


label {
font-weight: normal;
Expand Down Expand Up @@ -187,9 +189,15 @@ fieldset {
span.or {
background-color: $color-1;
border-width: 5px;
margin-left: -15px;
margin-right: -15px;
margin-left: 5px;
margin-right: 5px;
position: relative;

-webkit-box-shadow: 0 0 0 5px $color-1;
-moz-box-shadow: 0 0 0 5px $color-1;
-ms-box-shadow: 0 0 0 5px $color-1;
-o-box-shadow: 0 0 0 5px $color-1;
box-shadow: 0 0 0 5px $color-1;
}
}

Expand Down
8 changes: 8 additions & 0 deletions core/app/assets/stylesheets/admin/shared/_tables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,14 @@ table {
@extend .icon-reorder;
cursor: move;
}

}

&.no-borders {
td, th {
border: none !important;
}

}

th {
Expand Down
6 changes: 3 additions & 3 deletions core/app/views/spree/admin/shared/_order_tabs.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<% content_for :page_title do %>
<%= t(:order) %> <span class="green">#<%= @order.number %></span>
<%= t(:order) %> #<%= @order.number %>
<% end %>

<% content_for :sidebar_title do %>
Expand All @@ -16,7 +16,7 @@

<% if @order.completed? %>
<dt><%= t(:shipment) %>: </dt>
<dd id='shipment_status'><%= t(@order.shipment_state, :scope => :shipment_state, :default => [:missing, "none"]) %></dd>
<dd id='shipment_status'><span class="state <%= @order.shipment_state %>"><%= t(@order.shipment_state, :scope => :shipment_state, :default => [:missing, "none"]) %></dd>
<dt><%= t(:payment) %>: </dt>
<dd id='payment_status'><span class="state <%= @order.payment_state %>"><%= t(@order.payment_state, :scope => :payment_states, :default => [:missing, "none"]) %></dd>
<dt data-hook><%= t(:date_completed) %>:</dt>
Expand All @@ -25,7 +25,7 @@
</dl>
</header>

<nav class="sidebar-menu">
<nav class="menu">
<ul data-hook="admin_order_tabs">
<% unless @order.completed? %>
<li<%== ' class="active"' if current == 'Order Details' %>>
Expand Down

0 comments on commit 3232066

Please sign in to comment.