Unverified Commit 1c81c1e3 authored by Benjamin Neff's avatar Benjamin Neff Committed by Dennis Schubert
Browse files

Refactor colors for better themeability

parent 260cc233

app/assets/stylesheets/bootstrap-variables.scss

+4 −3
Original line number Diff line number Diff line
@@ -187,9 +187,9 @@ $btn-success-color: #333 !default; 
// $input-bg-disabled:              $gray-lighter



//** Text color for `<input>`s

// $input-color:                    $gray

$input-color: $text-dark-grey !default;

//** `<input>` border color

// $input-border:                   #ccc

$input-border: $border-grey !default;



// TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4

//** Default `.form-control` border radius
@@ -202,6 +202,7 @@ $btn-success-color: #333 !default; 


//** Border color for inputs on focus

// $input-border-focus:             #66afe9

$input-border-focus: $input-border !default;



//** Placeholder text color

// $input-color-placeholder:        #999
@@ -668,7 +669,7 @@ $navbar-collapse-max-height: 480px; 
//

//##

//** Background color on `.list-group-item`

$list-group-bg: $white;

$list-group-bg: $white !default;

//** `.list-group-item` border color

$list-group-border: transparent;

//** List group border radius

app/assets/stylesheets/color-variables.scss

+16 −15
Original line number Diff line number Diff line
@@ -3,31 +3,32 @@ $black: #000; 


$text-grey: #999;

$text-dark-grey: #666;

$text: #333;

$text-color-pale: $text-grey !default;

$text-color-active: $black !default;



$background-white: $white;

$background-grey: #eee;

$background-blue: #e7f2f7;

$background-grey: #eee !default;

$background-blue: #e7f2f7 !default;



$grey: #2b2b2b;

$medium-gray: #ccc;

$light-grey: #ddd;



$border-grey: $light-grey;

$border-medium-grey: $medium-gray;

$border-dark-grey: $text-grey;

$border-medium-grey: #ccc;

$border-grey: $light-grey !default;

$border-medium-grey: $medium-gray !default;

$border-dark-grey: $text-grey !default;



$link-grey: #777;

$link-disabled-grey: $text-grey;



$green: #8ede3d;

$icon-color: $black !default;



$green: #8ede3d !default;

$light-green: lighten($green, 20%);

$red: #a80000;

$blue: #3f8fba;

$red: #a80000 !default;

$blue: #3f8fba !default;



$main-background: #f0f0f0 !default;

$sidebars-background: $background-white !default;

$left-navbar-drawer-background: darken($sidebars-background, 6%);

$main-background: darken($white, 6%) !default;

$framed-background: $white !default;

$left-navbar-drawer-background: darken($white, 6%) !default;

$hovercard-background: $white !default;



$card-shadow: 0 1px 2px 0 rgba(0, 0, 0, .16), 0 2px 10px 0 rgba(0, 0, 0, .12) !default;

app/assets/stylesheets/color_themes/_color_theme_override_origwhite.scss

+0 −6
Original line number Diff line number Diff line
@@ -17,10 +17,4 @@ body { 
  .left-navbar {

    border-right: 1px solid $border-grey;

  }



  .right-sidebar-fixed-background,

  .right-sidebar-fixed-background,

  .rightbar {

    border-left: 1px solid $sidebars-background;

  }

}

app/assets/stylesheets/color_themes/original_white/_style.scss

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ $background: #fff; 


// Variables

$main-background: $background;

$sidebars-background: $background;

$card-shadow: none;



@import 'color_themes/color_theme_override_origwhite';

app/assets/stylesheets/contacts.scss

+6 −6
Original line number Diff line number Diff line
@@ -38,13 +38,13 @@ 
        margin-right: 25px;

      }

      #chat_privilege_toggle > .enabled {

        color: #000;

        color: $text-color-active;

      }

      .contacts-header-icon {

        font-size: 24.5px;

        line-height: 40px;

        color: lighten($black,75%);

        &:hover { color: $black; }

        color: $text-color-pale;

        &:hover { color: $text-color; }

      }

      #suggest_member.btn { margin-top: 8px; }

    }
@@ -56,14 +56,14 @@ 
        font-size: 20px;

        line-height: 50px;

        margin: 0 10px;

        color: lighten($black,75%);

        &:hover { color: $black; }

        color: $text-color-pale;

        &:hover { color: $text-color; }

      }

      &.in_aspect {

        border-left: 3px solid $brand-success;

        background-color: lighten($brand-success,35%);

      }

      &:not(.in_aspect) { border-left: 3px solid $white; }

      &:not(.in_aspect) { border-left: 3px solid $framed-background; }

    }



    .no_contacts {