Merge develop into 1404_reworked_autocomplete

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

diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css
index fe07ad26515ed8d8a8fd11325fee9575618e73c3..82a89f93d2dd48d258bb26d0933dfb36424ae582 100644 (file)
--- a/view/theme/frost/style.css
+++ b/view/theme/frost/style.css
@@ -113,6 +113,51 @@ blockquote {
 
 .pull-right { float: right }
 
+.btn {
+       outline: none;
+       -moz-box-shadow: inset 0px 1px 0px 0px #ffffff;
+       -webkit-box-shadow: inset 0px 1px 0px 0px #ffffff;
+       box-shadow: inset 0px 1px 0px 0px #ffffff;
+       background-color: #ededed;
+       text-indent: 0;
+       border: 1px solid #dcdcdc;
+       display: inline-block;
+       color: #777777;
+       padding: 5px 10px;
+       text-align: center;
+       border-radius: 8px;
+}
+a.btn {
+       text-decoration: none;
+       color: inherit;
+}
+
+.menu-popup {
+       width: auto;
+       border: 2px solid #444444;
+       background: #FFFFFF;
+       position: absolute;
+       margin: 2px 0 0;
+       display: none;
+       z-index: 10000;
+}
+
+.menu-popup li a {
+       display: block;
+       padding: 2px;
+}
+
+.menu-popup li a:hover {
+       color: #FFFFFF;
+       background: #3465A4;
+       text-decoration: none;
+}
+ul.menu-popup li.divider {
+       height: 1px;
+       margin: 3px 0;
+       overflow: hidden;
+       background-color: #2d2d2d;
+}
 
 
 /* nav */
@@ -1952,6 +1997,20 @@ input#dfrn-url {
        margin-left: 15px;
 }
 
+#contact-edit-status-wrapper {
+       padding: 10px;
+       border: 1px solid #aaa;
+       border-radius: 8px;
+}
+
+#contact-edit-contact-status {
+       font-weight: bold;
+}
+#contact-edit-actions {
+       float: right;
+       display: inline-block;
+}
+
 #contact-edit-wrapper {
        margin-top: 10px;
 }
@@ -1989,11 +2048,6 @@ input#dfrn-url {
        margin-top: 5px;
 }
 
-#contact-edit-drop-link {
-       float: right;
-       margin-right: 20px;
-}
-
 #contact-edit-nav-end {
        clear: both;
 }