From 25eb95672a191e0daef97d4ae93f348369f3de1d Mon Sep 17 00:00:00 2001 From: rulingcom Date: Wed, 3 Jun 2015 18:17:58 +0800 Subject: [PATCH] joshua mods for calendar accessbility --- .../stylesheets/lib/group/_group-index.scss | 6 +- .../stylesheets/lib/group/_group-members.scss | 24 ++++++-- .../template/modules/calendar.scss | 16 +---- .../orbit_bootstrap/home/header.html.erb | 2 + .../orbit_bootstrap/home/index.html.erb | 1 + .../calendar/_calendar_widget1.html.erb | 58 ------------------ .../modules/calendar/index.html.erb | 40 ------------ .../modules/calendar/info.json | 22 ------- .../modules/calendar/thumbs/thumb.png | Bin 4075 -> 0 bytes .../_site_menu_widget1.html.erb | 1 + app/views/admin/groups/members.html.erb | 2 +- app/views/orbit_bar/index.html.erb | 1 + 12 files changed, 29 insertions(+), 144 deletions(-) delete mode 100644 app/templates/orbit_bootstrap/modules/calendar/_calendar_widget1.html.erb delete mode 100644 app/templates/orbit_bootstrap/modules/calendar/index.html.erb delete mode 100644 app/templates/orbit_bootstrap/modules/calendar/info.json delete mode 100644 app/templates/orbit_bootstrap/modules/calendar/thumbs/thumb.png diff --git a/app/assets/stylesheets/lib/group/_group-index.scss b/app/assets/stylesheets/lib/group/_group-index.scss index 69fe9ec..bfd11aa 100644 --- a/app/assets/stylesheets/lib/group/_group-index.scss +++ b/app/assets/stylesheets/lib/group/_group-index.scss @@ -191,8 +191,8 @@ } } -// 67.5rem -@media screen and (min-width: 1080px) { +// 1080px +@media screen and (min-width: 67.5rem) { .group-card { width: 25%; @@ -209,7 +209,7 @@ } // 1400px -@media screen and (min-width: 1400px) { +@media screen and (min-width: 87.5rem) { .group-card { width: 20%; diff --git a/app/assets/stylesheets/lib/group/_group-members.scss b/app/assets/stylesheets/lib/group/_group-members.scss index 13a7d4e..bf9bed9 100644 --- a/app/assets/stylesheets/lib/group/_group-members.scss +++ b/app/assets/stylesheets/lib/group/_group-members.scss @@ -60,7 +60,7 @@ .group-member-item { list-style: none; - padding: 8px 0.75rem; + padding: 16px 1rem; margin: 8px 0 12px 0; } @@ -73,6 +73,7 @@ .group-member-meta-wrap { display: inline-block; vertical-align: top; + width: 50%; } .group-member-name { @@ -113,21 +114,26 @@ } -// 480px -@media screen and (min-width: 30rem) { +// 620 +@media screen and (min-width: 38.75rem) { .group-member-item { float: left; margin-right: 1rem; + width: 45%; } } -// 760px +// 980px -@media screen and (min-width: 47.5rem) { +@media screen and (min-width: 61.25rem) { .group-member-content-wrap { width: 70%; } + .group-member-item { + width: 30%; + } + .group-member-page-title { display: inline-block; margin: 0; @@ -135,4 +141,12 @@ line-height: 70px; transition: .6s all; } +} + +// 1400px +@media screen and (min-width: 87.5rem) { + .group-member-item { + width: 20%; + } + } \ No newline at end of file diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/calendar.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/calendar.scss index 1d83c9f..70828cd 100644 --- a/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/calendar.scss +++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/calendar.scss @@ -23,13 +23,6 @@ text-align: center; font-size: 0.8125rem; } - .loading { - &:after { - content: '\f1ce'; - font-family: FontAwesome; - animation: 2s linear 0s normal none infinite running fa-spin; - } - } } .w-calendar-table { margin-bottom: 0; @@ -40,6 +33,7 @@ .w-calendar-event { background: $theme-color-third; color: $theme-white; + cursor: pointer; } } @@ -56,11 +50,3 @@ right: 10px; } } -@keyframes fa-spin { -0% { - transform: rotate(0deg); -} -100% { - transform: rotate(359deg); -} -} \ No newline at end of file diff --git a/app/templates/orbit_bootstrap/home/header.html.erb b/app/templates/orbit_bootstrap/home/header.html.erb index 6c69d08..459ba44 100644 --- a/app/templates/orbit_bootstrap/home/header.html.erb +++ b/app/templates/orbit_bootstrap/home/header.html.erb @@ -12,6 +12,7 @@