Merge branch 'develop' into my-profile

This commit is contained in:
virvar 2016-05-11 15:49:05 +03:00
commit 13205348ed
12 changed files with 1 additions and 7 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 82 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 249 B

View File

@ -13,7 +13,6 @@
[syng-im.components.toolbar :refer [toolbar]]
[syng-im.components.discovery.discovery-popular :refer [discovery-popular]]
[syng-im.components.discovery.discovery-recent :refer [discovery-recent]]
[syng-im.resources :as res]
[syng-im.components.discovery.styles :as st]
[syng-im.persistence.realm :as realm]))

View File

@ -5,7 +5,6 @@
view
text
image]]
[syng-im.resources :as res]
[syng-im.components.discovery.styles :as st]
[reagent.core :as r])
)
@ -19,6 +18,6 @@
]
[view {:style st/popular-list-item-avatar-container}
[image {:style st/popular-list-item-avatar
:source res/user-no-photo}]
:source {:uri "icon_avatar"}}]
]
]))

View File

@ -12,7 +12,6 @@
[syng-im.components.toolbar :refer [toolbar]]
[reagent.core :as r]
[syng-im.components.discovery.discovery-popular-list-item :refer [discovery-popular-list-item]]
[syng-im.resources :as res]
[syng-im.components.discovery.styles :as st]))
(defn render-row [row section-id row-id]

View File

@ -4,7 +4,6 @@
[syng-im.utils.logging :as log]
[syng-im.persistence.realm :as realm]
[syng-im.persistence.realm :as r]
[syng-im.resources :as res]
[syng-im.db :as db]))
(defn signal-discoveries-updated [db]

View File

@ -17,5 +17,3 @@
(def trash-icon (js/require "./images/trash.png"))
(def leave-icon (js/require "./images/leave.png"))
(def icon-close-gray (js/require "./images/icon_close_gray.png"))
(def menu (js/require "./images/ic_menu_black_24dp_1x.png"))
(def search (js.require "./images/ic_search_black_24dp_1x.png"))