diff options
| author | Nathan Kinkade <nkinkade@nkinka.de> | 2011-01-31 20:49:25 +0000 | 
|---|---|---|
| committer | Nathan Kinkade <nkinkade@nkinka.de> | 2011-01-31 20:49:25 +0000 | 
| commit | de6f3fce9110b777d61dec97f2a3a61d887a5ccd (patch) | |
| tree | 1a184dc0d6bbfd644164d85d3df1bc9926455da7 /themes/admin_wind/css | |
| parent | 2898fe3b82ce10d045dd2c274a3290bacf209a00 (diff) | |
| parent | d2c77fd0590501f7b6b51d9f4cc033ed9485b082 (diff) | |
Did a git pull, but had to manually merge a conflict.
Diffstat (limited to 'themes/admin_wind/css')
| -rw-r--r-- | themes/admin_wind/css/screen.css | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index 7d491cb7..a5376ff6 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -888,10 +888,10 @@ button {    background-position: .4em .3em;    border: 1px solid #ccc;    padding: 0; +  margin-bottom: 1em;  }  #g-action-status { -  margin-bottom: 1em;  }  #g-action-status li, | 
