Merge remote-tracking branch 'upstream/develop' into dfrn-2

[friendica.git] / view / theme / frio / css / style.css

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index dbea11b83cbe122914b71e5419ad0c65eca4631a..312bee263eb0340486216d4d9c210591c604b499 100644 (file)
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -1087,6 +1087,9 @@ color: rgba(255,255,255,.85);
 aside .vcard #profile-photo-wrapper:hover .tool .action {
     opacity: 1;
 }
+aside .vcard #profile-photo-wrapper.crop-preview {
+    padding: 0;
+}
 aside .vcard .profile-header {
     margin-bottom: 20px;
 }
@@ -1771,7 +1774,7 @@ code > .hl-main {
     text-decoration: underline;
 }
 .wall-item-actions .separator {
-       margin: 0 .3em;
+    margin: 0 .3em;
 }
 
 /* wall item hover effects */
@@ -2112,7 +2115,7 @@ ul.dropdown-menu li:hover {
 .allfriends-content-wrapper, .match-content-wrapper, .dirfind-content-wrapper,
 .directory-content-wrapper, .manage-content-wrapper, .notes-content-wrapper,
 .message-content-wrapper, .apps-content-wrapper, .photos-content-wrapper,
-.admin-content-wrapper, .viewcontacts-content-wrapper, .dfrn_request-content-wrapper,
+#adminpage, .viewcontacts-content-wrapper, .dfrn_request-content-wrapper,
 .friendica-content-wrapper, .credits-content-wrapper, .nogroup-content-wrapper,
 .profperm-content-wrapper {
     min-height: calc(100vh - 150px);
@@ -2134,6 +2137,11 @@ ul.dropdown-menu li:hover {
 .section-title-wrapper {
     overflow: hidden;
 }
+/* Home and Login Page */
+body.mod-home .navbar #nav-login,
+body.mod-login .navbar #nav-login {
+    display: none;
+}
 /* Profile-page */
 #profile-content-standard,
 #profile-content-advanced {
@@ -2673,6 +2681,53 @@ ul li:hover .contact-wrapper .contact-action-link:hover {
     margin-left: 20px;
 }
 
+/* Emulates Bootstrap display */
+.settings-block {
+    margin: 0 -15px 5px;
+    color: #333;
+    background-color: rgba(255,255,255,0.95);
+    border-radius: 4px;
+    padding: 10px 15px;
+    box-shadow: 0 0 3px #dadada;
+    -webkit-box-shadow: 0 0 3px #dadada;
+    -moz-box-shadow: 0 0 3px #dadada;
+}
+
+.settings-block.fakelink, .settings-block > .fakelink {
+    padding: 10px 25px;
+    display: block;
+}
+.settings-block > .fakelink {
+    margin: -10px -15px 10px -15px;
+    border-radius: 4px 4px 0 0;
+}
+
+.settings-block.fakelink:hover, .settings-block > .fakelink:hover {
+    color: $link_hover_color;
+}
+.settings-block.fakelink > h3, .settings-block > .fakelink > h3 {
+    margin: 0;
+    padding: 0;
+    color: $link_color;
+    font-size: 18px;
+}
+
+.fakelink > h3:before {
+    padding-right: 10px;
+}
+.settings-block.fakelink > h3:before {
+    font-family: FontAwesome;
+    content: "\f0da"; /* Right Plain Pointer */
+}
+.settings-block > .fakelink > h3:before {
+    font-family: FontAwesome;
+    content: "\f0d7"; /* Bottom Plain Pointer */
+}
+
+h3.connector {
+    line-height: 40px;
+}
+
 /* Intro Notifications */
 ul.notif-network-list {
     margin-left: -15px;
@@ -2829,6 +2884,9 @@ section.help-content-wrapper li {
 #adminpage #frio_background_image.input-group {
     display: block;
 }
+#admin-summary-wrapper {
+    padding-top: 10px;
+}
 #adminpage ul#pluginslist, li.plugin {
     padding-top: 10px;
 }