Skip to content

Commit

Permalink
Merge branch 'master' of github.com:bergie/create
Browse files Browse the repository at this point in the history
  • Loading branch information
bergie committed Nov 3, 2011
2 parents 5eae03b + a552653 commit 670dcd7
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 3 deletions.
Binary file modified themes/midgard-theme/images/midgard_logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions themes/midgard-theme/jquery.ui.theme.css
@@ -1,5 +1,4 @@


/*
* jQuery UI CSS Framework 1.8.7
*
Expand All @@ -24,7 +23,7 @@
.midgard-create .ui-widget-header a { color: #ffffff; }
.midgard-create .ui-widget-midgardbar { border: 0px solid #555555; background: transparent url(images/ui-bg-midgardbar.png) 50% top repeat-x; color: #ffffff; }
.midgard-create .ui-widget-midgardbar a { color: #ffffff; }
.midgard-create .ui-widget-hidebut { background: transparent url(images/midgard_logo.png) 50% 50% no-repeat; margin: 0px 2px 10px 3px; padding: 10px 15px; text-decoration: none; }
.midgard-create .ui-widget-hidebut { background: transparent url(images/midgard_logo.png) top left no-repeat; margin: 0; padding: 0 0 20px 40px; text-decoration: none; }
.ui-widget-showbut { background: transparent url(images/midgard_logo_slice.png) 0% 0% no-repeat; margin: 0px 0px 0px 0px; padding: 0px 15px; text-decoration: none; }


Expand Down
1 change: 0 additions & 1 deletion themes/midgard-toolbar/midgardbar.css
Expand Up @@ -42,7 +42,6 @@ body

#midgard-bar div.midgard-logo-button {
position: absolute;
top: 15px;
width: 40px;
}

Expand Down

0 comments on commit 670dcd7

Please sign in to comment.