Permalink
Browse files

Merge branch 'tabstyling' of https://github.com/ajshort/sapphire into…

… ajshort-tabstyling
  • Loading branch information...
chillu committed Jun 12, 2012
2 parents 896d198 + 8976c82 commit 9b3d3123b683483afad85b6ba7db52955d20385e
Showing with 33 additions and 28 deletions.
  1. +4 −4 admin/css/screen.css
  2. +20 −15 admin/scss/_style.scss
  3. +9 −9 templates/forms/TabSet.ss
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -1734,10 +1734,16 @@ form.import-form {
//Styling of tabs on page edit
.cms-edit-form {
background:darken($color-widget-bg, 2%);
- .ui-tabs-nav {
- float:right;
- margin:$grid-x $grid-x*3 -1px 0;
+
+ .ui-tabs-nav {
+ border-bottom: none;
+ float: right;
+ margin: $grid-y 0 -1px 0;
+ padding: 0 $grid-x*3 0 0;
+
li {
+ float: left;
+
a {
font-weight: bold;
line-height: $grid-y * 2;
@@ -1758,18 +1764,17 @@ form.import-form {
}
}
}
- .ss-tabset .ui-tabs-panel {
- background:darken($color-widget-bg, 2%);
- clear:both;
- /* border-top:1px solid $color-button-generic-border; */
- .ss-tabset {
- border-top:none;
- .ui-tabs-nav {
- margin-top:0px;
- margin-right:8px;
- }
- }
- }
+ .ss-tabset {
+ .ss-tabset {
+ position: static;
+ }
+
+ .ui-tabs-panel {
+ background: darken($color-widget-bg, 2%);
+ border-top:1px solid $color-button-generic-border;
+ clear: both;
+ }
+ }
}
//Styling of tabs on page settings
.CMSPageSettingsController {
View
@@ -6,14 +6,14 @@
</ul>
<% loop Tabs %>
- <div $AttributesHTML>
- <% if Tabs %>
- $FieldHolder
- <% else %>
- <% loop Fields %>
- $FieldHolder
- <% end_loop %>
- <% end_if %>
- </div>
+ <% if Tabs %>
+ $FieldHolder
+ <% else %>
+ <div $AttributesHTML>
+ <% loop Fields %>
+ $FieldHolder
+ <% end_loop %>
+ </div>
+ <% end_if %>
<% end_loop %>
</div>

0 comments on commit 9b3d312

Please sign in to comment.