diff options
author | Wave <wave72@users.noreply.github.com> | 2015-11-25 09:39:44 +0100 |
---|---|---|
committer | Wave <wave72@users.noreply.github.com> | 2015-11-25 09:39:44 +0100 |
commit | 2de65ab39fc704fd8b7abcf9003ee98e3ffb1cc3 (patch) | |
tree | 783f90531c93f498609fb1dbd0e199ca65bb2cc0 /view/css | |
parent | e785b723aad51d4f7202dbbb24a0e2245428cb5b (diff) | |
parent | 0559db9cf81267c34ca014fef1aebe1cf31de2ab (diff) | |
download | volse-hubzilla-2de65ab39fc704fd8b7abcf9003ee98e3ffb1cc3.tar.gz volse-hubzilla-2de65ab39fc704fd8b7abcf9003ee98e3ffb1cc3.tar.bz2 volse-hubzilla-2de65ab39fc704fd8b7abcf9003ee98e3ffb1cc3.zip |
Merge pull request #3 from redmatrix/master
Update branch
Diffstat (limited to 'view/css')
-rw-r--r-- | view/css/bootstrap-red.css | 11 | ||||
-rw-r--r-- | view/css/conversation.css | 1 | ||||
-rw-r--r-- | view/css/mod_events.css | 55 |
3 files changed, 6 insertions, 61 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index abffe2f78..19796679a 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -29,7 +29,7 @@ nav ul li { max-height: 50px; } -nav img { +nav .navbar-header img { height: 49px; width: 49px; margin-top: 1px; @@ -61,18 +61,9 @@ aside .nav-pills > li > a { padding: 6px 10px; } -.dropdown-menu img { - float: left; - width: 32px; - height: 32px; - margin-right: 5px; -} - .dropdown-menu li a { overflow: hidden; text-overflow: ellipsis; - line-height: 1em; - padding: 5px 10px; } .nav-tabs.nav-justified > li { diff --git a/view/css/conversation.css b/view/css/conversation.css index 6f1d4b899..08b51d2fa 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -178,7 +178,6 @@ a.wall-item-name-link { /* comment_item */ .comment-edit-text-empty, .comment-edit-text-full { - float: left; width: 100%; } diff --git a/view/css/mod_events.css b/view/css/mod_events.css index a8e6415c7..00dcc40f8 100644 --- a/view/css/mod_events.css +++ b/view/css/mod_events.css @@ -1,55 +1,10 @@ - -#event-desc-textarea, #event-location-textarea { - width: 400px; -} - -#event-summary-text, #event-start-text, #event-finish-text { - width: 200px; - float: left; -} - -#event-summary, #start_text { - width: 95%; - float: left; -} - -#finish_text { - width: 100%; - float: left; -} - - -#event-category-wrap { - margin-top: 15px; -} - -.event-cats { - margin-top: 15px; +/* fix borders */ +#events-calendar { + margin-left: -1px; + margin-bottom: -1px; } .bootstrap-tagsinput { width: 100%; + padding: 6px 12px; } - - -.required { - float: left; - cursor: default; -} - -#event-datetime-break { - clear: both; -} - -#event-nofinish-break { - margin-bottom: 10px; -} - -#event-desc-text, #event-location-text, .event-form-location-end { - margin-top: 15px; -} - -#event-edit-preview-btn { - margin-right: 15px; -} - |