diff --git a/app/javascript/images/chinwag-social-black.svg b/app/javascript/images/chinwag-social-black.svg
new file mode 100644
index 000000000..fe6b24561
--- /dev/null
+++ b/app/javascript/images/chinwag-social-black.svg
@@ -0,0 +1,119 @@
+
+
+
+
diff --git a/app/javascript/images/cigarmanwoman.svg b/app/javascript/images/cigarmanwoman.svg
new file mode 100644
index 000000000..dfe44c0f4
--- /dev/null
+++ b/app/javascript/images/cigarmanwoman.svg
@@ -0,0 +1,98 @@
+
+
+
diff --git a/app/javascript/mastodon/features/compose/index.js b/app/javascript/mastodon/features/compose/index.js
index d5cd854db..ab7be1930 100644
--- a/app/javascript/mastodon/features/compose/index.js
+++ b/app/javascript/mastodon/features/compose/index.js
@@ -12,7 +12,7 @@ import Motion from '../ui/util/optional_motion';
import spring from 'react-motion/lib/spring';
import SearchResultsContainer from './containers/search_results_container';
import { changeComposing } from '../../actions/compose';
-import elephantUIPlane from '../../../images/elephant_ui_plane.svg';
+import elephantUIPlane from '../../../images/cigarmanwoman.svg';
const messages = defineMessages({
start: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
diff --git a/app/javascript/styles/chinwag_light/overrides.scss b/app/javascript/styles/chinwag_light/overrides.scss
index d145b1a5b..1b63c8d1d 100644
--- a/app/javascript/styles/chinwag_light/overrides.scss
+++ b/app/javascript/styles/chinwag_light/overrides.scss
@@ -18,6 +18,10 @@
}
}
+.status__content p {
+ color: $black;
+}
+
.icon-button.overlayed {
background: rgba($white, .6);
@@ -76,11 +80,12 @@ button.icon-button.disabled i.fa-retweet {
}
.drawer__inner__mastodon {
- background: darken($classic-base-color, 15%) url('data:image/svg+xml;utf8,') no-repeat bottom / 100% auto;
+ background: darken($classic-base-color, 15%);
}
.compose-form .autosuggest-textarea__textarea,
-.compose-form .spoiler-input__input {
+.compose-form .spoiler-input__input,
+.compose-form .compose-form__buttons-wrapper .character-counter__wrapper .character-counter {
color: $black;
}
@@ -150,12 +155,59 @@ button.icon-button.disabled i.fa-retweet {
background: $classic-primary-color;
}
-.activity-stream .status.light .display-name span {
+.activity-stream .detailed-status.light .detailed-status__display-name .display-name strong {
color: $ui-highlight-color;
}
.activity-stream-tabs a.active,
-.activity-stream .status.light .status__content,
-.activity-stream .status.light .display-name strong {
- color: $black;
+.activity-stream .status.light .status__content {
+ color: $ui-highlight-color;
+}
+
+.empty-column-indicator,
+.error-column {
+ color: $classic-primary-color;
+}
+
+// Dropdown Menu
+.dropdown-menu__separator {
+ border-bottom: 1px solid lighten($ui-primary-color, 20%);
+}
+
+.dropdown-menu {
+ background: $ui-base-color;
+}
+
+.dropdown-menu__item {
+ a {
+ background: $ui-base-color;
+ color: $ui-primary-color;
+
+ &:focus,
+ &:hover,
+ &:active {
+ background: $ui-highlight-color;
+ color: $ui-primary-color;
+ }
+ }
+}
+
+.dropdown-menu__arrow {
+ &.left {
+ border-left-color: $ui-base-color;
+ }
+ &.top {
+ border-top-color: $ui-base-color;
+ }
+ &.bottom {
+ border-bottom-color: $ui-base-color;
+ }
+ &.right {
+ border-right-color: $ui-base-color;
+ }
+}
+
+// Landing Page
+.simple_form .input-with-append .append {
+ color: $ui-primary-color;
}
diff --git a/app/javascript/styles/chinwag_light/variables.scss b/app/javascript/styles/chinwag_light/variables.scss
index 00fbc5911..4c02a20b7 100644
--- a/app/javascript/styles/chinwag_light/variables.scss
+++ b/app/javascript/styles/chinwag_light/variables.scss
@@ -23,7 +23,7 @@ $error-value-color: $error-red !default;
// Tell UI to use selected colors
$ui-base-color: $classic-base-color !default; // Darkest
-$ui-base-lighter-color: darken($ui-base-color, 36%) !default; // Lighter darkest
+$ui-base-lighter-color: darken($ui-base-color, 36%) !default; // Lighter darkest
$ui-primary-color: $classic-primary-color !default; // Lighter
$ui-secondary-color: $classic-secondary-color !default; // Lightest
$ui-highlight-color: $classic-highlight-color !default; // Vibrant
diff --git a/app/javascript/styles/mastodon/modal.scss b/app/javascript/styles/mastodon/modal.scss
index f9fad732e..ef4913579 100644
--- a/app/javascript/styles/mastodon/modal.scss
+++ b/app/javascript/styles/mastodon/modal.scss
@@ -15,6 +15,6 @@
> * {
flex: 1;
max-height: 235px;
- background: url('../images/elephant_ui_plane.svg') no-repeat left bottom / contain;
+ background: url('../images/cigarmanwoman.svg') no-repeat left bottom / contain;
}
}
diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml
index 85e5442af..cda239191 100644
--- a/app/views/about/show.html.haml
+++ b/app/views/about/show.html.haml
@@ -13,14 +13,14 @@
.column-0
.brand
= link_to root_url do
- = image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon'
+ = image_tag asset_pack_path('chinwag-social-black.svg'), alt: 'Chinwag'
- if Setting.timeline_preview
.column-1
.landing-page__forms
.brand
= link_to root_url do
- = image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon'
+ = image_tag asset_pack_path('chinwag-social-black.svg'), alt: 'Chinwag'
= render 'forms'
@@ -29,7 +29,7 @@
.landing-page__forms
.brand
= link_to root_url do
- = image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon'
+ = image_tag asset_pack_path('chinwag-social-black.svg'), alt: 'Chinwag'
= render 'forms'
@@ -63,7 +63,7 @@
%span= t 'about.status_count_after'
.row__mascot
.landing-page__mascot
- = image_tag asset_pack_path('elephant_ui_plane.svg')
+ = image_tag asset_pack_path('cigarmanwoman.svg')
- else
.column-2.non-preview
@@ -95,7 +95,7 @@
%span= t 'about.status_count_after'
.row__mascot
.landing-page__mascot
- = image_tag asset_pack_path('elephant_ui_plane.svg')
+ = image_tag asset_pack_path('cigarmanwoman.svg')
- if Setting.timeline_preview
.column-3