From 054128a390b62e0622e090c24bad8992c8217099 Mon Sep 17 00:00:00 2001 From: blavenie <benoit.lavenier@e-is.pro> Date: Tue, 29 Mar 2016 23:36:40 +0200 Subject: [PATCH] UI: fix CSS light font color --- www/i18n/locale-en.json | 2 +- www/i18n/locale-fr-FR.json | 4 ++-- www/templates/account/new_transfer.html | 2 +- www/templates/explore/tabs/explore_tab_network.html | 2 +- www/templates/explore/view_peer.html | 4 ++-- www/templates/home.html | 2 +- www/templates/market/lookup.html | 10 +++++----- www/templates/market/view_record.html | 2 +- www/templates/registry/lookup.html | 4 ++-- www/templates/registry/record_form.html | 2 +- www/templates/registry/view_record.html | 4 ++-- www/templates/wot/lookup_form.html | 2 +- www/templates/wot/view_identity.html | 4 ++-- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/www/i18n/locale-en.json b/www/i18n/locale-en.json index d919e746d..b8fc4a23d 100644 --- a/www/i18n/locale-en.json +++ b/www/i18n/locale-en.json @@ -21,7 +21,7 @@ "ACCOUNT": "My Account" }, "HOME": { - "TITLE": "Home", + "TITLE": "", "WELCOME": "Welcome", "MESSAGE": "<b>Cesium</b> is still in development phase. There is not much to see right now. :-)", "BTN_REGISTRY": "Registry", diff --git a/www/i18n/locale-fr-FR.json b/www/i18n/locale-fr-FR.json index 0c3f238ab..b7912e924 100644 --- a/www/i18n/locale-fr-FR.json +++ b/www/i18n/locale-fr-FR.json @@ -21,8 +21,8 @@ "ACCOUNT": "Mon compte" }, "HOME": { - "TITLE": "Accueil", - "WELCOME": "Le Sou", + "TITLE": "", + "WELCOME": "Cesium", "MESSAGE": "Application toujours en développement.<br/>Merci de votre compréhension...", "BTN_REGISTRY": "Annuaire", "BTN_MARKET": "Offres/demandes", diff --git a/www/templates/account/new_transfer.html b/www/templates/account/new_transfer.html index 86079869e..9c5340b68 100644 --- a/www/templates/account/new_transfer.html +++ b/www/templates/account/new_transfer.html @@ -18,7 +18,7 @@ <span class="item item-text-wrap"> {{'TRANSFER.FROM' | translate}} <span class="badge" - ng-class="{'badge-assertive': (convertedBalance > 0 && formData.amount && convertedBalance < formData.amount), 'badge-balanced': (!formData.amount || convertedBalance >= formData.amount) }"> + ng-class="{'badge-assertive': (convertedBalance <= 0 || (formData.amount && convertedBalance < formData.amount)), 'badge-balanced': (convertedBalance > 0 && (!formData.amount || convertedBalance >= formData.amount)) }"> {{walletData.pubkey| formatPubkey}} / <span ng-if="!walletData.useRelative">{{convertedBalance | formatInteger}} {{unit | abbreviate}}</span> <span ng-if="walletData.useRelative">{{convertedBalance | formatDecimal}} {{unit | abbreviate}}<sub>{{udUnit | abbreviate}}</sub></span> diff --git a/www/templates/explore/tabs/explore_tab_network.html b/www/templates/explore/tabs/explore_tab_network.html index 615bdaead..ee491a9e7 100644 --- a/www/templates/explore/tabs/explore_tab_network.html +++ b/www/templates/explore/tabs/explore_tab_network.html @@ -11,7 +11,7 @@ ng-class="{ assertive: !peer.online, balanced: (peer.online && peer.hasMainConsensusBlock), energized: (peer.online && !peer.hasMainConsensusBlock) }" ui-sref="app.view_peer(peer)"> <i class="icon ion-android-globe"></i> - <h3><span ng-class="{ positive: peer.uid }">{{peer.uid || peer.pubkey.substr(0,8)}}</span> <span class="light">{{peer.dns && ' | ' + peer.dns}}</span></h3> + <h3><span ng-class="{ positive: peer.uid }">{{peer.uid || peer.pubkey.substr(0,8)}}</span> <span class="gray">{{peer.dns && ' | ' + peer.dns}}</span></h3> <h4>{{peer.getURL()}}</h4> <span class="badge" ng-class="{ 'badge-balanced': peer.hasMainConsensusBlock, 'badge-energized': peer.hasConsensusBlock }">{{peer.current.number}}</span> </a> diff --git a/www/templates/explore/view_peer.html b/www/templates/explore/view_peer.html index bed9943b6..23951f3b4 100644 --- a/www/templates/explore/view_peer.html +++ b/www/templates/explore/view_peer.html @@ -15,8 +15,8 @@ ng-class="{ assertive: !peer.online, balanced: peer.online }" ng-href="http://{{peer.getURL()}}/blockchain/current"> <i class="icon ion-android-globe"></i> - <h3><span ng-class="{ positive: peer.uid }">{{peer.uid || peer.pubkey.substr(0,8)}}</span> <span class="light">{{peer.dns && ' | ' + peer.dns}}</span></h3> - <h4>{{peer.getURL()}} <span class="light">| {{'PEER.SIGNED_ON_BLOCK' | translate}}</span> #{{peer.blockNumber}}</h4> + <h3><span ng-class="{ positive: peer.uid }">{{peer.uid || peer.pubkey.substr(0,8)}}</span> <span class="gray">{{peer.dns && ' | ' + peer.dns}}</span></h3> + <h4>{{peer.getURL()}} <span class="gray">| {{'PEER.SIGNED_ON_BLOCK' | translate}}</span> #{{peer.blockNumber}}</h4> <span class="badge" ng-class="{ 'badge-balanced': peer.hasMainConsensusBlock, 'badge-energized': peer.hasConsensusBlock }">{{peer.current.number}}</span> </a> </div> diff --git a/www/templates/home.html b/www/templates/home.html index f440937d8..9c7032e2f 100644 --- a/www/templates/home.html +++ b/www/templates/home.html @@ -3,7 +3,7 @@ <!--img class="center" src="img/lesou-120px.png"/--> <h2 translate>HOME.WELCOME</h2> - <p class="light" translate>HOME.MESSAGE</p> + <p class="gray" translate>HOME.MESSAGE</p> <div class="padding"> diff --git a/www/templates/market/lookup.html b/www/templates/market/lookup.html index 02312b704..9fd4bf699 100644 --- a/www/templates/market/lookup.html +++ b/www/templates/market/lookup.html @@ -61,7 +61,7 @@ <div class="visible-xs item-text-wrap" ng-class="{'item-thumbnail-left': (found.pictures && found.pictures.length > 0)}"> <img ng-src="{{found.pictures[0].src}}" ng-if="found.pictures && found.pictures.length > 0"></img> <h2 ng-bind-html="found.title"></h2> - <h4 class="light" ng-bind-html="found.location"></h4> + <h4 class="gray" ng-bind-html="found.location"></h4> <span class="badge item-note">{{found.time | formatDate}}</span> </div> <div class="visible-xs item-content item-text-wrap"> @@ -74,17 +74,17 @@ </div> <div class="col no-margin-xs"> <h2 ng-bind-html="found.title"></h2> - <h4 class="light visible-xs" ng-bind-html="found.location"></h4> + <h4 class="gray visible-xs" ng-bind-html="found.location"></h4> <span class="badge item-note">{{found.time | formatDate}}</span> </div> <div class="col col-20"> - <h3 class="light" ng-bind="found.location" ng-if="found.location"></h3> + <h3 class="gray" ng-bind="found.location" ng-if="found.location"></h3> </div> <div class="col col-30 item-text-wrap"> - <h3 class="light" ng-bind-html="found.description" ng-if="found.description"></h3> + <h3 class="gray" ng-bind-html="found.description" ng-if="found.description"></h3> </div> <div class="col col-10 visible-lg" > - <h3 class="light item-text-wrap" ng-if="found.category">{{found.category.name|formatCategory}}</h3> + <h3 class="gray item-text-wrap" ng-if="found.category">{{found.category.name|formatCategory}}</h3> </div> </div> </a> diff --git a/www/templates/market/view_record.html b/www/templates/market/view_record.html index 7693585c1..263854ca6 100644 --- a/www/templates/market/view_record.html +++ b/www/templates/market/view_record.html @@ -14,7 +14,7 @@ <div class="item" ng-class="{'item-thumbnail-left': pictures && pictures.length>0}"> <img style="height:70px" ng-src="{{pictures[0].src}}" nf-if="pictures && pictures.length>0"> <h2 ng-bind-html="formData.title"></h2> - <h4 class="light" ng-bind-html="formData.location"></h4> + <h4 class="gray" ng-bind-html="formData.location"></h4> </div> <div class="item"> diff --git a/www/templates/registry/lookup.html b/www/templates/registry/lookup.html index f5c7318ff..a18455e3d 100644 --- a/www/templates/registry/lookup.html +++ b/www/templates/registry/lookup.html @@ -52,8 +52,8 @@ ng-click="select('{{found.id}}', '{{found.urlTitle|formatSlug}}')"> <img ng-src="{{found.pictures[0].src}}" ng-if="found.pictures && found.pictures.length > 0"> <h2 class="item-text-wrap" ng-bind-html="found.title"></h2> - <h4 class="light" ng-bind="found.location" ng-if="found.location"></h4> - <p class="light item-text-wrap" ng-bind-html="found.description" ng-if="found.description"></p> + <h4 class="gray" ng-bind="found.location" ng-if="found.location"></h4> + <p class="gray item-text-wrap" ng-bind-html="found.description" ng-if="found.description"></p> <span class="badge" ng-if="!found.isCompany">{{found.issuer | formatPubkey}}</span> </a> diff --git a/www/templates/registry/record_form.html b/www/templates/registry/record_form.html index 34e8eb34b..be829894a 100644 --- a/www/templates/registry/record_form.html +++ b/www/templates/registry/record_form.html @@ -59,7 +59,7 @@ <a class="item item-icon-left" ng-if="id && recordData.issuer && !recordData.isCompany"> <i class="icon ion-key"></i> <span translate>REGISTRY.EDIT.RECORD_PUBKEY</span> - <h4 class="light">{{recordData.issuer}}</h4> + <h4 class="gray">{{recordData.issuer}}</h4> </a> <a class="item item-icon-left" ng-if="id && recordData.issuer && recordData.isCompany" > diff --git a/www/templates/registry/view_record.html b/www/templates/registry/view_record.html index 065227cfd..69805f200 100644 --- a/www/templates/registry/view_record.html +++ b/www/templates/registry/view_record.html @@ -15,12 +15,12 @@ <div class="item" ng-class="{'item-avatar': pictures && pictures.length > 0}"> <img ng-src="{{pictures[0].src}}" ng-if="pictures && pictures.length > 0"> <h2 class="positive" ng-bind-html="formData.title"></h2> - <h4 class="light" ng-bind-html="formData.location"></h4> + <h4 class="gray" ng-bind-html="formData.location"></h4> </div> <a class="item item-icon-left" ng-if="!formData.isCompany"> <i class="icon ion-key"></i> - <h4 class="light">{{formData.issuer}}</h4> + <h4 class="gray">{{formData.issuer}}</h4> </a> <div class="item"> diff --git a/www/templates/wot/lookup_form.html b/www/templates/wot/lookup_form.html index 605e4f75c..9052d936c 100644 --- a/www/templates/wot/lookup_form.html +++ b/www/templates/wot/lookup_form.html @@ -14,7 +14,7 @@ <i class="icon ion-person"></i> <h2>{{found.uid}}</h2> - <h4 class="light">{{'WOT.REGISTERED_SINCE'|translate}}{{found.sigDate | formatDate}}</h4> + <h4 class="gray">{{'WOT.REGISTERED_SINCE'|translate}}{{found.sigDate | formatDate}}</h4> <span class="badge">{{found.pub | formatPubkey}}</span> </a> </div> diff --git a/www/templates/wot/view_identity.html b/www/templates/wot/view_identity.html index 1ab6c6dd9..b84d431c9 100644 --- a/www/templates/wot/view_identity.html +++ b/www/templates/wot/view_identity.html @@ -5,12 +5,12 @@ <span class="item item-icon-left"> <i class="icon ion-person"></i> <h2 class="positive">{{identity.uid}}</h2> - <h4 class="light">{{'WOT.REGISTERED_SINCE' | translate}}{{identity.sigDate | formatDate}}</h4> + <h4 class="gray">{{'WOT.REGISTERED_SINCE' | translate}}{{identity.sigDate | formatDate}}</h4> </span> <a class="item item-icon-left"> <i class="icon ion-key"></i> - <h4 class="light">{{identity.pub}}</h4> + <h4 class="gray">{{identity.pub}}</h4> </a> <div class="item-divider"></div> -- GitLab