This repository has been archived by the owner on Jul 6, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 34
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into newKioskStyle
Conflicts: client/styles/views/misc/kiosk/kiosk.import.less
- Loading branch information
Showing
34 changed files
with
515 additions
and
321 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,3 +16,4 @@ dump/ | |
|
|
||
| settings.json | ||
| server/extracts.msgfmt | ||
| version.js | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| METEOR@1.2.0.2 | ||
| METEOR@1.2.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| #!/bin/sh | ||
| ln -s ../../bin/update-version .git/hooks/post-checkout | ||
| ln -s ../../bin/update-version .git/hooks/post-commit |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| #!/bin/sh | ||
| ver=$(git describe --abbrev=0) | ||
| complete=$(git describe) | ||
| branch=$(git rev-parse --abbrev-ref HEAD) | ||
| commit=$(git rev-parse HEAD) | ||
| timestamp=$(git log -1 --date=short --pretty=format:%cd) | ||
| cat > version.js << EOF | ||
| VERSION = { | ||
| "basic": "$ver", | ||
| "complete": "$complete", | ||
| "branch": "$branch", | ||
| "commit": "$commit", | ||
| "timestamp": "$timestamp" | ||
| }; | ||
| EOF | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 40 additions & 0 deletions
40
client/styles/modules/calendar_event/calendar.event.grid.import.less
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| .frame_calendar_event_container { | ||
| .grid(4, 3, 0, 2); | ||
| height: 200px; | ||
| padding: 0 3px 10px; | ||
|
|
||
| @media screen and (max-width: @screen-xxs) { | ||
| .grid(6); | ||
| padding: 0 3px 10px; | ||
| } | ||
|
|
||
| @media screen and (max-width: @screen-xxxs) { | ||
| .grid(12); | ||
| padding: 0 3px 10px; | ||
| } | ||
|
|
||
| .frame_calendar_event { | ||
| .grid(12); | ||
| .no-padding; | ||
| height: 100%; | ||
|
|
||
| .-eventLocationTime { | ||
| .grid(12); | ||
| height: 50px; | ||
| padding: 5px; | ||
| } | ||
|
|
||
| .-eventTitle { | ||
| .grid(12); | ||
| max-height: 56px; | ||
| padding: 5px; | ||
| } | ||
|
|
||
| .-eventDescription { | ||
| .grid(12); | ||
| height: 85px; | ||
| margin-top: -3px; | ||
| padding: 0 5px 5px; | ||
| } | ||
| } | ||
| } |
32 changes: 32 additions & 0 deletions
32
client/styles/modules/calendar_event/calendar.event.import.less
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| .frame_calendar_event_container { | ||
| .frame_calendar_event { | ||
| .transition(0.5s); | ||
| background: @light-blue; | ||
|
|
||
| &:hover { | ||
| .box-shadow; | ||
| } | ||
|
|
||
| .-eventLocationTime, | ||
| .-eventTitle, | ||
| .-eventDescription { | ||
| overflow: hidden; | ||
| word-wrap: break-word; | ||
| } | ||
|
|
||
| .-eventLocationTime { | ||
| background: @brand-success; | ||
| border-bottom: 1px solid #fff; | ||
| color: #333; | ||
| } | ||
|
|
||
| .-eventTitle { | ||
| color: #333; | ||
| font-size: medium; | ||
| } | ||
|
|
||
| .-eventDescription { | ||
| color: @brand-primary; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,13 @@ | ||
| .frame_calendar_date { | ||
| .date { | ||
| background: lighten(rgb(249, 143, 57), 25%); | ||
| border-left: 10px solid rgb(249, 143, 57); | ||
| background: lighten(@orange, 25%); | ||
| border-left: 10px solid @orange; | ||
| font-size: large; | ||
| text-align: center; | ||
|
|
||
| @media screen and (max-width: @screen-xxxs) { | ||
| border-left: none; | ||
| border-top: 10px solid rgb(249, 143, 57); | ||
| } | ||
| } | ||
|
|
||
| .frame_calendar_events { | ||
| .frame_calendar_event_container { | ||
| .frame_calendar_event { | ||
| .transition(0.5s); | ||
| background: @light-blue; | ||
|
|
||
| &:hover { | ||
| .box-shadow; | ||
| } | ||
|
|
||
| .-eventLocationTime, | ||
| .-eventTitle, | ||
| .-eventDescription { | ||
| overflow: hidden; | ||
| word-wrap: break-word; | ||
| } | ||
|
|
||
| .-eventLocationTime { | ||
| background: @brand-success; | ||
| border-bottom: 1px solid #fff; | ||
| color: #333; | ||
| } | ||
|
|
||
| .-eventTitle { | ||
| color: #333; | ||
| font-size: medium; | ||
| } | ||
|
|
||
| .-eventDescription { | ||
| color: @brand-primary; | ||
| } | ||
| } | ||
| border-top: 10px solid @orange; | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.