Rafał Pitoń 11 лет назад
Родитель
Сommit
67b9223337

+ 1 - 35
uiframework/misago/css/flavor/navbar.less

@@ -35,10 +35,7 @@
     }
 
     .dropdown-menu {
-      border: none;
-      border-radius: @border-radius-base !important;
-      box-shadow: 0px 0px 0px 6px @dropdown-shadow;
-      width: 256px;
+      min-width: 256px;
 
       &:after {
         border: solid transparent;
@@ -52,37 +49,6 @@
         top: -11px;
         width: 0;
       }
-
-      a {
-        .glyphicon, .fa {
-          display: inline-block;
-          width: 16px;
-
-          text-align: center;
-        }
-
-        .badge {
-          border-radius: @border-radius-small;
-          position: relative;
-          top: 1px;
-        }
-
-        &:link, &:visited {
-          .badge {
-            background-color: @brand-danger;
-
-            color: @dropdown-bg;
-          }
-        }
-
-        &:hover, &:active {
-          .badge {
-            background-color: @dropdown-bg;
-
-            color: @brand-danger;
-          }
-        }
-      }
     }
   }
 }

+ 75 - 0
uiframework/misago/css/misago/dropdowns.less

@@ -0,0 +1,75 @@
+//
+// Dropdown menus
+// --------------------------------------------------
+
+/* On all displays*/
+.dropdown-menu {
+  li {
+    /* Buttons */
+    button {
+      background: none;
+      border: none;
+      padding: 3px 20px;
+      width: 100%;
+
+      color: @dropdown-link-color;
+      text-align: left;
+
+      &:hover {
+        background-color: @dropdown-link-hover-bg;
+
+        color: @dropdown-link-hover-color;
+      }
+
+      &:active, &:focus {
+        background-color: @dropdown-link-active-bg;
+
+        color: @dropdown-link-active-color;
+      }
+    }
+
+    /* Icons */
+    a, button {
+      .glyphicon, .fa {
+        display: inline-block;
+        width: 16px;
+
+        text-align: center;
+      }
+    }
+
+    /* Badges */
+    a, button {
+      .badge {
+        border-radius: @border-radius-small;
+        position: relative;
+        top: 1px;
+      }
+
+      &:link, &:visited {
+        .badge {
+          background-color: @brand-danger;
+
+          color: @dropdown-bg;
+        }
+      }
+
+      &:hover, &:active {
+        .badge {
+          background-color: @dropdown-bg;
+
+          color: @brand-danger;
+        }
+      }
+    }
+  }
+}
+
+/* On big displays */
+@media (min-width: @screen-sm-min) {
+  .dropdown-menu {
+    border: none;
+    border-radius: @border-radius-base !important;
+    box-shadow: 0px 0px 0px 6px @dropdown-shadow;
+  }
+}

+ 3 - 0
uiframework/misago/css/misago/misago.less

@@ -1,3 +1,6 @@
+// Components
+@import "dropdowns.less";
+
 // Layout elements
 @import "navbar.less";
 @import "footer.less";

+ 68 - 25
uiframework/misago/css/style.css

@@ -5773,6 +5773,73 @@ button.close {
     display: none !important;
   }
 }
+/* On all displays*/
+.dropdown-menu li {
+  /* Buttons */
+  /* Icons */
+  /* Badges */
+}
+.dropdown-menu li button {
+  background: none;
+  border: none;
+  padding: 3px 20px;
+  width: 100%;
+  color: #3e5771;
+  text-align: left;
+}
+.dropdown-menu li button:hover {
+  color: #3498db;
+}
+.dropdown-menu li button:active,
+.dropdown-menu li button:focus {
+  background-color: #34495e;
+  color: #fcfcfc;
+}
+.dropdown-menu li a .glyphicon,
+.dropdown-menu li button .glyphicon,
+.dropdown-menu li a .fa,
+.dropdown-menu li button .fa {
+  display: inline-block;
+  width: 16px;
+  text-align: center;
+}
+.dropdown-menu li a .badge,
+.dropdown-menu li button .badge {
+  border-radius: 3px;
+  position: relative;
+  top: 1px;
+}
+.dropdown-menu li a:link .badge,
+.dropdown-menu li button:link .badge,
+.dropdown-menu li a:visited .badge,
+.dropdown-menu li button:visited .badge {
+  background-color: #d9534f;
+  color: #ffffff;
+}
+.dropdown-menu li a:hover .badge,
+.dropdown-menu li button:hover .badge,
+.dropdown-menu li a:active .badge,
+.dropdown-menu li button:active .badge {
+  background-color: #ffffff;
+  color: #d9534f;
+}
+/* On big displays */
+@media (min-width: 768px) {
+  .dropdown-menu {
+    border: none;
+    border-radius: 4px !important;
+    box-shadow: 0px 0px 0px 6px rgba(51, 51, 51, 0.5);
+  }
+  .dropdown-menu li button:hover {
+    background-color: #3498db;
+    color: #fcfcfc;
+  }
+  .dropdown-menu li button:active,
+  .dropdown-menu li button:focus {
+    background-color: #34495e;
+    color: #fcfcfc;
+  }
+}
 /* Navbar Guest Buttons */
 .navbar-default .btn-sign-in,
 .navbar-default .btn-register {
@@ -5950,10 +6017,7 @@ button.close {
     margin-left: 8px;
   }
   .navbar-nav-user .dropdown-menu {
-    border: none;
-    border-radius: 4px !important;
-    box-shadow: 0px 0px 0px 6px rgba(51, 51, 51, 0.5);
-    width: 256px;
+    min-width: 256px;
   }
   .navbar-nav-user .dropdown-menu:after {
     border: solid transparent;
@@ -5967,27 +6031,6 @@ button.close {
     top: -11px;
     width: 0;
   }
-  .navbar-nav-user .dropdown-menu a .glyphicon,
-  .navbar-nav-user .dropdown-menu a .fa {
-    display: inline-block;
-    width: 16px;
-    text-align: center;
-  }
-  .navbar-nav-user .dropdown-menu a .badge {
-    border-radius: 3px;
-    position: relative;
-    top: 1px;
-  }
-  .navbar-nav-user .dropdown-menu a:link .badge,
-  .navbar-nav-user .dropdown-menu a:visited .badge {
-    background-color: #d9534f;
-    color: #ffffff;
-  }
-  .navbar-nav-user .dropdown-menu a:hover .badge,
-  .navbar-nav-user .dropdown-menu a:active .badge {
-    background-color: #ffffff;
-    color: #d9534f;
-  }
 }
 .jumbotron {
   margin-top: -20px;

+ 6 - 4
uiframework/navbar.html

@@ -76,10 +76,12 @@
                 </li>
                 <li class="divider"></li>
                 <li>
-                  <a href="#">
-                    <span class="fa fa-plane"></span>
-                    One more separated link
-                  </a>
+                  <form>
+                    <button>
+                      <span class="fa fa-power-off"></span>
+                      One more separated link
+                    </button>
+                  </form>
                 </li>
               </ul>
             </li>