Skip to content

Commit

Permalink
Merge pull request jitsi#1212 from jitsi/react-native-ui-modification…
Browse files Browse the repository at this point in the history
…s-more

React native ui modifications
  • Loading branch information
yanas authored Dec 22, 2016
2 parents 35be17c + 8d90a7d commit 96a6f2d
Show file tree
Hide file tree
Showing 18 changed files with 1,196 additions and 1,027 deletions.
Binary file modified android/app/src/main/assets/fonts/jitsi.ttf
Binary file not shown.
21 changes: 10 additions & 11 deletions css/_font.scss
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@
.icon-avatar:before {
content: "\e901";
}
.icon-autorenew:before {
content: "\e903";
}
.icon-hangup:before {
content: "\e905";
}
.icon-chat:before {
content: "\e906";
}
.icon-download:before {
content: "\e902";
}
.icon-edit:before {
content: "\e907";
}
Expand All @@ -55,9 +55,6 @@
.icon-kick:before {
content: "\e904";
}
.icon-menu:before {
content: "\e91f";
}
.icon-menu-up:before {
content: "\e91f";
}
Expand All @@ -70,9 +67,6 @@
.icon-exit-full-screen:before {
content: "\e90c";
}
.icon-star:before {
content: "\e916";
}
.icon-star-full:before {
content: "\e90a";
}
Expand Down Expand Up @@ -109,6 +103,12 @@
.icon-settings:before {
content: "\e915";
}
.icon-star:before {
content: "\e916";
}
.icon-switch-camera:before {
content: "\e921";
}
.icon-share-desktop:before {
content: "\e917";
}
Expand All @@ -133,7 +133,6 @@
.icon-recEnable:before {
content: "\e614";
}
// FIXME not used anymore - consider removing in the next font update
.icon-presentation:before {
content: "\e603";
}
}
Binary file modified fonts/jitsi.eot
Binary file not shown.
2 changes: 1 addition & 1 deletion fonts/jitsi.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified fonts/jitsi.ttf
Binary file not shown.
Binary file modified fonts/jitsi.woff
Binary file not shown.
52 changes: 26 additions & 26 deletions fonts/selection.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,32 +85,6 @@
"setId": 2,
"iconIdx": 12
},
{
"icon": {
"paths": [
"M800 330c34 52 54 116 54 182 0 188-154 342-342 342v128l-170-172 170-170v128c142 0 256-114 256-256 0-44-12-84-30-120zM512 256c-142 0-256 114-256 256 0 44 10 84 30 120l-62 62c-34-52-54-116-54-182 0-188 154-342 342-342v-128l170 172-170 170v-128z"
],
"isMulticolor": false,
"isMulticolor2": false,
"tags": [
"autorenew"
],
"grid": 0,
"attrs": []
},
"attrs": [],
"properties": {
"id": 68,
"order": 84,
"ligatures": "autorenew",
"prevSize": 32,
"code": 59651,
"name": "autorenew"
},
"setIdx": 0,
"setId": 2,
"iconIdx": 69
},
{
"icon": {
"paths": [
Expand Down Expand Up @@ -735,6 +709,32 @@
"setId": 2,
"iconIdx": 718
},
{
"icon": {
"paths": [
"M640 662l150-150-150-150v108h-256v-108l-150 150 150 150v-108h256v108zM854 170c46 0 84 40 84 86v512c0 46-38 86-84 86h-684c-46 0-84-40-84-86v-512c0-46 38-86 84-86h136l78-84h256l78 84h136z"
],
"isMulticolor": false,
"isMulticolor2": false,
"tags": [
"switch_camera"
],
"grid": 0,
"attrs": []
},
"attrs": [],
"properties": {
"id": 741,
"order": 108,
"ligatures": "switch_camera",
"prevSize": 32,
"code": 59681,
"name": "switch-camera"
},
"setIdx": 0,
"setId": 2,
"iconIdx": 742
},
{
"icon": {
"paths": [
Expand Down
Loading

0 comments on commit 96a6f2d

Please sign in to comment.