mirrors/PairDrop
1
0
Fork 0
mirror of https://github.com/schlagmichdoch/PairDrop.git synced 2025-05-01 03:59:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Squashed commit of the following:

Browse source 
commit dd00d53895b824fbe4170c4a34b104303f722ccd
Merge: 2b3698e cb9ea12
Author: Robin Linus <robin_woll@capira.de>
Date:   Wed Feb 10 00:27:32 2016 -0600

    Merge branch 'name-device' into merge123

    # Conflicts:
    #	app/elements/buddy-finder/buddy-avatar.html
    #	app/elements/buddy-finder/buddy-finder.html
    #	app/elements/buddy-finder/personal-avatar.html
    #	app/index.html

commit cb9ea1235001f0cc23514cb622ce711cdc0538af
Author: Robin Linus <robin_woll@capira.de>
Date:   Tue Feb 9 23:43:49 2016 -0600

    #13 Feature Request: Name your device

commit 6fa43b56f4e705a19e68b62bc671a4948b6968fb
Author: Robin Linus <robin_woll@capira.de>
Date:   Fri Jan 1 19:54:56 2016 +0100

    Initial

commit fc55c86f5cf95039355d85be7409e68f27246696
Author: Robin Linus <robin_woll@capira.de>
Date:   Fri Jan 1 18:06:27 2016 +0100

    Fix fullscreen layout on iOS
This commit is contained in:
Robin Linus 2016-02-10 08:58:09 -06:00
parent 2b3698ece0
commit e66598d77f
8 changed files with 210 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

24
app/elements/buddy-finder/personal-avatar.html
View file

@ -1,5 +1,6 @@
<link rel="import" href="../../bower_components/iron-icon/iron-icon.html">
<link rel="import" href="../../styles/icons.html">
<link rel="import" href="device-name.html">
<dom-module id="personal-avatar">
<template>
<style>
@ -11,6 +12,13 @@
bottom: 16px;
left: 50%;
margin-left: -180px;
z-index: 12;
cursor: pointer;
}
:host:hover iron-icon,
:host:hover device-name {
color: #3367d6;
}
iron-icon {
@ -44,11 +52,15 @@
height: 32px;
margin-bottom: 2px;
}
.slogan {
display: none;
}
}
</style>
<device-name id="deviceName"></device-name>
<iron-icon icon="chat:wifi-tethering"></iron-icon>
<div class="paper-font-body1">
Easily transfer data across devices.
<div class="paper-font-body1 slogan">
The easiest way to transfer data across devices.
</div>
<div class="paper-font-body1 discover">
Allow me to be discovered by: Everyone in this network.
@ -57,7 +69,13 @@
<script>
'use strict';
Polymer({
is: 'personal-avatar'
is: 'personal-avatar',
listeners: {
'tap': '_openDeviceNameDialog'
},
_openDeviceNameDialog: function() {
this.$.deviceName.open();
}
});
</script>
</dom-module>