Chinwag Light update and new placeholder image assets
This commit is contained in:
parent
ff2e0a1d1e
commit
183915006e
7 changed files with 283 additions and 14 deletions
119
app/javascript/images/chinwag-social-black.svg
Normal file
119
app/javascript/images/chinwag-social-black.svg
Normal file
|
|
@ -0,0 +1,119 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
width="121.30551mm"
|
||||
height="10.202333mm"
|
||||
viewBox="0 0 121.30551 10.202333"
|
||||
version="1.1"
|
||||
id="svg4581"
|
||||
inkscape:version="0.92.3 (2405546, 2018-03-11)"
|
||||
sodipodi:docname="chinwag-social-black.svg">
|
||||
<defs
|
||||
id="defs4575" />
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="1.979899"
|
||||
inkscape:cx="239.68542"
|
||||
inkscape:cy="-21.252767"
|
||||
inkscape:document-units="mm"
|
||||
inkscape:current-layer="layer1"
|
||||
showgrid="false"
|
||||
fit-margin-top="0"
|
||||
fit-margin-left="0"
|
||||
fit-margin-right="0"
|
||||
fit-margin-bottom="0"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="1017"
|
||||
inkscape:window-x="-8"
|
||||
inkscape:window-y="-8"
|
||||
inkscape:window-maximized="1" />
|
||||
<metadata
|
||||
id="metadata4578">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title />
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
inkscape:label="Layer 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"
|
||||
transform="translate(-39.888911,-24.291694)">
|
||||
<g
|
||||
aria-label="CHINWAG SOCIAL"
|
||||
transform="matrix(0.26458333,0,0,0.26458333,13.027047,-26.216854)"
|
||||
style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
|
||||
id="flowRoot3729">
|
||||
<path
|
||||
d="m 101.52516,209.83179 q 0,-3.41334 1.17333,-6.77334 1.22667,-3.41333 3.52,-6.08 2.29333,-2.66666 5.65333,-4.32 3.36,-1.70666 7.62667,-1.70666 5.06667,0 8.64,2.29333 3.62667,2.29333 5.33333,5.97333 l -2.93333,1.81334 q -0.90667,-1.86667 -2.24,-3.14667 -1.28,-1.28 -2.77333,-2.08 -1.49334,-0.8 -3.09334,-1.12 -1.6,-0.37333 -3.14666,-0.37333 -3.41334,0 -6.02667,1.38666 -2.61333,1.38667 -4.42667,3.62667 -1.76,2.24 -2.66666,5.06667 -0.90667,2.77333 -0.90667,5.65333 0,3.14667 1.06667,6.02667 1.12,2.88 2.98666,5.12 1.92,2.18666 4.48,3.52 2.61334,1.28 5.65334,1.28 1.6,0 3.25333,-0.37334 1.70667,-0.42666 3.25333,-1.28 1.6,-0.90666 2.93334,-2.18666 1.33333,-1.33334 2.24,-3.2 l 3.09333,1.6 q -0.90667,2.13333 -2.56,3.78666 -1.65333,1.6 -3.68,2.72 -2.02667,1.12 -4.32,1.70667 -2.24,0.58667 -4.42667,0.58667 -3.89333,0 -7.14666,-1.70667 -3.25334,-1.70667 -5.6,-4.42667 -2.34667,-2.77333 -3.68,-6.24 -1.28,-3.52 -1.28,-7.14666 z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:53.33333588px;font-family:Raleway;-inkscape-font-specification:Raleway"
|
||||
id="path4649" />
|
||||
<path
|
||||
d="m 170.46099,191.16512 v 37.86667 h -3.68 v -17.70667 h -22.45333 v 17.70667 h -3.73334 v -37.86667 h 3.73334 v 16.85333 h 22.45333 v -16.85333 z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:53.33333588px;font-family:Raleway;-inkscape-font-specification:Raleway"
|
||||
id="path4651" />
|
||||
<path
|
||||
d="m 179.96932,229.03179 v -37.86667 h 3.73334 v 37.86667 z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:53.33333588px;font-family:Raleway;-inkscape-font-specification:Raleway"
|
||||
id="path4653" />
|
||||
<path
|
||||
d="m 196.93182,198.09845 v 30.93334 h -3.73333 v -37.86667 h 2.88 l 25.06667,31.52 v -31.46667 h 3.73333 v 37.81334 h -3.25333 z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:53.33333588px;font-family:Raleway;-inkscape-font-specification:Raleway"
|
||||
id="path4655" />
|
||||
<path
|
||||
d="m 248.58432,191.43179 h 3.52 l 5.33334,13.44 5.38666,-13.44 h 3.57334 l -6.61334,16.16 7.25334,17.12 13.70667,-33.54667 h 4.05333 l -16.05334,37.86667 h -3.30666 l -7.94667,-18.72 -8,18.72 h -3.25333 l -16,-37.86667 h 4 l 13.76,33.54667 7.2,-17.12 z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:53.33333588px;font-family:Raleway;-inkscape-font-specification:Raleway"
|
||||
id="path4657" />
|
||||
<path
|
||||
d="m 298.68183,191.16512 h 3.14667 l 15.73333,37.86667 h -3.94667 l -4.90666,-11.84 h -17.01334 l -4.85333,11.84 h -4 z m 9.17333,23.09333 -7.62666,-18.72 -7.73334,18.72 z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:53.33333588px;font-family:Raleway;-inkscape-font-specification:Raleway"
|
||||
id="path4659" />
|
||||
<path
|
||||
d="m 348.996,223.48512 q -5.28,5.81333 -12.16,5.81333 -3.84,0 -7.09334,-1.65333 -3.2,-1.65333 -5.6,-4.37333 -2.34667,-2.72 -3.68,-6.13334 -1.33333,-3.46666 -1.33333,-7.09333 0,-3.78667 1.28,-7.25333 1.33333,-3.46667 3.68,-6.08 2.34667,-2.66667 5.54667,-4.21334 3.2,-1.6 6.98666,-1.6 2.77334,0 5.06667,0.64 2.29333,0.58667 4.05333,1.70667 1.81334,1.06667 3.09334,2.61333 1.33333,1.49334 2.24,3.30667 l -2.88,1.92 q -1.86667,-3.52 -4.85334,-5.17333 -2.98666,-1.65334 -6.77333,-1.65334 -3.14667,0 -5.70667,1.33334 -2.50666,1.33333 -4.32,3.57333 -1.76,2.18667 -2.72,5.06667 -0.96,2.82666 -0.96,5.86666 0,3.2 1.06667,6.08 1.12,2.88 3.04,5.06667 1.92,2.13333 4.48,3.41333 2.61333,1.28 5.65333,1.28 3.25334,0 6.18667,-1.49333 2.98667,-1.54667 5.70667,-4.85333 v -6.29334 h -8.42667 v -2.88 h 11.57333 v 18.61334 H 348.996 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:53.33333588px;font-family:Raleway;-inkscape-font-specification:Raleway"
|
||||
id="path4661" />
|
||||
<path
|
||||
d="m 395.27101,201.08512 q -0.37333,-0.37333 -1.38667,-1.01333 -0.96,-0.64 -2.4,-1.22667 -1.38666,-0.64 -3.04,-1.06667 -1.65333,-0.42666 -3.36,-0.42666 -3.04,0 -4.53333,1.12 -1.49333,1.12 -1.49333,3.14666 0,1.17334 0.53333,1.97334 0.58667,0.74666 1.65333,1.33333 1.06667,0.58667 2.66667,1.06667 1.65333,0.48 3.78667,1.01333 2.77333,0.74667 5.01333,1.6 2.29333,0.85333 3.84,2.13333 1.6,1.28 2.45333,3.09334 0.85334,1.76 0.85334,4.37333 0,3.04 -1.17334,5.22667 -1.12,2.13333 -3.09333,3.46666 -1.92,1.33334 -4.48,1.97334 -2.50667,0.58666 -5.28,0.58666 -4.26667,0 -8.42667,-1.28 -4.16,-1.28 -7.46666,-3.62666 l 3.25333,-6.34667 q 0.48,0.48 1.70667,1.28 1.28,0.74667 2.98666,1.54667 1.70667,0.74666 3.78667,1.28 2.08,0.53333 4.26667,0.53333 6.08,0 6.08,-3.89333 0,-1.22667 -0.69334,-2.08 -0.69333,-0.85334 -1.97333,-1.49334 -1.28,-0.64 -3.09333,-1.17333 -1.81334,-0.53333 -4.05334,-1.17333 -2.72,-0.74667 -4.74666,-1.6 -1.97334,-0.90667 -3.30667,-2.08 -1.33333,-1.22667 -2.02667,-2.77334 -0.64,-1.6 -0.64,-3.78666 0,-2.88 1.06667,-5.12 1.06667,-2.24 2.93333,-3.73334 1.92,-1.49333 4.42667,-2.24 2.50667,-0.8 5.38667,-0.8 4,0 7.36,1.28 3.36,1.22667 5.86666,2.93334 z"
|
||||
style="font-weight:bold;font-size:53.33333588px;fill:#85c04b;fill-opacity:1"
|
||||
id="path4663" />
|
||||
<path
|
||||
d="m 421.57932,229.29845 q -4.16,0 -7.57333,-1.6 -3.36,-1.65333 -5.81333,-4.32 -2.4,-2.72 -3.73334,-6.18666 -1.33333,-3.46667 -1.33333,-7.09334 0,-3.78666 1.38667,-7.25333 1.44,-3.46667 3.89333,-6.13333 2.50667,-2.66667 5.92,-4.21334 3.41333,-1.6 7.41333,-1.6 4.10667,0 7.46667,1.70667 3.41333,1.65333 5.81333,4.37333 2.4,2.72 3.73334,6.18667 1.33333,3.46667 1.33333,7.04 0,3.78667 -1.38667,7.25333 -1.38666,3.41334 -3.84,6.08 -2.45333,2.61334 -5.86666,4.21334 -3.41334,1.54666 -7.41334,1.54666 z m -10.98666,-19.2 q 0,2.45334 0.74666,4.74667 0.74667,2.29333 2.13334,4.05333 1.44,1.76 3.46666,2.82667 2.08,1.06667 4.69334,1.06667 2.66666,0 4.69333,-1.06667 2.08,-1.12 3.46667,-2.93333 1.44,-1.81334 2.13333,-4.05334 0.74667,-2.29333 0.74667,-4.64 0,-2.45333 -0.8,-4.74666 -0.74667,-2.29334 -2.18667,-4.05334 -1.38667,-1.76 -3.46667,-2.77333 -2.02666,-1.06667 -4.58666,-1.06667 -2.66667,0 -4.74667,1.12 -2.08,1.06667 -3.46667,2.88 -1.38666,1.76 -2.13333,4.05334 -0.69333,2.24 -0.69333,4.58666 z"
|
||||
style="font-weight:bold;font-size:53.33333588px;fill:#85c04b;fill-opacity:1"
|
||||
id="path4665" />
|
||||
<path
|
||||
d="m 443.43849,209.83179 q 0,-3.46667 1.22667,-6.82667 1.28,-3.41333 3.68,-6.08 2.4,-2.66667 5.86666,-4.32 3.46667,-1.65333 7.89334,-1.65333 5.22666,0 9.01333,2.29333 3.84,2.29333 5.70667,5.97333 l -5.65334,3.89334 q -0.74666,-1.6 -1.81333,-2.66667 -1.06667,-1.12 -2.29333,-1.76 -1.22667,-0.64 -2.56,-0.90667 -1.33334,-0.32 -2.61334,-0.32 -2.77333,0 -4.85333,1.12 -2.02667,1.12 -3.41333,2.93334 -1.33334,1.76 -2.02667,4.05333 -0.69333,2.24 -0.69333,4.48 0,2.50667 0.8,4.85333 0.8,2.29334 2.24,4.05334 1.49333,1.76 3.52,2.82666 2.08,1.06667 4.53333,1.06667 1.28,0 2.66667,-0.32 1.38666,-0.32 2.61333,-1.01333 1.28,-0.69334 2.34667,-1.76 1.06666,-1.12 1.70666,-2.66667 l 6.02667,3.46667 q -0.90667,2.13333 -2.61333,3.78666 -1.65334,1.6 -3.78667,2.72 -2.08,1.12 -4.48,1.70667 -2.4,0.58667 -4.69333,0.58667 -4.05334,0 -7.41334,-1.70667 -3.36,-1.70667 -5.81333,-4.42667 -2.4,-2.77333 -3.78667,-6.24 -1.33333,-3.52 -1.33333,-7.14666 z"
|
||||
style="font-weight:bold;font-size:53.33333588px;fill:#85c04b;fill-opacity:1"
|
||||
id="path4667" />
|
||||
<path
|
||||
d="m 482.29432,229.03179 v -37.86667 h 7.36 v 37.86667 z"
|
||||
style="font-weight:bold;font-size:53.33333588px;fill:#85c04b;fill-opacity:1"
|
||||
id="path4669" />
|
||||
<path
|
||||
d="m 508.276,191.16512 h 6.50667 l 14.4,37.86667 h -7.57334 l -3.52,-9.44 h -13.22666 l -3.46667,9.44 h -7.57333 z m 8.48,23.25333 -5.22667,-14.88 -5.44,14.88 z"
|
||||
style="font-weight:bold;font-size:53.33333588px;fill:#85c04b;fill-opacity:1"
|
||||
id="path4671" />
|
||||
<path
|
||||
d="m 533.33601,229.03179 v -37.86667 h 7.36 v 31.41333 h 19.30667 v 6.45334 z"
|
||||
style="font-weight:bold;font-size:53.33333588px;fill:#85c04b;fill-opacity:1"
|
||||
id="path4673" />
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 10 KiB |
98
app/javascript/images/cigarmanwoman.svg
Normal file
98
app/javascript/images/cigarmanwoman.svg
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 46 KiB |
|
|
@ -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' },
|
||||
|
|
|
|||
|
|
@ -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,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="#{hex-color($ui-base-color)}"/></svg>') 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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue