Skip to content
This repository has been archived by the owner on Oct 25, 2023. It is now read-only.

Commit

Permalink
Improved mobile layout, supported chrome packaged notifications
Browse files Browse the repository at this point in the history
  • Loading branch information
@zhukov
zhukov committed Feb 10, 2014
1 parent a4c219f commit 02f8f5f
Show file tree
Hide file tree
Showing 28 changed files with 2,980 additions and 3,236 deletions.
164 changes: 142 additions & 22 deletions app/css/app.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ fieldset[disabled] .btn-tg.active {
.tg_page_head .container {
display: block;
width: auto;
padding: 0;
}
.tg_page_head .navbar-inverse {
/*-webkit-app-region: drag;*/
Expand All @@ -131,18 +130,24 @@ fieldset[disabled] .btn-tg.active {
margin: 0;
}
.tg_page_head .navbar > .container .navbar-brand {
padding: 9px;
padding: 9px 15px;
opacity: 0.9;
margin-left: 0;
-webkit-transition: opacity swing .9s;
}
@media (max-width: 480px) {
.tg_page_head .navbar > .container .navbar-brand {
padding-left: 9px;
}
}

.tg_page_head .navbar > .container .navbar-brand-alpha {
color: #FFFFFF;
font-size: 12px;
padding-left: 5px;
@media (min-width: 480px) {
.tg_page_head .navbar-quick-nav {
display: none;
}
}


.tg_head_logo {
background: url(../img/Logo_2x.png) 0 0 no-repeat;
background-size: 110px 31px;
Expand All @@ -162,6 +167,31 @@ fieldset[disabled] .btn-tg.active {
.tg_page_head .navbar-inverse .navbar-nav > li > a:hover {
color: #FFF;
}
.tg_page_head .navbar-inverse .navbar-toggle {
border-color: #497495;
outline: 0;
}
.tg_page_head .navbar-inverse .navbar-collapse,
.tg_page_head .navbar-inverse .navbar-form {
border-color: #497495;
}

.tg_page_head .navbar-inverse .navbar-toggle:hover,
.tg_page_head .navbar-inverse .navbar-toggle:active,
.tg_page_head .navbar-inverse .navbar-toggle:focus {
background-color: rgba(255,255,255,0.1);
}

.tg_page_head .navbar-quick-nav {
margin: 0;
}
.tg_page_head .navbar-quick-nav li {
float: left;
}
.tg_page_head .navbar-quick-nav a {
padding-top: 15px;
padding-bottom: 15px;
}

.tg_progress {
height: 12px;
Expand Down Expand Up @@ -329,19 +359,19 @@ fieldset[disabled] .btn-tg.active {

.im_page_wrap {
background: #FFF;
/*max-width: 1000px;*/
width: 1000px;
max-width: 1000px;
min-width: 300px;
margin: 0 auto;

-webkit-box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.1);
-moz-box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.1);
box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.1);
/*margin-bottom: 40px;*/

border-radius: 0 0 3px 3px;
overflow: hidden;
}


.im_page_footer {
font-size: 11px;
text-align: center;
Expand All @@ -360,20 +390,21 @@ fieldset[disabled] .btn-tg.active {

.im_dialogs_col_wrap {
float: left;
width: 310px;
width: 31%;
border-right: 2px solid #E9EBED;
padding-bottom: 10px;
}

.im_history_col_wrap {
float: left;
width: 690px;
width: 69%;
}


/* Dialogs list */
.im_dialogs_col {
width: 315px;
/*min-width: 315px;*/
margin-right: -7px;
}
.im_dialogs_col .nano > .pane {
background : rgba(0,0,0,.0);
Expand All @@ -397,7 +428,7 @@ fieldset[disabled] .btn-tg.active {

.im_dialogs_search {
padding: 14px 12px;
/*border-right: 2px solid #E9EBED;*/
position: relative;
}
.im_dialogs_search_field {
font-size: 12px;
Expand All @@ -421,7 +452,7 @@ fieldset[disabled] .btn-tg.active {

.im_dialogs_search_clear {
position: absolute;
margin-left: 262px;
right: 19px;
margin-top: -23px;
color: #999;
width: 13px;
Expand Down Expand Up @@ -662,9 +693,9 @@ a.im_dialog:hover .im_dialog_date {
}
.im_history {
padding: 20px 0 0 3px;
/*max-width: 555px;*/
max-width: 500px;
margin: 0 auto;
position: relative;
}

.im_history_typing_wrap {
Expand Down Expand Up @@ -1061,21 +1092,20 @@ span.emoji {
}

.im_send_panel_wrap {
width: 526px;
max-width: 526px;
margin: 0 auto;
padding: 10px 12px 22px 0;
}
.im_panel_fixed_bottom .im_send_form_wrap1 {
.im_send_form_wrap {
position: relative;
}
.im_panel_fixed_bottom .im_send_form {
.im_send_form {
max-width: 389px;
margin: 0 auto;
position: absolute;
bottom: 0;
left: 62px;
}
.im_send_form {
width: 389px;
float: left;
right: 62px;
}
.im_submit {
padding: 5px 12px;
Expand Down Expand Up @@ -1550,8 +1580,98 @@ img.img_fullsize {
margin: 30px auto 10px;
}

.im_page_footer {
display: none;
}
.im_panel_own_photo,
.im_panel_peer_photo {
display: none;
}

.im_send_form {
left: 0;
right: 0;
max-width: none;
}
}

@media (max-width: 640px) {
.im_dialog_peer {
white-space: normal;
height: 2.84em;
}
.im_dialog_message {
display: none;
}
}

@media (max-width: 900px) {
/*.icon-message-status {
margin-left: 0;
margin-top: 18px;
right: -1px;
}*/

.icon-message-status {
z-index: 10;
margin-left: -5px;
border-radius: 0;
height: 34px;
border: 0;
width: 2px;
margin-top: 1px;
border: 0;
}
/*.icon-message-status {
z-index: 10;
margin-left: -15px;
}*/
}

@media (max-width: 480px) {
.im_dialogs_col_wrap,
.im_page_peer_not_selected .im_history_col_wrap {
display: none;
}
.im_page_peer_not_selected .im_dialogs_col_wrap {
display: block;
border-right: 0;
}

.im_page_peer_not_selected .im_dialogs_col {
margin-right: 0;
}
.im_page_peer_not_selected .im_dialogs_col_wrap .pane {
width: 12px;
right: 0px;
}
.im_page_peer_not_selected .im_dialogs_col_wrap .pane > .slider {
border-radius: 3px;
margin: 0 3px;
}

.im_dialogs_scrollable_wrap {
padding: 0 12px 0 12px;
}

.im_dialogs_col_wrap,
.im_history_col_wrap {
float: none;
width: auto;
max-width: auto;
min-width: auto;
}

.im_page_peer_not_selected .im_dialog_peer {
white-space: nowrap;
height: auto;
}
.im_page_peer_not_selected .im_dialog_message {
display: block;
}
}


.settings_modal_window .modal-dialog {
max-width: 502px;
}
Expand Down
20 changes: 10 additions & 10 deletions app/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<!doctype html>
<html lang="en" ng-app="myApp"><!-- ng-csp=""-->
<html lang="en" ng-app="myApp"><!-- ng-csp="" -->
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Webogram</title>
<link rel="stylesheet" href="vendor/angular/angular-csp.css"/>
<link rel="stylesheet" href="vendor/bootstrap/css/bootstrap.css"/>
<link rel="stylesheet" href="vendor/bootstrap/css/bootstrap.css?1"/>
<link rel="stylesheet" href="vendor/jquery.nanoscroller/nanoscroller.css"/>
<link rel="stylesheet" href="css/app.css?24"/>
<link rel="stylesheet" href="css/app.css?25"/>
<link rel="icon" href="favicon.ico" type="image/x-icon" />

<meta property="og:title" content="Webogram">
Expand Down Expand Up @@ -40,7 +40,7 @@
<script type="text/javascript" src="vendor/angular/angular-route.js?1"></script>
<script type="text/javascript" src="vendor/angular/angular-animate.js?1"></script>
<script type="text/javascript" src="vendor/angular/angular-sanitize.js?1"></script>
<script type="text/javascript" src="vendor/ui-bootstrap/ui-bootstrap-custom-tpls-0.10.0.js"></script>
<script type="text/javascript" src="vendor/ui-bootstrap/ui-bootstrap-custom-tpls-0.10.0.js?1"></script>

<script type="text/javascript" src="vendor/jsbn/jsbn_combined.js"></script>
<script type="text/javascript" src="vendor/cryptoJS/crypto.js?1"></script>
Expand All @@ -50,12 +50,12 @@
<script type="text/javascript" src="js/lib/config.js"></script>
<script type="text/javascript" src="js/lib/mtproto.js?19"></script>

<script type="text/javascript" src="js/util.js?1"></script>
<script type="text/javascript" src="js/app.js?15"></script>
<script type="text/javascript" src="js/services.js?20"></script>
<script type="text/javascript" src="js/controllers.js?28"></script>
<script type="text/javascript" src="js/filters.js?3"></script>
<script type="text/javascript" src="js/directives.js?18"></script>
<script type="text/javascript" src="js/util.js?2"></script>
<script type="text/javascript" src="js/app.js?16"></script>
<script type="text/javascript" src="js/services.js?21"></script>
<script type="text/javascript" src="js/controllers.js?29"></script>
<script type="text/javascript" src="js/filters.js?4"></script>
<script type="text/javascript" src="js/directives.js?19"></script>

</body>
</html>
6 changes: 3 additions & 3 deletions app/js/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ config(['$locationProvider', '$routeProvider', '$compileProvider', function($loc


// $locationProvider.html5Mode(true);
$routeProvider.when('/', {templateUrl: 'partials/welcome.html?3', controller: 'AppWelcomeController'});
$routeProvider.when('/login', {templateUrl: 'partials/login.html?4', controller: 'AppLoginController'});
$routeProvider.when('/im', {templateUrl: 'partials/im.html?12', controller: 'AppIMController', reloadOnSearch: false});
$routeProvider.when('/', {templateUrl: 'partials/welcome.html?4', controller: 'AppWelcomeController'});
$routeProvider.when('/login', {templateUrl: 'partials/login.html?5', controller: 'AppLoginController'});
$routeProvider.when('/im', {templateUrl: 'partials/im.html?13', controller: 'AppIMController', reloadOnSearch: false});
$routeProvider.otherwise({redirectTo: '/'});

}]);
2 changes: 1 addition & 1 deletion app/js/background.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ chrome.app.runtime.onLaunched.addListener(function(launchData) {
width: 1100,
height: 700
},
minWidth: 1050,
minWidth: 320,
minHeight: 400,
frame: 'chrome'
});
Expand Down

0 comments on commit 02f8f5f

Please sign in to comment.