Skip to content

Commit

Permalink
#40 use css background to make the slide out has a dark color
Browse files Browse the repository at this point in the history
  • Loading branch information
hailiang-wang committed Nov 12, 2014
1 parent b173aee commit f4a351a
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 17 deletions.
2 changes: 1 addition & 1 deletion app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<!--
The nav bar that will be updated as we navigate between views.
-->
<ion-nav-bar class="bar-dark nav-title-slide-ios7">
<ion-nav-bar class="bar-dark">
<ion-nav-back-button class="button-icon icon ion-ios7-arrow-left">返回
</ion-nav-back-button>
</ion-nav-bar>
Expand Down
6 changes: 0 additions & 6 deletions app/scripts/controllers.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,11 @@ angular.module('mobay.controllers', [])
})

.controller('NotificationsCtrl', function($scope, store) {
$scope.$root.tabsHidden = "";
$scope.notifications = store.getNotifications();
$scope.notificationKeys = _.keys($scope.notifications);
})

.controller('NotificationDetailCtrl', function($scope, $stateParams, $log, webq) {
$scope.$root.tabsHidden = "tabs-hide";
// $log.debug('>> open message id ' + $stateParams.msgId);
$scope.title = $stateParams.title;
webq.getNotificationDetail($stateParams.msgId).success(function(data){
Expand All @@ -90,7 +88,6 @@ angular.module('mobay.controllers', [])

.controller('ProfileCtrl', function($scope, $log, store) {
// show tabs
$scope.$root.tabsHidden = "";
var profile = store.getUserProfile();
// TODO resolve the default avatar
$scope.avatarUrl = profile._json.pictureUrl || 'http://musa-hw-cafe.qiniudn.com/avatar/[email protected]';
Expand Down Expand Up @@ -122,7 +119,6 @@ angular.module('mobay.controllers', [])

.controller('ProfileEditorCtrl', function($state, $scope, $log, $stateParams, store, webq){
// hide tabs
$scope.$root.tabsHidden = "tabs-hide";
$log.debug($stateParams);
$scope.data = {};
switch($stateParams.key){
Expand Down Expand Up @@ -210,7 +206,6 @@ angular.module('mobay.controllers', [])
.controller('SettingsCtrl', function ($rootScope, $state, $scope, $log, $http, cfg, store, webq, mbaas) {
$scope.title = 'moBay';
$scope.appVersion = cfg.version;
$scope.$root.tabsHidden = "";
function mailUnAvailable(){
$scope.title = '邮件服务不可用';
setTimeout(function(){
Expand Down Expand Up @@ -292,7 +287,6 @@ angular.module('mobay.controllers', [])
})

.controller('TermsCtrl', function ($scope, $log, webq, cfg) {
$scope.$root.tabsHidden = "tabs-hide";
webq.getUserServiceAgreements().then(function(data){
$scope.terms = data;
})
Expand Down
4 changes: 0 additions & 4 deletions app/styles/modules/fast.scss
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,4 @@
.bar-error.ng-leave {
height: 24px;
border-width: 1px;
}

.tabs-hide .tabs {
display: none;
}
4 changes: 2 additions & 2 deletions app/templates/notification-detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
The FriendsCtrl pulls data from the Friends service (service.js)
The Friends service returns an array of friend data
-->
<ion-view title="{{title}}">
<ion-content has-header="true" padding="true">
<ion-view title="{{title}}" style="background: #292D30;">
<ion-content has-header="true" padding="true" style="background: #ffffff;">
<div class="item text-center" style="border: 0;" ng-show="content==null">加载中...</div>
<div ng-bind-html="content"></div>
</ion-content>
Expand Down
4 changes: 2 additions & 2 deletions app/templates/profile-editor.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<ion-view title="{{data.title}}">
<ion-content has-header="true">
<ion-view title="{{data.title}}" style="background: #292D30;">
<ion-content has-header="true" style="background: #ffffff;">
<ion-list type="list-inset">
<ion-item class="item-input">
<input type="text" placeholder="{{data.placeholder}}" ng-model="data.value">
Expand Down
2 changes: 1 addition & 1 deletion app/templates/tabs.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Each tab's child <ion-nav-view> directive will have its own
navigation history that also transitions its views in and out.
-->
<ion-tabs class="tabs-dark" ng-class="$root.tabsHidden">
<ion-tabs class="tabs-dark">

<!-- Dashboard Tab -->
<ion-tab icon="icon ion-ios7-home-outline" class="balanced" href="#/tab/dash">
Expand Down
2 changes: 1 addition & 1 deletion config.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<widget id="com.arrking.mobay" version="0.0.2" ios-CFBundleVersion="201411121831" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="com.arrking.mobay" version="0.0.2" ios-CFBundleVersion="201411122058" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>moBay</name>
<description>
Mobilb Bay, show real time matrix for Cafe, Bar, Salon, etc.
Expand Down

0 comments on commit f4a351a

Please sign in to comment.