diff options
author | Paolo T <tuscanhobbit@users.noreply.github.com> | 2014-11-24 14:19:22 +0100 |
---|---|---|
committer | Paolo T <tuscanhobbit@users.noreply.github.com> | 2014-11-24 14:19:22 +0100 |
commit | bef8879cb1356b880279c6104fcffb0752414a7c (patch) | |
tree | ce3733df7ca168f4afe7e963dc81b6f00944c34c /view/css | |
parent | 1cb45c30e9032794b7827738cc28f7728ac28677 (diff) | |
parent | 5b7124f0daeca4aa619f6411ee373d9ff5a22b7b (diff) | |
download | volse-hubzilla-bef8879cb1356b880279c6104fcffb0752414a7c.tar.gz volse-hubzilla-bef8879cb1356b880279c6104fcffb0752414a7c.tar.bz2 volse-hubzilla-bef8879cb1356b880279c6104fcffb0752414a7c.zip |
Merge pull request #7 from friendica/master
Merge from main project
Diffstat (limited to 'view/css')
-rw-r--r-- | view/css/mod_connedit.css | 2 | ||||
-rw-r--r-- | view/css/mod_directory.css | 34 | ||||
-rw-r--r-- | view/css/mod_locs.css | 3 | ||||
-rw-r--r-- | view/css/mod_menu.css | 3 | ||||
-rw-r--r-- | view/css/mod_photos.css | 82 | ||||
-rw-r--r-- | view/css/mod_settings.css | 2 | ||||
-rw-r--r-- | view/css/widgets.css | 39 |
7 files changed, 64 insertions, 101 deletions
diff --git a/view/css/mod_connedit.css b/view/css/mod_connedit.css index 5bf598062..e7b93a088 100644 --- a/view/css/mod_connedit.css +++ b/view/css/mod_connedit.css @@ -14,7 +14,7 @@ margin-bottom: 5px !important; } -.abook-pending-contact, .abook-permschange { +.abook-pending-contact, .abook-permschange, .abook-autotext { background: orange; font-weight: bold; margin: 10px; diff --git a/view/css/mod_directory.css b/view/css/mod_directory.css index bc8054937..849e8e485 100644 --- a/view/css/mod_directory.css +++ b/view/css/mod_directory.css @@ -8,17 +8,21 @@ .directory-photo { margin-left: 25px; } +.directory-photo-img { + margin-left: auto; + margin-right: auto; + display:block; +} .directory-details { text-align: center; margin-left: 5px; margin-right: 5px; } .directory-item { - float: left; - width: 225px; - height: 260px; overflow: hidden; margin: 2px; + border-bottom: 2px solid #f1f1f1; + padding-bottom: 3px; } #directory-search-wrapper { @@ -42,3 +46,27 @@ div.dirtagblock.widget { float: left; width: 225px; } + +.contact-photo { + float: left; + margin-right: 16px; +} + +.contact-name { + font-size: larger; +} + +.contact-info { + display: block; + overflow: hidden; +} + +.directory-item { + margin: 16px; +} +.directory-connect { + margin-top: 3px; + display:block; + margin-left:auto; + margin-right: auto; +} diff --git a/view/css/mod_locs.css b/view/css/mod_locs.css new file mode 100644 index 000000000..95aee6aef --- /dev/null +++ b/view/css/mod_locs.css @@ -0,0 +1,3 @@ +td { +padding: 10px; +} diff --git a/view/css/mod_menu.css b/view/css/mod_menu.css new file mode 100644 index 000000000..6123ea56b --- /dev/null +++ b/view/css/mod_menu.css @@ -0,0 +1,3 @@ +#menulist > li { + margin-top: 15px; +}
\ No newline at end of file diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css index 3832ea1a6..34bac51e9 100644 --- a/view/css/mod_photos.css +++ b/view/css/mod_photos.css @@ -8,83 +8,23 @@ padding: 7px 10px; } +.photo-like-rotator { + margin-top: 23px; + margin-right: 5px; +} + #photo-photo { display: table; margin: 0 auto; } -#photo-photo-end { - clear: both; -} - -#photo-album-end { - clear: both; - margin-bottom: 25px; -} - -#photos-upload-noshare { - margin-bottom: 10px; -} - -#photos-upload-spacer, -#photos-upload-new-end { - margin-top: 25px; -} -#photos-upload-new-end, #photos-upload-exist-end { - clear: both; -} -#photos-upload-exist-end { - margin-bottom: 15px; -} -#photos-upload-submit { - margin-top: 15px; -} - - -#photos-upload-select-files-text { - margin-top: 15px; - margin-bottom: 15px; -} - -#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label, #photo-edit-rotate-label { - float: left; - width: 150px; -} - -#photo-edit-perms-end { - margin-bottom: 15px; -} - -#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname, #photo-edit-rotate { - float: left; - margin-bottom: 25px; -} -#photo-edit-link-wrap { - margin-bottom: 15px; -} - -#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end, #photo-edit-rotate-end { - clear: both; -} - -#photo-edit-rotate-end { - margin-bottom: 15px; -} - - -#photo-edit-edit, -#photo-album-edit-wrapper { +#photo-edit, +#photo-album-edit-wrapper, +#photo-upload-form { display: none; - padding: 7px 10px; - margin-bottom: 3px; -} - -#photo-album-edit-submit, #photo-album-edit-drop { - margin-top: 15px; - margin-bottom: 15px; } -#photos-usage-message { - line-height: 22px; +#photos-upload-choose { + border: unset; + padding: unset; } - diff --git a/view/css/mod_settings.css b/view/css/mod_settings.css index d0c970989..b03023e21 100644 --- a/view/css/mod_settings.css +++ b/view/css/mod_settings.css @@ -45,7 +45,7 @@ ul#settings-privacy-macros { margin-left: 20px; width: 330px; } -#settings-notify-desc, #settings-activity-desc { +#settings-notify-desc, #settings-activity-desc, #settings-vnotify-desc { font-weight: bold; margin-bottom: 15px; } diff --git a/view/css/widgets.css b/view/css/widgets.css index 593e051da..a24f5fb29 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -7,6 +7,16 @@ margin-top: 0px; } + +.widget .nav-pills > li > a { + padding: 6px 10px; +} + +.widget-input { + border-top-right-radius: 0px; + border-bottom-right-radius: 0px; +} + /* suggest */ .suggest-widget-more { @@ -23,16 +33,6 @@ margin-top: 15px; } -/* search */ - -#search-text { - border: 1px solid #ccc; - padding: 5px; - line-height: 1.5; - border-top-right-radius: 0px; - border-bottom-right-radius: 0px; -} - /* notes */ #note-text { @@ -49,21 +49,6 @@ } -/* peoplefind */ - -#peoplefind-sidebar .btn { - margin: 10px 0 10px 0; -} - -#side-peoplefind-url { - margin-top: 5px; -} - -#side-peoplefind-url { - font-size: 1em; -} - - /* fileas */ @@ -77,6 +62,10 @@ margin-top: 2px; } +#posted-date-selector-drop li:not(:first-child) { + margin-top: 2px; +} + /* categories */ |