diff options
author | Mario Vavti <mario@mariovavti.com> | 2017-02-02 09:38:07 +0100 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2017-02-02 09:38:07 +0100 |
commit | c3bada3c329cac9b712e0d4d0c5fb0bb73f24d45 (patch) | |
tree | a13c2d56c1b14ba99a853fb7494a9214d075554d /view/theme/redbasic | |
parent | 2e0180ba55e5cbefcfc4066a82dbcaa5b59cacc2 (diff) | |
parent | 23303391e070120851d505a2ec8f3b9b696329e2 (diff) | |
download | volse-hubzilla-c3bada3c329cac9b712e0d4d0c5fb0bb73f24d45.tar.gz volse-hubzilla-c3bada3c329cac9b712e0d4d0c5fb0bb73f24d45.tar.bz2 volse-hubzilla-c3bada3c329cac9b712e0d4d0c5fb0bb73f24d45.zip |
resolve merge conflict
Diffstat (limited to 'view/theme/redbasic')
-rw-r--r-- | view/theme/redbasic/css/style.css | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 3f1d9e992..d599fee50 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2106,12 +2106,6 @@ dl.bb-dl > dd > li { text-align: center; } -.rmagic-button { - padding-top: 10px; - margin-left: 10px; - margin-bottom: 10px; -} - #nav-login { display: none; width: 200px; @@ -2119,3 +2113,13 @@ dl.bb-dl > dd > li { border-radius: $radiuspx; } + +.login-dropdown-menu { + padding: 8px; + background-color: #eee; +} + +.rmagic-button { + margin: 15px 0 5px; + +} |