diff --git a/fonts/glyphicons-social-regular.eot b/fonts/glyphicons-social-regular.eot new file mode 100755 index 00000000..14b1e673 Binary files /dev/null and b/fonts/glyphicons-social-regular.eot differ diff --git a/fonts/glyphicons-social-regular.svg b/fonts/glyphicons-social-regular.svg new file mode 100755 index 00000000..db812f76 --- /dev/null +++ b/fonts/glyphicons-social-regular.svg @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fonts/glyphicons-social-regular.ttf b/fonts/glyphicons-social-regular.ttf new file mode 100755 index 00000000..1d011c9a Binary files /dev/null and b/fonts/glyphicons-social-regular.ttf differ diff --git a/fonts/glyphicons-social-regular.woff b/fonts/glyphicons-social-regular.woff new file mode 100755 index 00000000..f718c373 Binary files /dev/null and b/fonts/glyphicons-social-regular.woff differ diff --git a/fonts/glyphicons-social-regular.woff2 b/fonts/glyphicons-social-regular.woff2 new file mode 100755 index 00000000..464a43ce Binary files /dev/null and b/fonts/glyphicons-social-regular.woff2 differ diff --git a/js/components/ascribe_app.js b/js/components/ascribe_app.js index ab860893..9000094f 100644 --- a/js/components/ascribe_app.js +++ b/js/components/ascribe_app.js @@ -3,6 +3,7 @@ import React from 'react'; import Router from 'react-router'; import Header from '../components/header'; +import Footer from '../components/footer'; import GlobalNotification from './global_notification'; let Link = Router.Link; @@ -15,6 +16,7 @@ let AscribeApp = React.createClass({
+
diff --git a/js/components/footer.js b/js/components/footer.js new file mode 100644 index 00000000..530d3e56 --- /dev/null +++ b/js/components/footer.js @@ -0,0 +1,31 @@ +'use strict'; + +import React from 'react'; + +import { getLangText } from '../utils/lang_utils'; + +let Footer = React.createClass({ + render() { + return ( +
+
+

+
+ api | + impressum | + terms of service | + privacy +

+

+ + + + + +

+
+ ); + } +}); + +export default Footer; diff --git a/sass/ascribe_footer.scss b/sass/ascribe_footer.scss new file mode 100644 index 00000000..e51443be --- /dev/null +++ b/sass/ascribe_footer.scss @@ -0,0 +1,52 @@ + +.ascribe-footer { + text-align: center; +} + +.ascribe-footer hr { + border: 0; + border-top: 1px solid #eee; + background-color: rgba(0,0,0,0); + margin-bottom: 0 !important; +} + +.ascribe-footer .btn-ascribe-landing { + margin-top: 2em; +} + +.ascribe-footer-statement { + font-family: 'mercury_light'; + font-size: 1.6em !important; + margin-bottom: 0; + margin-top: 0; +} + +.ascribe-footer-statement a, .ascribe-footer-sub-statement a { + color: #424242; +} + +.ascribe-footer-sub-statement { + font-size: .9em !important; + margin-bottom: 2.5em; +} + +.ascribe-footer-statement a, .ascribe-footer-sub-statement a { + color: #424242; +} +.ascribe-footer-statement a:hover, .ascribe-footer-sub-statement a:hover { + color: #48DACB; +} + +.ascribe-footer .social-icons-wrapper { + margin-top: 1em; +} + +.ascribe-footer .social-icons-wrapper a { + color: #424242; + margin-left: 1em; + font-size: 1.3em; +} + +.ascribe-footer .social-icons-wrapper a:hover { + color: #48DACB; +} \ No newline at end of file diff --git a/sass/glyphicons-social.scss b/sass/glyphicons-social.scss new file mode 100644 index 00000000..96065085 --- /dev/null +++ b/sass/glyphicons-social.scss @@ -0,0 +1,10 @@ +@font-face{ + font-family:'Glyphicons Social'; + src:url('#{$BASE_URL}static/fonts/glyphicons-social-regular.eot'); + src:url('#{$BASE_URL}static/fonts/fonts/glyphicons-social-regular.eot?#iefix') format('embedded-opentype'), + url('#{$BASE_URL}static/fonts/glyphicons-social-regular.woff2') format('woff2'), + url('#{$BASE_URL}static/fonts/glyphicons-social-regular.woff') format('woff'), + url('#{$BASE_URL}static/fonts/glyphicons-social-regular.ttf') format('truetype'), + url('#{$BASE_URL}static/fonts/glyphicons-social-regular.svg#glyphicons_socialregular') format('svg') +} +.social{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Social';font-style:normal;font-weight:normal;line-height:1;vertical-align:top;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.social.x05{font-size:12px}.social.x2{font-size:48px}.social.x3{font-size:72px}.social.x4{font-size:96px}.social.x5{font-size:120px}.social.light:before{color:#f2f2f2}.social.drop:before{text-shadow:-1px 1px 3px rgba(0,0,0,0.3)}.social.flip{-moz-transform:scaleX(-1);-o-transform:scaleX(-1);-webkit-transform:scaleX(-1);transform:scaleX(-1);filter:FlipH;-ms-filter:"FlipH"}.social.flipv{-moz-transform:scaleY(-1);-o-transform:scaleY(-1);-webkit-transform:scaleY(-1);transform:scaleY(-1);filter:FlipV;-ms-filter:"FlipV"}.social.rotate90{-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.social.rotate180{-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.social.rotate270{-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.social-pinterest:before{content:"\E001"}.social-dropbox:before{content:"\E002"}.social-google-plus:before{content:"\E003"}.social-jolicloud:before{content:"\E004"}.social-yahoo:before{content:"\E005"}.social-blogger:before{content:"\E006"}.social-picasa:before{content:"\E007"}.social-amazon:before{content:"\E008"}.social-tumblr:before{content:"\E009"}.social-wordpress:before{content:"\E010"}.social-instapaper:before{content:"\E011"}.social-evernote:before{content:"\E012"}.social-xing:before{content:"\E013"}.social-zootool:before{content:"\E014"}.social-dribbble:before{content:"\E015"}.social-deviantart:before{content:"\E016"}.social-read-it-later:before{content:"\E017"}.social-linked-in:before{content:"\E018"}.social-forrst:before{content:"\E019"}.social-pinboard:before{content:"\E020"}.social-behance:before{content:"\E021"}.social-github:before{content:"\E022"}.social-youtube:before{content:"\E023"}.social-skitch:before{content:"\E024"}.social-foursquare:before{content:"\E025"}.social-quora:before{content:"\E026"}.social-badoo:before{content:"\E027"}.social-spotify:before{content:"\E028"}.social-stumbleupon:before{content:"\E029"}.social-readability:before{content:"\E030"}.social-facebook:before{content:"\E031"}.social-twitter:before{content:"\E032"}.social-instagram:before{content:"\E033"}.social-posterous-spaces:before{content:"\E034"}.social-vimeo:before{content:"\E035"}.social-flickr:before{content:"\E036"}.social-last-fm:before{content:"\E037"}.social-rss:before{content:"\E038"}.social-skype:before{content:"\E039"}.social-e-mail:before{content:"\E040"}.social-vine:before{content:"\E041"}.social-myspace:before{content:"\E042"}.social-goodreads:before{content:"\E043"}.social-apple:before{content:"\F8FF"}.social-windows:before{content:"\E045"}.social-yelp:before{content:"\E046"}.social-playstation:before{content:"\E047"}.social-xbox:before{content:"\E048"}.social-android:before{content:"\E049"}.social-ios:before{content:"\E050"}.social-wikipedia:before{content:"\E051"}.social-pocket:before{content:"\E052"}.social-steam:before{content:"\E053"}.social-souncloud:before{content:"\E054"}.social-slideshare:before{content:"\E055"}.social-netflix:before{content:"\E056"}.social-paypal:before{content:"\E057"}.social-google-drive:before{content:"\E058"}.social-linux-foundation:before{content:"\E059"}.social-ebay:before{content:"\E060"}.animated{-webkit-animation-duration:1s;animation-duration:1s;-webkit-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out;animation-iteration-count:infinite;-webkit-animation-iteration-count:infinite}@-webkit-keyframes pulse{0%{-webkit-transform:scale(1)}50%{-webkit-transform:scale(1.1)}100%{-webkit-transform:scale(1)}}@keyframes pulse{0%{transform:scale(1)}50%{transform:scale(1.1)}100%{transform:scale(1)}}.pulse{-webkit-animation-name:pulse;animation-name:pulse}@-webkit-keyframes rotateIn{0%{-webkit-transform-origin:center center;-webkit-transform:rotate(-200deg);opacity:0}100%{-webkit-transform-origin:center center;-webkit-transform:rotate(0);opacity:1}}@keyframes rotateIn{0%{transform-origin:center center;transform:rotate(-200deg);opacity:0}100%{transform-origin:center center;transform:rotate(0);opacity:1}}.rotateIn{-webkit-animation-name:rotateIn;animation-name:rotateIn}@-webkit-keyframes bounce{0%,20%,50%,80%,100%{-webkit-transform:translateY(0)}40%{-webkit-transform:translateY(-30px)}60%{-webkit-transform:translateY(-15px)}}@keyframes bounce{0%,20%,50%,80%,100%{transform:translateY(0)}40%{transform:translateY(-30px)}60%{transform:translateY(-15px)}}.bounce{-webkit-animation-name:bounce;animation-name:bounce}@-webkit-keyframes swing{20%,40%,60%,80%,100%{-webkit-transform-origin:top center}20%{-webkit-transform:rotate(15deg)}40%{-webkit-transform:rotate(-10deg)}60%{-webkit-transform:rotate(5deg)}80%{-webkit-transform:rotate(-5deg)}100%{-webkit-transform:rotate(0deg)}}@keyframes swing{20%{transform:rotate(15deg)}40%{transform:rotate(-10deg)}60%{transform:rotate(5deg)}80%{transform:rotate(-5deg)}100%{transform:rotate(0deg)}}.swing{-webkit-transform-origin:top center;transform-origin:top center;-webkit-animation-name:swing;animation-name:swing}@-webkit-keyframes tada{0%{-webkit-transform:scale(1)}10%,20%{-webkit-transform:scale(.9) rotate(-3deg)}30%,50%,70%,90%{-webkit-transform:scale(1.1) rotate(3deg)}40%,60%,80%{-webkit-transform:scale(1.1) rotate(-3deg)}100%{-webkit-transform:scale(1) rotate(0)}}@keyframes tada{0%{transform:scale(1)}10%,20%{transform:scale(.9) rotate(-3deg)}30%,50%,70%,90%{transform:scale(1.1) rotate(3deg)}40%,60%,80%{transform:scale(1.1) rotate(-3deg)}100%{transform:scale(1) rotate(0)}}.tada{-webkit-animation-name:tada;animation-name:tada} \ No newline at end of file diff --git a/sass/main.scss b/sass/main.scss index 1bfcee6d..1864ae51 100644 --- a/sass/main.scss +++ b/sass/main.scss @@ -7,6 +7,7 @@ $BASE_URL: '<%= BASE_URL %>'; @import 'variables'; @import '../node_modules/bootstrap-sass/assets/stylesheets/bootstrap'; @import '../node_modules/react-datepicker/dist/react-datepicker'; +@import 'glyphicons-social'; @import 'ascribe_theme'; @import './ascribe-fonts/style'; @import './ascribe-fonts/ascribe-fonts'; @@ -19,6 +20,7 @@ $BASE_URL: '<%= BASE_URL %>'; @import 'ascribe_textarea'; @import 'ascribe_media_player'; @import 'ascribe_uploader'; +@import 'ascribe_footer'; @import 'ascribe-global-notification'; @import 'ascribe_piece_register'; @import 'offset_right'; diff --git a/sass/variables.scss b/sass/variables.scss index b88d3b7d..239b6b62 100644 --- a/sass/variables.scss +++ b/sass/variables.scss @@ -477,7 +477,9 @@ $pager-hover-bg: darken($ascribe-color-full, 10%) !default $pager-active-bg: $ascribe-color-full !default; $pager-active-color: $ascribe-color-full !default; -$pager-disabled-color: lighten($ascribe-color-full, 10%) !default; +$pager-disabled-color: #CCC !default; +$pager-disabled-border: 1px solid #CCC !default; +$pager-disabled-bg: #000 !default; //== Jumbotron