Skip to content

Commit

Permalink
Merge pull request #26 from aboire/master
Browse files Browse the repository at this point in the history
update
  • Loading branch information
aboire authored Aug 30, 2017
2 parents ab56a4b + 5448ddb commit c6a7a23
Show file tree
Hide file tree
Showing 72 changed files with 6,577 additions and 276 deletions.
2 changes: 1 addition & 1 deletion .desktop/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "communecter",
"version": "0.0.11",
"version": "0.0.13",
"projectName": "communecter",
"devTools": true,
"devtron": true,
Expand Down
8 changes: 6 additions & 2 deletions .meteor/cordova-plugins
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
[email protected]
[email protected]
cordova-plugin-android-permissions@https://github.com/NeoLSN/cordova-plugin-android-permissions/tarball/789574937c97c6959db49341b2d901789affb364
cordova-plugin-android-sensor-listeners@https://github.com/QuentinRoy/cordova-plugin-android-sensor-listeners/tarball/master
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
phonegap-plugin-barcodescanner@https://github.com/JrontEnd/phonegap-plugin-barcodescanner/tarball/3a4b4ea69c8bff86f9749f7af332fc5b58c88601
[email protected]
[email protected]
me.dispatch.crosswalk-permissions@file://./packages
phonegap-plugin-barcodescanner@https://github.com/JrontEnd/phonegap-plugin-barcodescanner/tarball/3a4b4ea69c8bff86f9749f7af332fc5b58c88601
1 change: 1 addition & 0 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -82,3 +82,4 @@ jameslefrere:caretjs
[email protected]
#microservice
aldeed:template-extension
elmarti:video-chat
17 changes: 11 additions & 6 deletions .meteor/versions
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ [email protected]
[email protected]
cfs:[email protected]
[email protected]
[email protected]_1
[email protected]_1
[email protected]_1
communecter:[email protected]
communecter:[email protected]
communecter:[email protected]_3
Expand All @@ -46,6 +47,7 @@ [email protected]
[email protected]
[email protected]
[email protected]
elmarti:[email protected]
[email protected]
[email protected]
fourseven:[email protected]
Expand Down Expand Up @@ -79,7 +81,7 @@ [email protected]
mdg:[email protected]
mdg:[email protected]
mdg:[email protected]
[email protected].0
[email protected].1
[email protected]
meteorhacks:[email protected]
meteorhacks:[email protected]
Expand All @@ -90,16 +92,18 @@ meteorspark:[email protected]
[email protected]
[email protected]
[email protected]
mizzao:[email protected]
mizzao:[email protected]
[email protected]
[email protected]
[email protected].2
[email protected].4
[email protected]
momentjs:[email protected]
[email protected].19
[email protected].22
[email protected]
mrt:[email protected]
multiply:[email protected]
[email protected].24
[email protected].30
[email protected]
omega:[email protected]
omega:[email protected]
Expand All @@ -118,14 +122,15 @@ [email protected]
[email protected]
[email protected]
reywood:[email protected]
rocketchat:[email protected]
[email protected]
rzymek:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected].2
[email protected].3
[email protected]
[email protected]
tap:[email protected]
Expand Down
4 changes: 4 additions & 0 deletions client/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ import '../imports/ui/login/login.js';

import '../imports/ui/images/images.js';

import '../imports/ui/video/video.js';

import '../imports/ui/sensors/sensors.js';

import '../imports/ui/dashboard/dashboard.js';

import '../imports/ui/mapscope/mapscope.js';
Expand Down
1 change: 1 addition & 0 deletions client/scss/_ionic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
// Buttons
"stylesheets/button",
"stylesheets/button-bar",
"stylesheets/floating-menu",

// Util
"stylesheets/grid",
Expand Down
36 changes: 36 additions & 0 deletions client/scss/ionic.app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,42 @@ $button-follower-active-border: darken($assertive, 10%) !default;
}
}

.organization, a.organization {
color: $color-orga;
}
.organization-bg {
background-color: $color-orga;
}
.person, a.person {
color: $color-person;
}
.person-bg {
background-color: $color-person;
}
.event, a.event {
color: $color-event;
}
.event-bg {
background-color: $color-event;
}
.project, a.project {
color: $color-project;
}
.project-bg {
background-color: $color-project;
}
.poi, a.poi {
color: $color-poi;
}
.poi-bg {
background-color: $color-poi;
}
.classified, a.classified {
color: $color-classified;
}
.classified-bg {
background-color: $color-classified;
}
// BUTTONS END

.yellow{
Expand Down
225 changes: 225 additions & 0 deletions client/scss/stylesheets/_floating-menu.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,225 @@
#floating-button {
bottom: 20px;
position: fixed;
right: 20px;
z-index : 9999;
width: 60px;
height: 60px;
line-height: 60px;
list-style-type: none;
margin: 0;
padding: 0;
text-align: center;
color: #000;
cursor: pointer;
box-shadow: 0 2px 10px 0 rgba(0, 0, 0, 0.2), 0 2px 5px 0 rgba(0, 0, 0, 0.2);
transform: translate3d(0, 0, 0);
backface-visibility: hidden;
padding: 0;
border: none;
border-radius: 50%;
}

#floating-button.center{
margin-left: auto !important;
margin-right: auto !important;
left: 0 !important;
right: 0 !important;
}

#floating-button>li {
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 100%;
backface-visibility: hidden;
padding: 0;
border: none;
border-radius: 50%;
-webkit-border-radius: 50%;
}

#floating-button a {
width: 40px;
height: 40px;
display: inline-block;
border-radius: 50%;
-webkit-border-radius: 50%;
text-decoration: none;
font-size: 0.8em;
}

#floating-button .icon.menu-icon{
font-size: 20px;
}

#floating-button li span.label{
margin-right: 2px;
color: gray;
background-color: white;
padding: 6px;
border-radius: 6px;
-webkit-border-radius: 6px;
box-shadow: 0.5px 2px 2px 0.5px rgba(0, 0, 0, 0.2);
}


#floating-button li span.label-container{
margin-right: 2px;
position: absolute;
display: inline-block;
top: 0px;
overflow: hidden;
right: 75px;
width: 400px;
text-align: right;
font-size: 15px;
}



/*floating-menu*/

#floating-menu {
position: fixed;
right: 20px;
z-index: 9999;
width: 60px;
height: 60px;
line-height: 60px;
list-style-type: none;
margin: 0;
padding: 0;
text-align: center;
cursor: pointer;
box-shadow: 0 2px 10px 0 rgba(0, 0, 0, 0.2), 0 2px 5px 0 rgba(0, 0, 0, 0.2);
transform: translate3d(0, 0, 0);
backface-visibility: hidden;
padding: 0;
border: none;
border-radius: 50%;
}

#floating-menu .center{
margin-left: auto;
margin-right: auto;
left: 0;
right: 0;
}

#floating-menu .icon.menu-icon{
font-size: 20px;
}

#floating-menu img.menu-icon{
font-size: 20px;
}

#floating-menu li i{
font-size: 20px;
left: 0;
top: 0;
}

#floating-menu li.menu-button {
z-index: 9999;
left: 0;
top: 0;
width: 100%;
height: 100%;
}

#floating-menu li{
position: absolute;
left: 0.5px;
top: 0.5px;
width: 98%;
height: 98%;
transform: translate3d(0, 0, 0);
backface-visibility: hidden;
padding: 0;
border: none;
border-radius: 50%;
-webkit-border-radius: 50%;
}

#floating-menu li span.label{
margin-right: 2px;
color: gray;
background-color: white;
padding: 6px;
border-radius: 6px;
-webkit-border-radius: 6px;
box-shadow: 0.5px 2px 2px 0.5px rgba(0, 0, 0, 0.2);
}


#floating-menu li span.label-container{
margin-right: 2px;
position: absolute;
display: inline-block;
visibility: hidden;
top: 0px;
overflow: hidden;
right: 75px;
width: 400px;
text-align: right;
font-size: 15px;
}

#floating-menu.active span.label-container{
visibility: visible;
}


#floating-menu.active li{
box-shadow: 0 2px 10px 0 rgba(0, 0, 0, 0.2), 0 2px 5px 0 rgba(0, 0, 0, 0.2);
top: 0;
}

/*#floating-menu li {
width: 40px;
height: 40px;
display: inline-block;
border-radius: 50%;
-webkit-border-radius: 50%;
text-decoration: none;
font-size: 0.8em;
}*/

#floating-menu ion-floating-item > li {
transition: all .3s;
-webkit-transition: all .3s;
-moz-transition: .3s;
}


#floating-menu.active ion-floating-item:nth-child(1) > li {
transform: translateY(-70px); -webkit-transform: translateY(-70px);
transition-delay: 0ms; -webkit-transition-delay: 0ms;
}
#floating-menu.active ion-floating-item:nth-child(2) > li {
transform: translateY(-140px); -webkit-transform: translateY(-140px);
transition-delay: 50ms; -webkit-transition-delay: 50ms;
}
#floating-menu.active ion-floating-item:nth-child(3) > li {
transform: translateY(-210px); -webkit-transform: translateY(-210px);
transition-delay: 100ms; -webkit-transition-delay: 100ms;
}
#floating-menu.active ion-floating-item:nth-child(4) > li {
transform: translateY(-280px); -webkit-transform: translateY(-280px);
transition-delay: 150ms; -webkit-transition-delay: 150ms;
}
#floating-menu.active ion-floating-item:nth-child(5) > li {
transform: translateY(-350px); -webkit-transform: translateY(-350px);
transition-delay: 160ms; -webkit-transition-delay: 160ms;
}
#floating-menu.active ion-floating-item:nth-child(6) > li {
transform: translateY(-420px); -webkit-transform: translateY(-420px);
transition-delay: 170ms; -webkit-transition-delay: 170ms;
}
#floating-menu.active ion-floating-item:nth-child(7) > li {
transform: translateY(-490px); -webkit-transform: translateY(-490px);
transition-delay: 180ms; -webkit-transition-delay: 180ms;
}
Loading

0 comments on commit c6a7a23

Please sign in to comment.