Skip to content

Commit

Permalink
Purge old styles and selectors
Browse files Browse the repository at this point in the history
  • Loading branch information
laCour committed Feb 12, 2017
1 parent 9527113 commit a56b4db
Show file tree
Hide file tree
Showing 37 changed files with 201 additions and 1,434 deletions.
53 changes: 25 additions & 28 deletions scss/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,72 +4,69 @@
@import "helpers/mixins";

@import "layout/base";
@import "layout/sidebar";
@import "layout/monkey-scroll";
@import "layout/sidebar";

@import "modules/loader";

@import "modules/inputs/base";
@import "modules/inputs/chzn";
@import "modules/inputs/filter-select";
@import "modules/inputs/messaging";
@import "modules/inputs/toggle";

@import "modules/menu/base";
@import "modules/menu/team";
@import "modules/menu/file";
@import "modules/menu/popover";
@import "modules/menu/calendar";
@import "modules/menu/autocomplete";
@import "modules/menu/tabcomplete";
@import "modules/menu/flex";
@import "modules/menu/filters";
@import "modules/menu/calendar";
@import "modules/menu/direct-messaging";
@import "modules/menu/filters";
@import "modules/menu/popover";
@import "modules/menu/tabcomplete";
@import "modules/menu/team";

@import "modules/header/base";
@import "modules/header/search";
@import "modules/header/day-divider";
@import "modules/header/banners";
@import "modules/header/day-divider";
@import "modules/header/search";
@import "modules/header/topic-editor";

@import "modules/messaging/base";
@import "modules/messaging/light";
@import "modules/messaging/attachments";
@import "modules/messaging/banners";
@import "modules/messaging/code";
@import "modules/messaging/dense";
@import "modules/messaging/light";
@import "modules/messaging/overlay";
@import "modules/messaging/banners";
@import "modules/messaging/attachments";
@import "modules/messaging/threads";
@import "modules/messaging/quotes";
@import "modules/messaging/code";
@import "modules/messaging/threads";
@import "modules/messaging/unreads";

@import "modules/flexpane/base";
@import "modules/flexpane/channel";
@import "modules/flexpane/threads";
@import "modules/flexpane/search";
@import "modules/flexpane/files";
@import "modules/flexpane/groups";
@import "modules/flexpane/mentions";
@import "modules/flexpane/reactions";
@import "modules/flexpane/files";
@import "modules/flexpane/search";
@import "modules/flexpane/team";
@import "modules/flexpane/threads";
@import "modules/flexpane/whats-new";

@import "modules/emojis/base";
@import "modules/emojis/reactions";

@import "modules/modals/base";
@import "modules/modals/call";
@import "modules/modals/channel";
@import "modules/modals/channels";
@import "modules/modals/direct-messages";
@import "modules/modals/file";
@import "modules/modals/profile";
@import "modules/modals/preferences";
@import "modules/modals/invite";
@import "modules/modals/omnibox";
@import "modules/modals/share";
@import "modules/modals/quick-search";
@import "modules/modals/call";
@import "modules/modals/help";
@import "modules/modals/invite";
@import "modules/modals/keyboard-shortcuts";
@import "modules/modals/preferences";
@import "modules/modals/profile";
@import "modules/modals/quick-search";
@import "modules/modals/share";

@import "modules/tooltips/base";
@import "modules/tooltips/coachmarks";
Expand All @@ -83,8 +80,8 @@
@import "pages/oauth";
@import "pages/pricing";
@import "pages/spaces";
@import "pages/website";
@import "pages/status";
@import "pages/split";
@import "pages/status";
@import "pages/website";

}
11 changes: 8 additions & 3 deletions scss/modules/_color-overrides.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,31 @@
.dull_grey,
.flat_grey,
.blue_link,
.slate_blue,
.charcoal_grey,
.ts_tip_tip .subtle_silver {
color: $base-font-color !important;
}

.greigh,
.sky_blue,
.severe_grey,
.havana_blue,
.burnt_violet,
.plastic_grey,
.cloud_silver,
.subtle_silver,
.indifferent_grey,
.old_petunia_grey,
.cloud_silver {
.old_petunia_grey {
color: $color-highlight !important;
}

.clear_blue {
color: $base-link-color !important;
}

.candy_red_bg {
.candy_red_bg,
.mustard_yellow {
background-color: $color-red !important;
}

Expand Down
10 changes: 0 additions & 10 deletions scss/modules/_hacks.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,3 @@
-webkit-filter: brightness(0.6) contrast(3) invert(1) sepia(0.5);
filter: brightness(0.6) contrast(3) invert(1) sepia(0.5);
}

.para_menu .options a span,
.para_menu a.trigger.pilcrow.active,
.para_menu a.trigger.pilcrow:hover,
.textstyle_menu .buttons a span,
.textstyle_menu.style a span {
-moz-filter: brightness(10);
-webkit-filter: brightness(10);
filter: brightness(10);
}
4 changes: 0 additions & 4 deletions scss/modules/_loader.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
}
}

#self_help_link_div {
right: 110px !important;
}

#loading_welcome {
background-image: none;
}
Expand Down
4 changes: 0 additions & 4 deletions scss/modules/emojis/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
background: rgba($color-base, 0.95);
}

#emoji_div_default_rxns {
border-bottom: 1px solid $color-shade-dark;
}

#emoji_preview_text {
background: $color-shade-darkest;
color: $base-font-color;
Expand Down
4 changes: 0 additions & 4 deletions scss/modules/flexpane/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
#flex_contents {
background: $color-base;

.monkey_scroll_hider {
background: $color-base;
}

.heading {
background: lighten($color-shade-darkest, 10%);
color: $base-link-color;
Expand Down
38 changes: 16 additions & 22 deletions scss/modules/flexpane/_channel.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@
}
}

&.feature_channel_details {
.channel_page_section {
border-top: 1px solid $color-shade-dark !important;
}
}

hr {
border-top-color: $color-shade-dark;
}
Expand Down Expand Up @@ -61,22 +55,6 @@
}
}

.channel_page_member_row {
color: $base-font-color;

a {
color: $base-link-color;
}

&.away {
color: $base-font-color;

a {
color: $base-link-color;
}
}
}

.pinned_item:hover {
border-color: $color-shade-light;
}
Expand All @@ -92,6 +70,22 @@
}
}

.channel_page_member_row {
color: $base-font-color;

a {
color: $base-link-color;
}

&.away {
color: $base-font-color;

a {
color: $base-link-color;
}
}
}

.pinned_item {
color: $base-font-color;

Expand Down
12 changes: 0 additions & 12 deletions scss/modules/flexpane/_files.scss
Original file line number Diff line number Diff line change
Expand Up @@ -263,18 +263,6 @@ html.no_touch a.filetype_button_web:hover {
}
}

.file_page_user {
color: $base-font-color;

.member {
color: $base-font-color !important;
}

.date {
color: $color-highlight;
}
}

.file_page_meta {
color: $color-highlight;
}
Expand Down
71 changes: 1 addition & 70 deletions scss/modules/flexpane/_search.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,73 +26,6 @@ span.match {
padding: 3px;
}

#search_widget {
background: padding-box $color-shade-darkest;
box-shadow: 0 1px 3px $color-shadow-dark;
color: $base-font-color;

.results_block {
background: $color-shade-dark;
box-shadow: 0 1px 1px $color-shadow-light;
}

.results_heading {
background: $color-shade-darkest;
color: $base-font-color;
}

a.results_heading:hover {
background: $color-base;
}

.search_widget_item {
a {
color: $base-link-color;
}

&:hover a {
color: $base-link-color-active;
}

.result_meta a {
color: $color-highlight;

&:hover {
color: $base-font-color;
}
}
}
}

.search_widget_item {
border-top: 1px solid $color-shade-light;
color: $base-font-color;

&:hover {
background: $color-shade-light;
}

.result_meta {
color: $base-font-color;
}
}

#search_options {
background: $color-base;
border-top: 1px solid $color-shade-dark;
color: $base-font-color;
}

#advanced_options_toggle:hover {
color: $base-link-color-active;
}

#advanced_options {
.active .arrow_down {
color: $base-link-color;
}
}

#search_filters {
a {
background: $color-base;
Expand Down Expand Up @@ -216,9 +149,7 @@ span.match {
}
}

.extract_expand_icons,
.experiment_search_limit_extracts .extract_expand_icons,
.search_result_with_extract:hover .extract_expand_icons {
.extract_expand_icons {
color: $base-link-color;
}

Expand Down
14 changes: 5 additions & 9 deletions scss/modules/flexpane/_team.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#member_preview_scroller a:not(.member_name),
.team_list_item a:not(.member_name) {
#member_preview_scroller a:not(.member_name):not(.current_status_preset_option),
.team_list_item a:not(.member_name):not(.current_status_preset_option) {
color: $base-link-color;
}

#member_preview_scroller a:not(.member_name):hover {
color: $base-link-color-active;
&:hover {
color: $base-link-color-active;
}
}

#member_preview_scroller,
Expand Down Expand Up @@ -120,10 +120,6 @@
border-top: 1px solid $color-shade-light;
color: $base-link-color;

a:not(.member_name):hover {
color: $base-link-color-active;
}

.member_name {
color: $base-font-color;
}
Expand Down
Loading

0 comments on commit a56b4db

Please sign in to comment.