Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:buddycloud/buddycloud-webclient

  • Loading branch information...
commit f278b2e81212426c512a4c7fd9edfe77e17f9e36 2 parents 14a0979 + 70bde17
@dodo dodo authored
View
BIN  assets/public/images/Cake_by_Louise_McLaren.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  assets/public/images/Coffee_by_Felix_Niklas.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
93 assets/startpage.html
@@ -0,0 +1,93 @@
+<!doctype html>
+<html lang="en">
+<head>
+ <title>welcome to buddycloud</title>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="web/css/main.css" type="text/css" media="screen">
+ <script src="web/js/app.js"></script>
+ <!--<script>require('init');</script>-->
+ <script>require('./vendor-bridge');</script>
+</head>
+<body class="startpage">
+ <header>
+ <div class="holder">
+ buddycloud
+ <nav class="floatLeft">
+ <a href="#">about</a>
+ <a href="#">buddywear</a>
+ <a href="#">developers</a>
+ </nav>
+ <input type="search" placeholder="Find Channels">
+ <nav class="floatRight">
+ <a href="#">register</a>
+ <a href="#">login</a>
+ </nav>
+ </div>
+ </header>
+ <div class="holder">
+ <h1>because coffee in the morning is lovely</h1>
+ <section class="stats floatLeft">
+ <h2>newest channels</h2>
+ <table>
+ <tr>
+ <td><span class="channelType topic">topic</span></td>
+ <td><a href="#">lowriders@example.com</a></td>
+ <tr>
+ <tr>
+ <td><span class="channelType personal">personal</span></td>
+ <td><a href="#">shinerx@example.com</a></td>
+ <tr>
+ <tr>
+ <td><span class="channelType topic">topic</span></td>
+ <td><a href="#">tats@example.com</a></td>
+ <tr>
+ <tr>
+ <td><span class="channelType personal">personal</span></td>
+ <td><a href="#">tinkerbel@example.com</a></td>
+ <tr>
+ </table>
+ <h2>most active channels</h2>
+ <table>
+ <tr>
+ <td><span class="channelType topic">topic</span></td>
+ <td><a href="#">lowriders@example.com</a></td>
+ <tr>
+ <tr>
+ <td><span class="channelType personal">personal</span></td>
+ <td><a href="#">shinerx@example.com</a></td>
+ <tr>
+ <tr>
+ <td><span class="channelType topic">topic</span></td>
+ <td><a href="#">tats@example.com</a></td>
+ <tr>
+ <tr>
+ <td><span class="channelType personal">personal</span></td>
+ <td><a href="#">tinkerbel@example.com</a></td>
+ <tr>
+ </table>
+ </section>
+ <section class="about floatRight">
+ <h2>about domain</h2>
+ <p>
+ another domain liberated by buddycloud. But seriously, I run
+ example.com for you. You are different, you get this tingling
+ feeling in your nose when you don't start your day with coffee.
+ This is your buddycloud, your way, no advertising. Free. Better.
+ Getting closer.<br>
+ Peace
+ <span class="right">The Coffee Guy</span>
+ </p>
+ <div class="contact">
+ <h3>example.com contact details</h3>
+ <ul>
+ <li><span class="key">buddycloud:</span>://help@example.com</li>
+ <li><span class="key">email:</span>me@example.com</li>
+ <li><span class="key">tel:</span>+1 415 555 1234</li>
+ </ul>
+ </div>
+ </section>
+ </div>
+</body>
+</html>
View
15 src/models/user.coffee
@@ -81,15 +81,8 @@ class exports.User extends Model
no
-# Copied from server operations
-AFFILIATIONS = [
- 'outcast', 'none', 'member',
- 'publisher', 'moderator', 'owner'
-]
+# app.affiliations is sorted descending
isAffiliationAtLeast = (affiliation1, affiliation2) ->
- i1 = AFFILIATIONS.indexOf(affiliation1)
- i2 = AFFILIATIONS.indexOf(affiliation2)
- if i2 < 0
- false
- else
- i1 >= i2
+ i1 = app.affiliations.indexOf(affiliation1 or 'none')
+ i2 = app.affiliations.indexOf(affiliation2 or 'none')
+ return i1 >= i2
View
10 src/styles/channels.styl
@@ -38,17 +38,9 @@
box-shadow 0 1px rgba(0,0,0,0.55),0 2px rgba(0,0,0,0.21), 0 3px rgba(0,0,0,0.13)
position relative
z-index 4
- input
+ input[type=search]
width 223px
- height 23px
- padding 1px 7px 0
- color black
- background white
- border none
- border-radius 12px
box-shadow 0 1px rgba(255, 255, 255, 0.34), 0 0 0 1px black inset, 0 2px rgba(0, 0, 0, 0.13) inset
- display block
- box-sizing border-box
+ .channel
padding-top 6px
.channel
View
11 src/styles/forms.styl
@@ -16,6 +16,17 @@ input[type=email]
&:focus
border-color rgba(0,0,0,0.55)
transition none
+
+input[type=search]
+ height 23px
+ padding 1px 7px 0
+ color black
+ background white
+ border none
+ border-radius 12px
+ box-shadow 0 1px 3px rgba(0, 0, 0, 0.21) inset, 0 1px rgba(255, 255, 255, 0.34)
+ display block
+ box-sizing border-box
form
label
View
7 src/styles/main.styl
@@ -10,6 +10,7 @@
@import "channels"
@import "stream"
@import "edit"
+@import "startpage"
@import "mobile"
textarea
@@ -65,7 +66,7 @@ body
box-shadow 0 -1px rgba(0,0,0,.03), 0 -2px rgba(0,0,0,.03), 0 -3px rgba(0,0,0,.03), 0 -1px white inset
h1
- font-size 34px
+ font-size 48px
font-family "Nunito", sans-serif
h2
font-size 26px
@@ -100,6 +101,10 @@ a, a:visited
&.internal
padding-left 12px
background url(../../public/icons/beagle.png) no-repeat left 4px
+
+table
+ td
+ padding-right 8px
.loading
font-size 27px
View
40 src/styles/startpage.styl
@@ -0,0 +1,40 @@
+body.startpage
+ background url(../../public/images/Cake_by_Louise_McLaren.jpg)
+ background-size cover
+
+.startpage
+ header
+ background #eee
+ box-shadow 0 1px rgba(0,0,0,.21), 0 2px rgba(0, 0, 0, 0.13)
+ .holder
+ padding 13px 21px
+ h1
+ margin 55px 21px 89px
+ .holder
+ width 960px
+ margin 0 auto
+ section
+ width 431px
+ margin 13px 0
+ padding 13px 21px
+ background #eee
+ border-radius 13px
+ box-shadow 0 0 0 1px #aaa, 0 1px 0 1px white, 0 1px rgba(0,0,0,.05) inset
+
+.channelType
+ margin 5px 0
+ padding 0 5px
+ border-radius 8px
+ background-color red
+ &.personal
+ background-color green
+
+.stats
+ .channelType
+ float right
+
+.floatLeft
+ float left
+
+.floatRight
+ float right
Please sign in to comment.
Something went wrong with that request. Please try again.