Added bootstrap package

This commit is contained in:
vjrj 2017-11-23 19:02:54 +01:00
parent 2b3c9a5868
commit d7664cbf84
10 changed files with 62 additions and 61 deletions

View file

@ -26,9 +26,9 @@
borderopacity="1.0" borderopacity="1.0"
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:zoom="0.69575618" inkscape:zoom="0.34787809"
inkscape:cx="900.10663" inkscape:cx="482.26239"
inkscape:cy="596.82354" inkscape:cy="500.72871"
inkscape:document-units="mm" inkscape:document-units="mm"
inkscape:current-layer="layer1" inkscape:current-layer="layer1"
showgrid="false" showgrid="false"
@ -62,15 +62,16 @@
preserveAspectRatio="none" preserveAspectRatio="none"
height="276.33533" height="276.33533"
width="442.13651" width="442.13651"
style="stroke-width:165.45117188" /> style="stroke-width:165.45117188"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96" />
<rect <rect
style="opacity:0.18059999;fill:#ac9393;fill-opacity:0.95473256;stroke:none;stroke-width:26.45833206;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="opacity:0.18059998;fill:#ac9393;fill-opacity:0.95473256;stroke:none;stroke-width:26.45833206;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect6086" id="rect6086"
width="390.98022" width="390.98022"
height="252.89684" height="252.89684"
x="11.057551" x="11.057551"
y="14.26377" y="14.26377" />
rx="5" />
<rect <rect
style="opacity:0.29160007;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:26.45833206;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="opacity:0.29160007;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:26.45833206;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect4573" id="rect4573"
@ -82,14 +83,14 @@
ry="5" /> ry="5" />
<text <text
xml:space="preserve" xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:23.18472672px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:Normal;letter-spacing:0px;word-spacing:0px;fill:#550000;fill-opacity:1;stroke:none;stroke-width:0.26458332" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:23.18472672px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:Normal;letter-spacing:0px;word-spacing:0px;fill:#280b0b;fill-opacity:1;stroke:none;stroke-width:0.26458332"
x="206.0237" x="206.0237"
y="62.567436" y="62.567436"
id="text6092"><tspan id="text6092"><tspan
sodipodi:role="line" sodipodi:role="line"
x="206.0237" x="206.0237"
y="62.567436" y="62.567436"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:30.03565788px;font-family:Roboto;-inkscape-font-specification:'Roboto, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#550000;stroke-width:0.26458332" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:30.03565788px;font-family:Roboto;-inkscape-font-specification:'Roboto, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#280b0b;fill-opacity:1;stroke-width:0.26458332"
id="tspan6094">TODOS CONTRA EL FUEGO</tspan></text> id="tspan6094">TODOS CONTRA EL FUEGO</tspan></text>
<g <g
id="g4691" id="g4691"

Before

Width:  |  Height:  |  Size: 2.8 MiB

After

Width:  |  Height:  |  Size: 2.8 MiB

Before After
Before After

View file

@ -7,20 +7,17 @@ import { Meteor } from 'meteor/meteor';
const AuthenticatedNavigation = ({ name, history }) => ( const AuthenticatedNavigation = ({ name, history }) => (
<div> <div>
{/*
https://github.com/react-bootstrap/react-bootstrap/blob/master/src/Nav.js
<Nav> <Nav>
<LinkContainer to="/documents"> <LinkContainer to="/documents">
<NavItem eventKey={1} href="/documents">Documents</NavItem> <NavItem href="/documents">Documents</NavItem>
</LinkContainer> </LinkContainer>
</Nav> </Nav> */}
<Nav pullRight> <div title={name} className="dropdown-menu dropdown-menu-right">
<NavDropdown eventKey={2} title={name} id="user-nav-dropdown"> <a className="dropdown-item" href="/profile">Profile</a>
<LinkContainer to="/profile"> <a className="dropdown-item" onClick={() => history.push('/logout')} >Logout</a>
<NavItem eventKey={2.1} href="/profile">Profile</NavItem> </div>
</LinkContainer>
<MenuItem divider />
<MenuItem eventKey={2.2} onClick={() => history.push('/logout')}>Logout</MenuItem>
</NavDropdown>
</Nav>
</div> </div>
); );

View file

@ -16,7 +16,7 @@ const Footer = (props) => {
return ( return (
<div className="Footer"> <div className="Footer">
<Grid> <Grid>
<p className="pull-left">&copy; Copyleft {copyrightYear()} {t('OrgNameFull')}</p> <p className="pull-left">&copy; Copyleft {copyrightYear()} <a href="https://comunes.org/">{t('OrgNameFull')}</a></p>
<ul className="pull-right"> <ul className="pull-right">
<li><Link to="/terms"> {t('Términos')}<span className="hidden-xs"> {t('de Servicio')}</span></Link></li> <li><Link to="/terms"> {t('Términos')}<span className="hidden-xs"> {t('de Servicio')}</span></Link></li>
<li><Link to="/privacy">{t('Política')}<span className="hidden-xs"> {t('de Privacidad')}</span></Link></li> <li><Link to="/privacy">{t('Política')}<span className="hidden-xs"> {t('de Privacidad')}</span></Link></li>

View file

@ -31,7 +31,7 @@ body {
ul li { ul li {
float: left; float: left;
&:first-child { &:first-child, &:nth-child(2) {
margin-right: 15px; margin-right: 15px;
} }
@ -49,7 +49,7 @@ body {
} }
@include breakpoint(tablet) { @include breakpoint(tablet) {
.Footer ul li:first-child { .Footer ul li:first-child, .Footer ul li:nth-child(2) {
margin-right: 30px; margin-right: 30px;
} }
} }

View file

@ -19,22 +19,12 @@ const Navigation = props => (
<li className="nav-item"> <li className="nav-item">
<a className="nav-link" href="#">{props.t('Contacto')}</a> <a className="nav-link" href="#">{props.t('Contacto')}</a>
</li> </li>
<li className="nav-item">
<a className="nav-link" href="#">{props.t('Contacto')}</a>
</li>
<li className="nav-item">
{!props.authenticated ? <PublicNavigation /> : <AuthenticatedNavigation {...props} />}
</li>
<li className="nav-item dropdown"> <li className="nav-item dropdown">
<a className="nav-item nav-link dropdown-toggle mr-md-2" href="#" id="bd-versions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a className="nav-item nav-link dropdown-toggle mr-md-2" href="#" id="bd-versions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{props.t('Más')} {props.t('Más')}
<div className="ripple-container"></div> <div className="ripple-container"></div>
</a> </a>
<div className="dropdown-menu dropdown-menu-right" aria-labelledby="bd-versions"> {!props.authenticated ? <PublicNavigation /> : <AuthenticatedNavigation {...props} />}
<a className="dropdown-item active" href="/bootstrap-material-design/docs/4.0/">Latest (4.x)</a>
<a className="dropdown-item" href="https://cdn.rawgit.com/FezVrasta/bootstrap-material-design/gh-pages-v3/index.html">v3.x</a>
</div>
</li> </li>
</ul> </ul>

View file

@ -3,14 +3,10 @@ import { LinkContainer } from 'react-router-bootstrap';
import { Nav, NavItem } from 'react-bootstrap'; import { Nav, NavItem } from 'react-bootstrap';
const PublicNavigation = () => ( const PublicNavigation = () => (
<Nav pullRight> <div className="dropdown-menu dropdown-menu-right">
<LinkContainer to="/signup"> <a className="dropdown-item" href="/signup">Sign Up</a>
<NavItem eventKey={1} href="/signup">Sign Up</NavItem> <a className="dropdown-item" href="/login">Log In</a>
</LinkContainer> </div>
<LinkContainer to="/login">
<NavItem eventKey={2} href="/login">Log In</NavItem>
</LinkContainer>
</Nav>
); );
export default PublicNavigation; export default PublicNavigation;

View file

@ -118,3 +118,17 @@
.carousel-item-4 { .carousel-item-4 {
background-image: url('/home-slide4.jpg') background-image: url('/home-slide4.jpg')
} }
.full-width {
position: relative;
width: 100vw;
margin-left: calc(-50vw + 50% - 8px);
position: relative;
/*
width: 100vw;
position: relative;
left: 50%;
right: 50%;
margin-left: -50vw;
margin-right: -50vw;*/
}

View file

@ -49,7 +49,7 @@ class Index extends Component {
render() { render() {
return ( return (
<div className="IndexDisabled"> <div className="IndexDisabled full-width">
{/* https://v4-alpha.getbootstrap.com/components/carousel/ */} {/* https://v4-alpha.getbootstrap.com/components/carousel/ */}
<header> <header>
<ReactResizeDetector handleWidth handleHeight onResize={this._onResize} /> <ReactResizeDetector handleWidth handleHeight onResize={this._onResize} />

View file

@ -0,0 +1,3 @@
a, a:hover {
color: $todos-font2;
}