Просмотр исходного кода

tweaked buttons a little, join/sign in button in navbar

Rafał Pitoń 10 лет назад
Родитель
Сommit
5082be1957

+ 4 - 0
misago/emberapp/app/styles/misago/buttons.less

@@ -131,6 +131,10 @@
 .btn.btn-raised {
   &.btn-default {
     .btn-raised-style(@btn-default-raised-color, @btn-default-raised-bg);
+
+    &:disabled {
+      background-color: darken(@btn-default-raised-bg, 10%);
+    }
   }
 
   &.btn-primary {

+ 40 - 3
misago/emberapp/app/styles/misago/navbar.less

@@ -100,7 +100,6 @@
 
   .btn-start-thread {
     background: @navbar-start-thread-bg;
-    border-color: transparent;
     height: @navbar-height;
     padding: (@navbar-height - @navbar-icon-size) / 2;
     padding-bottom: 0px;
@@ -116,14 +115,12 @@
 
     &:hover, &:focus {
       background: @navbar-start-thread-hover-bg;
-      border-color: transparent;
 
       color: @navbar-start-thread-hover-color;
     }
 
     &:active {
       background: @navbar-start-thread-active-bg;
-      border-color: transparent;
 
       color: @navbar-start-thread-active-color;
     }
@@ -164,6 +161,42 @@
 .navbar-primary {
   .navbar-guest-nav {
     float: right;
+
+    .btn-sign-in {
+      background: @navbar-sign-in-bg;
+
+      color: @navbar-sign-in-color;
+
+      &:hover, &:focus {
+        background: @navbar-sign-in-hover-bg;
+
+        color: @navbar-sign-in-hover-color;
+      }
+
+      &:active {
+        background: @navbar-sign-in-active-bg;
+
+        color: @navbar-sign-in-active-color;
+      }
+    }
+
+    .btn-join {
+      background: @navbar-join-bg;
+
+      color: @navbar-join-color;
+
+      &:hover, &:focus {
+        background: @navbar-join-hover-bg;
+
+        color: @navbar-join-hover-color;
+      }
+
+      &:active {
+        background: @navbar-join-active-bg;
+
+        color: @navbar-join-active-color;
+      }
+    }
   }
 }
 
@@ -179,6 +212,10 @@
     padding-bottom: 11px;
 
     font-size: @navbar-link-size;
+
+    &, &:hover, &:focus, &:active {
+      border-color: transparent;
+    }
   }
 }
 

+ 18 - 3
misago/emberapp/app/styles/misago/variables.less

@@ -122,6 +122,7 @@
 @navbar-compact-link-active-color:         @navbar-default-bg;
 @navbar-compact-link-active-bg:            @site-link-active-color;
 
+// Navbar buttons
 @navbar-start-thread-color:                fadeOut(@brand-success, 40%);
 @navbar-start-thread-bg:                   transparent;
 @navbar-start-thread-hover-color:          @brand-success;
@@ -129,6 +130,20 @@
 @navbar-start-thread-active-color:         @brand-success;
 @navbar-start-thread-active-bg:            fadeOut(@brand-success, 80%);
 
+@navbar-sign-in-color:                     @site-link-color;
+@navbar-sign-in-bg:                        transparent;
+@navbar-sign-in-hover-color:               @site-link-hover-color;
+@navbar-sign-in-hover-bg:                  transparent;
+@navbar-sign-in-active-color:              @text-color;
+@navbar-sign-in-active-bg:                 #eee;;
+
+@navbar-join-color:                        fadeOut(@brand-accent, 20%);
+@navbar-join-bg:                           transparent;
+@navbar-join-hover-color:                  @brand-accent;
+@navbar-join-hover-bg:                     transparent;
+@navbar-join-active-color:                 @brand-accent;
+@navbar-join-active-bg:                    fadeOut(@brand-accent, 80%);
+
 // Navbar brand label
 @navbar-default-brand-color:               @headings-color;
 @navbar-default-brand-hover-color:         @headings-color;
@@ -230,8 +245,8 @@
 @btn-link-disabled-color:        @gray-light;
 
 //** Flat buttons
-@btn-default-color:              #78909c;
-@btn-default-bg:                 #90a4ae;
+@btn-default-color:              @gray-dark;
+@btn-default-bg:                 @gray-light;
 
 @btn-primary-color:              @brand-primary;
 @btn-primary-bg:                 #64b5f6;
@@ -247,7 +262,7 @@
 
 
 //** Raised buttons
-@btn-default-raised-color:              #95a5a6;
+@btn-default-raised-color:              @gray-dark;
 @btn-default-raised-bg:                 #fff;
 
 @btn-primary-raised-color:              #fff;

+ 2 - 2
misago/emberapp/app/templates/components/forum-navbar.hbs

@@ -68,11 +68,11 @@
     </ul>
     {{else}}
     <div class="navbar-guest-nav hidden-xs hidden-sm">
-      {{#show-modal-button modal="login-modal" class="btn btn-default navbar-btn"}}
+      {{#show-modal-button modal="login-modal" class="btn btn-sign-in navbar-btn"}}
         {{gettext "Sign in"}}
       {{/show-modal-button}}
 
-      {{#register-button class="btn btn-success navbar-btn"}}
+      {{#register-button class="btn btn-join navbar-btn"}}
         {{gettext "Join"}}
       {{/register-button}}
     </div>