diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-25 03:05:47 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-25 03:05:47 -0400 |
| commit | 1a1efc7e4614a50a6221e17f0bb4ca48b6d38642 (patch) | |
| tree | d5e7caacc89d8d7a57c57d10401c9493ec3ed59a /view/theme/diabook/diabook-pink | |
| parent | 0e2c6c28198b0e27087ceea6d1ba9d1891405549 (diff) | |
| parent | 5187faa595c52f5c9419da94f42d60d9dfaa1c24 (diff) | |
| download | volse-hubzilla-1a1efc7e4614a50a6221e17f0bb4ca48b6d38642.tar.gz volse-hubzilla-1a1efc7e4614a50a6221e17f0bb4ca48b6d38642.tar.bz2 volse-hubzilla-1a1efc7e4614a50a6221e17f0bb4ca48b6d38642.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
diabook-themes: fix css to login.tpl
restore qcomment selector
rev update
zero-themes: add bbcode-toolbar to commentbox
diabook-themes: small fix
Diabook-dark css fix
Diabook-dark, couple of new icons, and another css fix.
fix tags test with new url
quattro: small week calendar view for event/birthday reminders
remove html from get_birthdays() and get_events()
events page: set calendar start date from url (events/[year]/[month]/) and show event popup from url anchor (#link-[event id])
* master:
Diffstat (limited to 'view/theme/diabook/diabook-pink')
| -rw-r--r-- | view/theme/diabook/diabook-pink/style-wide.css | 9 | ||||
| -rw-r--r-- | view/theme/diabook/diabook-pink/style.css | 9 |
2 files changed, 16 insertions, 2 deletions
diff --git a/view/theme/diabook/diabook-pink/style-wide.css b/view/theme/diabook/diabook-pink/style-wide.css index 65e22aa90..a51ca49cc 100644 --- a/view/theme/diabook/diabook-pink/style-wide.css +++ b/view/theme/diabook/diabook-pink/style-wide.css @@ -1220,7 +1220,14 @@ aside #likes a:hover{ margin-right: 20px; } #login-submit-wrapper{ -margin-bottom: 15px; + padding-top: 120px; + margin-bottom: 12px; + } +aside #login-submit-button{ + margin-left: 0px!important; + } +aside #login-extra-links{ + padding-top: 0px!important; } .group_selected { background: url("../diabook/icons/selected.png") no-repeat left center; diff --git a/view/theme/diabook/diabook-pink/style.css b/view/theme/diabook/diabook-pink/style.css index c223e6439..833e81a5f 100644 --- a/view/theme/diabook/diabook-pink/style.css +++ b/view/theme/diabook/diabook-pink/style.css @@ -1224,7 +1224,14 @@ aside #likes a:hover{ margin-right: 20px; } #login-submit-wrapper{ -margin-bottom: 15px; + padding-top: 120px; + margin-bottom: 12px; + } +aside #login-submit-button{ + margin-left: 0px!important; + } +aside #login-extra-links{ + padding-top: 0px!important; } .group_selected { background: url("../diabook/icons/selected.png") no-repeat left center; |