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 eb08deea4610b5ce8acbe56ab86196b82d0b60c7..312bee263eb0340486216d4d9c210591c604b499 100644 (file)
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -73,7 +73,7 @@ aside hr,
 section hr {
     border-color: rgba(238, 238, 238, $contentbg_transp);
 }
-iframe, img {
+iframe, img, video {
     max-width: 100%;
 }
 blockquote {
@@ -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,53 @@ 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;
+}
+#adminpage li .icon {
+    display: inline-block;
+    vertical-align: text-top;
+    position: relative;
+    padding-left: 5px;
+}
+#adminpage li .icon:before {
+    content: "";
+    display: inline-block;
+    position: absolute;
+    width: 17px;
+    height: 17px;
+    left: 0;
+    margin-left: -20px;
+    margin-top: 2px;
+    border: 1px solid #cccccc;
+    border-radius: 3px;
+    background-color: #fff;
+    -webkit-transition: border 0.15s ease-in-out, color 0.15s ease-in-out;
+    -o-transition: border 0.15s ease-in-out, color 0.15s ease-in-out;
+    transition: border 0.15s ease-in-out, color 0.15s ease-in-out;
+}
+#adminpage li .icon.on:after {
+    font-family: "FontAwesome";
+    content: "\f00c";
+    display: inline-block;
+    position: absolute;
+    width: 16px;
+    height: 16px;
+    left: 0;
+    top: 0;
+    margin-left: -20px;
+    margin-top: 2px;
+    padding-left: 3px;
+    padding-top: 1px;
+    font-size: 11px;
+    color: #555555;
+}
+#adminpage .plugin .desc {
+    padding-left: 10px;
+}
 
 /* Register Page*/
 #register-openid-wrapper, #register-name-wrapper, #register-invite-wrapper, #profile-publish-wrapper {
@@ -3005,11 +3107,20 @@ section .profile-match-wrapper {
     float: left;
 }
 
-/** 
+/**
  * Login page
  */
+#login-submit-wrapper {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    align-items: center;
+}
+#lost-password-link { flex-grow: 2; }
+
 .mod-home.is-not-singleuser,
 .mod-login {
+    background-color: $login_bg_color;
     background-image: linear-gradient(to right, rgba(0,0,0, 0.7) , rgba(0,0,0, 0.4)), url($login_bg_image);
     background-size: cover;
     background-attachment: fixed;
@@ -3019,47 +3130,50 @@ section .profile-match-wrapper {
 .mod-home.is-not-singleuser nav.navbar,
 .mod-login nav.navbar { background-color: transparent }
 .mod-home.is-not-singleuser #topbar-second,
-.mod-login #topbar-second { 
+.mod-login #topbar-second {
     background-color: transparent;
     box-shadow: unset;
     border: 0
 }
 .mod-home.is-not-singleuser .login-content,
 .mod-login .login-content {
-       color: #eee;
-       margin-top: 2.5%;
+    color: #eee;
+    margin-top: 2.5%;
 }
 
-.mod-home.is-not-singleuser .login-form > #login-form,
-.mod-login .login-form > #login-form {
-       color: #eee;  
+.mod-home.is-not-singleuser .login-form > #login-form label,
+.mod-login #content #login-form label {
+    color: #eee;
 }
-       
+
+
 .mod-home.is-not-singleuser .login-panel-content,
-.mod-login .login-panel-content { 
-       background-color: rgba(255,255,255,.85);
+.mod-login .login-panel-content {
+    background-color: rgba(255,255,255,.85);
 }
 
 /* Medium devices (desktops, 992px and up) */
 @media (min-width: 992px) {
-       .mod-home.is-not-singleuser #content,
+    .mod-home.is-not-singleuser #content,
     .mod-login #content {
-               margin-top: 100px!important;
-       }    
-       
-       
+        margin-top: 100px!important;
+    }
 
-       .mod-home.is-not-singleuser .login-form > #login-form,
-    .mod-login .login-form > #login-form {    
+    .mod-home.is-not-singleuser .login-form > #login-form,
+    .mod-login #content #login-form {
         background-color: #fff;
-        color: #444;
         padding: 1em;
         position: relative;
         margin-top: 4em;
     }
 
-    .mod-home.is-not-singleuser .login-form > #login-form:before,
-    .mod-login .login-form > #login-form:before {
+    .mod-home.is-not-singleuser .login-form > #login-form label,
+    .mod-login #content #login-form label {
+        color: #444;
+    }
+
+    .mod-home.is-not-singleuser .login-form > #login-form::before,
+    .mod-login #content #login-form::before {
         display: block;
         position: absolute;
         content: " ";
@@ -3071,8 +3185,8 @@ section .profile-match-wrapper {
         z-index: -1;
     }
 
-    .mod-home.is-not-singleuser .login-form > #login-form:after,
-    .mod-login .login-form > #login-form:after {
+    .mod-home.is-not-singleuser .login-form > #login-form::after,
+    .mod-login #content #login-form::after {
         display: block;
         position: absolute;
         content: " ";
@@ -3082,7 +3196,7 @@ section .profile-match-wrapper {
         top: -10%;
         left: 10%;
         z-index: -1;
-       }
+    }
 
 }