Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add calendar and index #13

Merged
merged 5 commits into from Feb 2, 2017
Merged

Add calendar and index #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
41096d1
added calendar dropdown to top bar
marjielam Feb 2, 2017
f3959db
added index page, cleaned up some config
marjielam Feb 2, 2017
e175e59
fixed rubocop errors and added controller test for days index
marjielam Feb 2, 2017
2a15a55
tweaked test for coveralls
marjielam Feb 2, 2017
730a93d
added ES version 6 to DayTile
marjielam Feb 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Expand Up @@ -26,4 +26,4 @@ Things you may want to cover:
![Build Status](https://codeship.com/projects/80975840-c931-0134-9c9f-3a0fd8dae151/status?branch=master)
![Code Climate](https://codeclimate.com/github/marjielam/memory-keeper.png)
<!-- ![Coverage Status](https://coveralls.io/repos/marjielam/memory-keeper/badge.png) -->
[![Coverage Status](https://coveralls.io/repos/github/marjielam/memory-keeper/badge.svg?branch=master)]
![Coverage Status](https://coveralls.io/repos/github/marjielam/memory-keeper/badge.svg?branch=master)
29 changes: 29 additions & 0 deletions app/assets/stylesheets/days.css
View file
Open in desktop
Expand Up @@ -50,3 +50,32 @@ body {
li {
list-style: none;
}

.datepicker-days {
height: 100px;
}

.day-tile {
background-color: #B2DEE7;
padding: 1.1em;
border-radius: 1em;
border: solid white .3em;
height: 8em;
display: table-cell;
vertical-align: middle;
text-align: center;
font-family: Julius Sans One;
font-weight: 700;
}

.day-tile span {
height: 5em;
display: table-cell;
vertical-align: middle;
}

.day-tile:hover {
background-color: #34495e;
color: white;
font-size: 1em;
}
2 changes: 2 additions & 0 deletions app/assets/stylesheets/foundation_and_overrides.scss
View file
Open in desktop
Expand Up @@ -67,6 +67,8 @@ h3 {
font-size: 1em;
}

$column-gutter: 5px;

// If you'd like to include motion-ui the foundation-rails gem comes prepackaged with it, uncomment the 3 @imports, if you are not using the gem you need to install the motion-ui sass package.
//
// @include motion-ui-transitions;
Expand Down