Tweak colours

pull/53/head
Uku Taht 7 years ago
parent 2ee5646a7c
commit 9b9160ae86

@ -54,7 +54,7 @@ export default class Conversions extends React.Component {
return (
<div className="w-full bg-white shadow-xl rounded p-4">
<h3 className="font-bold">Goal Conversions</h3>
<div className="flex items-center mt-3 mb-2 justify-between text-gray-600 text-xs font-bold tracking-wide">
<div className="flex items-center mt-3 mb-2 justify-between text-gray-500 text-xs font-bold tracking-wide">
<span>Goal</span>
<span>Conversions</span>
</div>

@ -27,7 +27,7 @@ export default class CurrentVisitors extends React.Component {
render() {
if (this.state.currentVisitors !== null) {
return (
<div className="text-sm font-bold text-gray-600 mt-1">
<div className="text-sm font-bold text-gray-500 mt-1">
<svg className="w-2 mr-2 fill-current text-green-500 inline" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
<circle cx="8" cy="8" r="8"/>
</svg>

@ -76,7 +76,7 @@ class ScreenSizes extends React.Component {
if (this.state.sizes && this.state.sizes.length > 0) {
return (
<React.Fragment>
<div className="flex items-center mt-3 mb-2 justify-between text-gray-600 text-xs font-bold tracking-wide">
<div className="flex items-center mt-3 mb-2 justify-between text-gray-500 text-xs font-bold tracking-wide">
<span>Screen size</span>
<span>Visitors</span>
</div>
@ -84,7 +84,7 @@ class ScreenSizes extends React.Component {
</React.Fragment>
)
} else {
return <div className="text-center mt-44 font-medium text-gray-600">No data yet</div>
return <div className="text-center mt-44 font-medium text-gray-500">No data yet</div>
}
}
@ -138,7 +138,7 @@ class Browsers extends React.Component {
if (this.state.browsers && this.state.browsers.length > 0) {
return (
<React.Fragment>
<div className="flex items-center mt-3 mb-2 justify-between text-gray-600 text-xs font-bold tracking-wide">
<div className="flex items-center mt-3 mb-2 justify-between text-gray-500 text-xs font-bold tracking-wide">
<span>Browser</span>
<span>Visitors</span>
</div>
@ -146,7 +146,7 @@ class Browsers extends React.Component {
</React.Fragment>
)
} else {
return <div className="text-center mt-44 font-medium text-gray-600">No data yet</div>
return <div className="text-center mt-44 font-medium text-gray-500">No data yet</div>
}
}
@ -200,7 +200,7 @@ class OperatingSystems extends React.Component {
if (this.state.operatingSystems && this.state.operatingSystems.length > 0) {
return (
<React.Fragment>
<div className="flex items-center mt-3 mb-2 justify-between text-gray-600 text-xs font-bold tracking-wide">
<div className="flex items-center mt-3 mb-2 justify-between text-gray-500 text-xs font-bold tracking-wide">
<span>Operating system</span>
<span>Visitors</span>
</div>
@ -208,7 +208,7 @@ class OperatingSystems extends React.Component {
</React.Fragment>
)
} else {
return <div className="text-center mt-44 font-medium text-gray-600">No data yet</div>
return <div className="text-center mt-44 font-medium text-gray-500">No data yet</div>
}
}

@ -44,8 +44,8 @@ class CountriesModal extends React.Component {
<table className="w-full table-striped table-fixed">
<thead>
<tr>
<th className="p-2 text-xs tracking-wide font-bold text-gray-600" align="left">Country</th>
<th className="p-2 w-32 text-xs tracking-wide font-bold text-gray-600" align="right">Visitors</th>
<th className="p-2 text-xs tracking-wide font-bold text-gray-500" align="left">Country</th>
<th className="p-2 w-32 text-xs tracking-wide font-bold text-gray-500" align="right">Visitors</th>
</tr>
</thead>
<tbody>

@ -73,8 +73,8 @@ class GoogleKeywordsModal extends React.Component {
<table className="w-full table-striped table-fixed">
<thead>
<tr>
<th className="p-2 text-xs tracking-wide font-bold text-gray-600" align="left">Search Term</th>
<th className="p-2 w-32 text-xs tracking-wide font-bold text-gray-600" align="right">Visitors</th>
<th className="p-2 text-xs tracking-wide font-bold text-gray-500" align="left">Search Term</th>
<th className="p-2 w-32 text-xs tracking-wide font-bold text-gray-500" align="right">Visitors</th>
</tr>
</thead>
<tbody>

@ -59,9 +59,9 @@ class PagesModal extends React.Component {
<table className="w-full table-striped table-fixed">
<thead>
<tr>
<th className="p-2 text-xs tracking-wide font-bold text-gray-600" align="left">Page url</th>
<th className="p-2 w-32 text-xs tracking-wide font-bold text-gray-600" align="right">Pageviews</th>
{this.showBounceRate() && <th className="p-2 w-32 text-xs tracking-wide font-bold text-gray-600" align="right">Bounce rate</th>}
<th className="p-2 text-xs tracking-wide font-bold text-gray-500" align="left">Page url</th>
<th className="p-2 w-32 text-xs tracking-wide font-bold text-gray-500" align="right">Pageviews</th>
{this.showBounceRate() && <th className="p-2 w-32 text-xs tracking-wide font-bold text-gray-500" align="right">Bounce rate</th>}
</tr>
</thead>
<tbody>

@ -60,7 +60,7 @@ class ReferrerDrilldownModal extends React.Component {
<img className="rounded-full w-8" src={tweet.author_image} />
<div className="ml-2 leading-tight">
<div className="font-bold group-hover:text-blue-500">{tweet.author_name}</div>
<div className="text-xs text-gray-600">@{tweet.author_handle}</div>
<div className="text-xs text-gray-500">@{tweet.author_handle}</div>
</div>
</a>
<a className="ml-auto twitter-icon" href={tweetUrl} target="_blank"></a>
@ -80,7 +80,7 @@ class ReferrerDrilldownModal extends React.Component {
<tr className="text-sm" key={referrer.name}>
<td className="p-2">
{ this.renderReferrerName(referrer.name) }
<span className="text-gray-600 ml-2 text-xs">
<span className="text-gray-500 ml-2 text-xs">
appears in {referrer.tweets.length} tweets
</span>
<div className="my-4 pl-4 border-l-2 border-gray-300">
@ -107,7 +107,7 @@ class ReferrerDrilldownModal extends React.Component {
renderGoalText() {
if (this.state.query.filters.goal) {
return (
<h1 className="text-xl font-semibold text-gray-600 leading-none">completed {this.state.query.filters.goal}</h1>
<h1 className="text-xl font-semibold text-gray-500 leading-none">completed {this.state.query.filters.goal}</h1>
)
}
}
@ -130,9 +130,9 @@ class ReferrerDrilldownModal extends React.Component {
<table className="w-full table-striped table-fixed mt-4">
<thead>
<tr>
<th className="p-2 text-xs tracking-wide font-bold text-gray-600" align="left">Referrer</th>
<th className="p-2 w-32 text-xs tracking-wide font-bold text-gray-600" align="right">Visitors</th>
{this.showBounceRate() && <th className="p-2 w-32 text-xs tracking-wide font-bold text-gray-600" align="right">Bounce rate</th>}
<th className="p-2 text-xs tracking-wide font-bold text-gray-500" align="left">Referrer</th>
<th className="p-2 w-32 text-xs tracking-wide font-bold text-gray-500" align="right">Visitors</th>
{this.showBounceRate() && <th className="p-2 w-32 text-xs tracking-wide font-bold text-gray-500" align="right">Bounce rate</th>}
</tr>
</thead>
<tbody>

@ -68,9 +68,9 @@ class ReferrersModal extends React.Component {
<table className="w-full table-striped table-fixed">
<thead>
<tr>
<th className="p-2 text-xs tracking-wide font-bold text-gray-600" align="left">Referrer</th>
<th className="p-2 w-32 text-xs tracking-wide font-bold text-gray-600" align="right">Visitors</th>
{this.showBounceRate() && <th className="p-2 w-32 text-xs tracking-wide font-bold text-gray-600" align="right">Bounce rate</th>}
<th className="p-2 text-xs tracking-wide font-bold text-gray-500" align="left">Referrer</th>
<th className="p-2 w-32 text-xs tracking-wide font-bold text-gray-500" align="right">Visitors</th>
{this.showBounceRate() && <th className="p-2 w-32 text-xs tracking-wide font-bold text-gray-500" align="right">Bounce rate</th>}
</tr>
</thead>
<tbody>

@ -5,8 +5,8 @@ export default function MoreLink({site, list, endpoint}) {
if (list.length > 0) {
return (
<div className="text-center w-full absolute bottom-0 left-0 p-4">
<Link to={`/${encodeURIComponent(site.domain)}/${endpoint}${window.location.search}`} className="leading-snug font-bold text-sm text-gray-600 hover:text-red-500 transition tracking-wide">
<svg className="feather mr-1 -mt-px"><use xlinkHref="#feather-maximize" /></svg>
<Link to={`/${encodeURIComponent(site.domain)}/${endpoint}${window.location.search}`} className="leading-snug font-bold text-sm text-gray-500 hover:text-red-500 transition tracking-wide">
<svg className="feather mr-1" style={{marginTop: '-2px'}}><use xlinkHref="#feather-maximize" /></svg>
MORE
</Link>
</div>

@ -47,7 +47,7 @@ export default class Pages extends React.Component {
if (this.state.pages.length > 0) {
return (
<React.Fragment>
<div className="flex items-center mt-3 mb-2 justify-between text-gray-600 text-xs font-bold tracking-wide">
<div className="flex items-center mt-3 mb-2 justify-between text-gray-500 text-xs font-bold tracking-wide">
<span>Page url</span>
<span>Pageviews</span>
</div>
@ -56,7 +56,7 @@ export default class Pages extends React.Component {
</React.Fragment>
)
} else {
return <div className="text-center mt-44 font-medium text-gray-600">No data yet</div>
return <div className="text-center mt-44 font-medium text-gray-500">No data yet</div>
}
}

@ -53,7 +53,7 @@ export default class Referrers extends React.Component {
if (this.state.referrers.length > 0) {
return (
<React.Fragment>
<div className="flex items-center mt-3 mb-2 justify-between text-gray-600 text-xs font-bold tracking-wide">
<div className="flex items-center mt-3 mb-2 justify-between text-gray-500 text-xs font-bold tracking-wide">
<span>Referrer</span>
<span>Visitors</span>
</div>
@ -62,7 +62,7 @@ export default class Referrers extends React.Component {
</React.Fragment>
)
} else {
return <div className="text-center mt-44 font-medium text-gray-600">No data yet</div>
return <div className="text-center mt-44 font-medium text-gray-500">No data yet</div>
}
}

@ -244,7 +244,7 @@ class LineGraph extends React.Component {
return (
<div className={`px-8 w-1/2 my-4 lg:w-auto ${border}`} key={stat.name}>
<div className="text-gray-600 text-xs font-bold tracking-wide uppercase">{stat.name}</div>
<div className="text-gray-500 text-xs font-bold tracking-wide uppercase">{stat.name}</div>
<div className="my-1 flex justify-between items-center">
<b className="text-2xl mr-4">{ typeof(stat.count) == 'number' ? numberFormatter(stat.count) : stat.percentage + '%' }</b>
{this.renderComparison(stat.name, stat.change)}

@ -13,10 +13,10 @@
<div class="my-4">
<%= label f, :password, class: "block text-gray-700 text-sm font-bold mb-2" %>
<%= password_input f, :password, class: "transition bg-gray-100 appearance-none border border-transparent rounded w-full p-2 text-gray-700 leading-normal appearance-none focus:outline-none focus:bg-white focus:border-gray-300" %>
<p class="text-gray-600 text-xs my-2">Forgot password? <a href="/password/request-reset" class="underline text-gray-800">Click here</a> to reset it.</p>
<p class="text-gray-500 text-xs my-2">Forgot password? <a href="/password/request-reset" class="underline text-gray-800">Click here</a> to reset it.</p>
</div>
<%= submit "Login →", class: "button mt-4 w-full" %>
<p class="text-center text-gray-600 text-xs mt-4">
<p class="text-center text-gray-500 text-xs mt-4">
Don't have an account? <%= link("Register", to: "/register") %> instead.
</p>
<% end %>

Loading…
Cancel
Save