diff --git a/app/App_Resources/Android/drawable-hdpi/background_registered_label_event.png b/app/App_Resources/Android/drawable-hdpi/background_registered_label_event.png new file mode 100644 index 0000000..3f5b022 Binary files /dev/null and b/app/App_Resources/Android/drawable-hdpi/background_registered_label_event.png differ diff --git a/app/App_Resources/Android/drawable-hdpi/background_registered_label_list.png b/app/App_Resources/Android/drawable-hdpi/background_registered_label_list.png new file mode 100644 index 0000000..6cfd8a6 Binary files /dev/null and b/app/App_Resources/Android/drawable-hdpi/background_registered_label_list.png differ diff --git a/app/App_Resources/Android/drawable-ldpi/background_registered_label_event.png b/app/App_Resources/Android/drawable-ldpi/background_registered_label_event.png new file mode 100644 index 0000000..3f5b022 Binary files /dev/null and b/app/App_Resources/Android/drawable-ldpi/background_registered_label_event.png differ diff --git a/app/App_Resources/Android/drawable-ldpi/background_registered_label_list.png b/app/App_Resources/Android/drawable-ldpi/background_registered_label_list.png new file mode 100644 index 0000000..6cfd8a6 Binary files /dev/null and b/app/App_Resources/Android/drawable-ldpi/background_registered_label_list.png differ diff --git a/app/App_Resources/Android/drawable-mdpi/background_registered_label_event.png b/app/App_Resources/Android/drawable-mdpi/background_registered_label_event.png new file mode 100644 index 0000000..3f5b022 Binary files /dev/null and b/app/App_Resources/Android/drawable-mdpi/background_registered_label_event.png differ diff --git a/app/App_Resources/Android/drawable-mdpi/background_registered_label_list.png b/app/App_Resources/Android/drawable-mdpi/background_registered_label_list.png new file mode 100644 index 0000000..6cfd8a6 Binary files /dev/null and b/app/App_Resources/Android/drawable-mdpi/background_registered_label_list.png differ diff --git a/app/App_Resources/Android/drawable-xhdpi/background_registered_label_event.png b/app/App_Resources/Android/drawable-xhdpi/background_registered_label_event.png new file mode 100644 index 0000000..3f5b022 Binary files /dev/null and b/app/App_Resources/Android/drawable-xhdpi/background_registered_label_event.png differ diff --git a/app/App_Resources/Android/drawable-xhdpi/background_registered_label_list.png b/app/App_Resources/Android/drawable-xhdpi/background_registered_label_list.png new file mode 100644 index 0000000..6cfd8a6 Binary files /dev/null and b/app/App_Resources/Android/drawable-xhdpi/background_registered_label_list.png differ diff --git a/app/App_Resources/Android/drawable-xxhdpi/background_registered_label_event.png b/app/App_Resources/Android/drawable-xxhdpi/background_registered_label_event.png new file mode 100644 index 0000000..3f5b022 Binary files /dev/null and b/app/App_Resources/Android/drawable-xxhdpi/background_registered_label_event.png differ diff --git a/app/App_Resources/Android/drawable-xxhdpi/background_registered_label_list.png b/app/App_Resources/Android/drawable-xxhdpi/background_registered_label_list.png new file mode 100644 index 0000000..6cfd8a6 Binary files /dev/null and b/app/App_Resources/Android/drawable-xxhdpi/background_registered_label_list.png differ diff --git a/app/App_Resources/Android/drawable-xxxhdpi/background_registered_label_event.png b/app/App_Resources/Android/drawable-xxxhdpi/background_registered_label_event.png new file mode 100644 index 0000000..3f5b022 Binary files /dev/null and b/app/App_Resources/Android/drawable-xxxhdpi/background_registered_label_event.png differ diff --git a/app/App_Resources/Android/drawable-xxxhdpi/background_registered_label_list.png b/app/App_Resources/Android/drawable-xxxhdpi/background_registered_label_list.png new file mode 100644 index 0000000..6cfd8a6 Binary files /dev/null and b/app/App_Resources/Android/drawable-xxxhdpi/background_registered_label_list.png differ diff --git a/app/events/event-details/event-details.component.css b/app/events/event-details/event-details.component.css index d2f893c..12726cc 100644 --- a/app/events/event-details/event-details.component.css +++ b/app/events/event-details/event-details.component.css @@ -35,6 +35,11 @@ vertical-align: middle; } +.btn { + margin-right: 0; + margin-left: 0; +} + /* this is angular2 syntax :| */ .registered-users-wrapper >>> Image, .registered-users-wrapper >>> .no-image { @@ -85,3 +90,17 @@ .votes-count { font-size: 13; } + +.registered-label { + width: 99; + height: 34; + margin-top: 5; + padding: 8 20 0 15; + color: #F4550F; + font-size: 12; + font-weight: bold; + background-image: url("res://background_registered_label_event"); + background-repeat: no-repeat; + background-size: cover; + background-position: -5 0; +} diff --git a/app/events/event-details/event-details.template.html b/app/events/event-details/event-details.template.html index 8eb72e0..2593c20 100644 --- a/app/events/event-details/event-details.template.html +++ b/app/events/event-details/event-details.template.html @@ -23,9 +23,14 @@ - - - + + + + + + + + diff --git a/app/events/event-list/event-list.component.css b/app/events/event-list/event-list.component.css index 3215c04..d90979c 100644 --- a/app/events/event-list/event-list.component.css +++ b/app/events/event-list/event-list.component.css @@ -7,7 +7,7 @@ height: 100%; } -.event-name, +.event-name-wrp, .event-date-wrp, .event-description, .event-organiser, @@ -21,12 +21,30 @@ color: #ADADAD; } +.event-name, +.registered-label { + vertical-align: middle; +} + .event-name { + margin-right: 5; margin-bottom: 0; - font-size: 28; + font-size: 26; color: #F4550F; } +.registered-label { + width: 75; + height: 20; + margin-top: 5; + padding: 1 0 0 7; + color: #F4550F; + font-size: 12; + background-image: url("res://background_registered_label_list"); + background-repeat: no-repeat; + background-size: cover; +} + .event-remaining-time { horizontal-align: right; } @@ -56,9 +74,3 @@ border-color: #c8c7cc; height: 1; } - -.registered-label { - border-width: 1; - border-color: #F4550F; - height: 25; -} diff --git a/app/events/event-list/event-list.template.html b/app/events/event-list/event-list.template.html index cddb310..e341de2 100644 --- a/app/events/event-list/event-list.template.html +++ b/app/events/event-list/event-list.template.html @@ -1,7 +1,7 @@ - +