-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #511 from mpsonntag/fixes
Fixes and updates LGTM
- Loading branch information
Showing
10 changed files
with
362 additions
and
8 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
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
63 changes: 63 additions & 0 deletions
63
app/assets/stylesheets/custom/bootstrap/_custom-print.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,63 @@ | ||
| // Do not display elements with the class noprint in the print view | ||
| .noprint { | ||
| display: none; | ||
| } | ||
|
|
||
| // Do not display specific elements in the print view | ||
| .navbar, .footer, .hidden-data, .nav, .jumbo-small, .callout, .pager, .alert { | ||
| display: none; | ||
| } | ||
|
|
||
| // Display the conference name but do not display the local link in the print view | ||
| .page-header { | ||
| h1 { | ||
| a[href]:after { | ||
| display: none; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| .affiliations, .abstract-text, .acknowledgements, .references { | ||
| margin: 0.5em; | ||
| padding: 0.5em; | ||
| } | ||
|
|
||
| // Required to properly display abstract authors in the print view | ||
| .authors { | ||
| padding: 0; | ||
| margin: 0; | ||
| margin-top: 0.2em; | ||
| list-style: none; | ||
| display: inline-block; | ||
| font-size: 14px; | ||
|
|
||
| ul { | ||
| padding: 0; | ||
| margin: 0; | ||
| list-style: none; | ||
| display: inline-block; | ||
| font-size: large; | ||
| } | ||
|
|
||
| li { | ||
| display: inline-block; | ||
|
|
||
| span:after { | ||
| content: " "; | ||
| } | ||
| } | ||
|
|
||
| li:after { | ||
| content: ", "; | ||
| } | ||
|
|
||
| li:last-child:after { | ||
| content: "" !important; | ||
| } | ||
| } | ||
|
|
||
| // Required to properly display abstract copyright text in the print view | ||
| .foot-info ul { | ||
| list-style-type: none; | ||
| padding-left: 0px; | ||
| } |
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,68 @@ | ||
| // file used for compilation within a play framework | ||
|
|
||
| // adjust this to the path where the original bootstrap less files are located | ||
| @bootPath: "/lib/bootstrap/less/"; | ||
| // adjust this to the path where the custom less files are located | ||
| @customPath: "custom/bootstrap/"; | ||
|
|
||
| // Core variables and mixins | ||
| @import "@{bootPath}variables"; | ||
| @import "@{bootPath}mixins"; | ||
|
|
||
| // Custom variables, overwrite existing bootstrap variables | ||
| @import "@{customPath}_custom-colors"; | ||
| @import "@{customPath}_custom-vars"; | ||
|
|
||
| // Reset | ||
| @import "@{bootPath}normalize"; | ||
| @import "@{bootPath}print"; | ||
|
|
||
| // Core CSS | ||
| @import "@{bootPath}scaffolding"; | ||
| @import "@{bootPath}type"; | ||
| @import "@{bootPath}code"; | ||
| @import "@{bootPath}grid"; | ||
| @import "@{bootPath}tables"; | ||
| @import "@{bootPath}forms"; | ||
| @import "@{bootPath}buttons"; | ||
|
|
||
| // Components | ||
| @import "@{bootPath}component-animations"; | ||
| @import "@{bootPath}glyphicons"; | ||
| @import "@{bootPath}dropdowns"; | ||
| @import "@{bootPath}button-groups"; | ||
| @import "@{bootPath}input-groups"; | ||
| @import "@{bootPath}navs"; | ||
| @import "@{bootPath}navbar"; | ||
| @import "@{bootPath}breadcrumbs"; | ||
| @import "@{bootPath}pagination"; | ||
| @import "@{bootPath}pager"; | ||
| @import "@{bootPath}labels"; | ||
| @import "@{bootPath}badges"; | ||
| @import "@{bootPath}jumbotron"; | ||
| @import "@{bootPath}thumbnails"; | ||
| @import "@{bootPath}alerts"; | ||
| @import "@{bootPath}progress-bars"; | ||
| @import "@{bootPath}media"; | ||
| @import "@{bootPath}list-group"; | ||
| @import "@{bootPath}panels"; | ||
| @import "@{bootPath}wells"; | ||
| @import "@{bootPath}close"; | ||
|
|
||
| // Components w/ JavaScript | ||
| @import "@{bootPath}modals"; | ||
| @import "@{bootPath}tooltip"; | ||
| @import "@{bootPath}popovers"; | ||
| @import "@{bootPath}carousel"; | ||
|
|
||
| // Utility classes | ||
| @import "@{bootPath}utilities"; | ||
| @import "@{bootPath}responsive-utilities"; | ||
|
|
||
| // Custom elements | ||
| @import "@{customPath}_custom-elements"; | ||
|
|
||
| // Custom print view elements; needs to be the last import | ||
| // to make sure existing styles are overwritten by the print | ||
| // style. | ||
| @import "@{customPath}_custom-print"; |
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
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,38 @@ | ||
| [ | ||
| { | ||
| "ExtendedData":"", | ||
| "name":"Event A", | ||
| "description":"Theologicum, Liebermeisterstrasse 12, 72076 Tuebingen", | ||
| "point": | ||
| { | ||
| "lat":48.525742885891795, | ||
| "long":9.055126905441284 | ||
| }, | ||
| "type":0, | ||
| "zoomto":true | ||
| }, | ||
| { | ||
| "ExtendedData":"", | ||
| "name":"Event B", | ||
| "description":"Neckarmueller, Gartenstrasse , 72076 Tuebingen", | ||
| "point": | ||
| { | ||
| "lat":48.51933329151785, | ||
| "long":9.058645963668823 | ||
| }, | ||
| "type":5, | ||
| "zoomto":true | ||
| }, | ||
| { | ||
| "ExtendedData":"", | ||
| "name":"Event C", | ||
| "description":"Rittersaal, Burgsteige 11, 72076 Tuebingen", | ||
| "point": | ||
| { | ||
| "lat":48.51937237686814, | ||
| "long":9.050610065460205 | ||
| }, | ||
| "type":0, | ||
| "zoomto":true | ||
| } | ||
| ] |
Oops, something went wrong.